httpcat-cli 0.0.26 → 0.0.27-rc.2

package/dist/commands/chat.js

@@ -1,4 +1,3 @@
-import { createInterface } from "readline";
 import WebSocket from "ws";
 import chalk from "chalk";
 // @ts-ignore - neo-blessed doesn't have types, but @types/blessed provides compatible types
@@ -133,7 +132,7 @@ function formatMessageText(msg, isOwn = false) {
     const authorShort = msg.authorShort || formatAddress(msg.author, 6);
     return `${chalk.dim(`[${timeStr}]`)} ${authorColor(authorShort)}: ${messageColor(msg.message)}`;
 }
-function displayMessage(msg, isOwn = false, isPending = false, messageLogBox, rl) {
+function displayMessage(msg, isOwn = false, isPending = false, messageLogBox) {
     // Skip if we've already displayed this message
     if (displayedMessageIds.has(msg.messageId)) {
         return;
@@ -145,16 +144,8 @@ function displayMessage(msg, isOwn = false, isPending = false, messageLogBox, rl
         messageLogBox.log(messageText);
         messageLogBox.setScrollPerc(100); // Auto-scroll to bottom
     }
-    else if (rl) {
-        // Fallback to readline approach (for JSON mode or edge cases)
-        process.stdout.write("\r\x1b[K");
-        process.stdout.write(messageText);
-        process.stdout.write("\n");
-        if (rl)
-            rl.prompt(true);
-    }
     else {
-        // Simple console.log when no UI active
+        // Simple console.log when no UI active (JSON mode)
         console.log(messageText);
     }
 }
@@ -180,7 +171,9 @@ function formatTimeRemaining(expiresAt) {
 function formatBuyResultCompact(result) {
     const graduationStatus = result.graduationReached
         ? "✅ GRADUATED!"
-        : `${result.graduationProgress.toFixed(2)}%`;
+        : result.graduationProgress !== undefined
+            ? `${result.graduationProgress.toFixed(2)}%`
+            : "N/A";
     return chalk.green("✅ Buy successful! ") +
         `Received ${chalk.cyan(formatTokenAmount(result.tokensReceived))} tokens, ` +
         `spent ${chalk.yellow(formatCurrency(result.amountSpent))}, ` +
@@ -191,11 +184,14 @@ function formatBuyResultCompact(result) {
  * Format sell result compactly for chat log
  */
 function formatSellResultCompact(result) {
+    const graduationStatus = result.graduationProgress !== undefined
+        ? `${result.graduationProgress.toFixed(2)}%`
+        : "N/A";
     return chalk.green("✅ Sell successful! ") +
         `Sold ${chalk.cyan(formatTokenAmount(result.tokensSold))} tokens, ` +
         `received ${chalk.yellow(formatCurrency(result.usdcReceived))}, ` +
         `new price ${chalk.cyan(formatCurrency(result.newPrice))}, ` +
-        `graduation ${chalk.magenta(result.graduationProgress.toFixed(2) + "%")}`;
+        `graduation ${chalk.magenta(graduationStatus)}`;
 }
 function updateHeaderBox(headerBox, leaseInfo, tokenName, isConnected = false) {
     const title = tokenName
@@ -265,7 +261,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
     let userAddress;
     let ws = null;
     let wsUrl = null; // Store websocket URL for reconnection
-    let rl = null;
     let leaseCheckInterval = null;
     let headerUpdateInterval = null;
     let isExiting = false;
@@ -401,15 +396,10 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                                     inputBox.clearValue();
                                     screen?.render();
                                 }
-                                else if (rl) {
-                                    // Fallback to readline
-                                    process.stdout.write("\n");
-                                    process.stdout.write("\r\x1b[K");
-                                }
                                 // Display the message (only if not already displayed)
                                 // In JSON mode, displayMessage should never be called, but add explicit check
                                 if (!displayedMessageIds.has(msg.messageId)) {
-                                    displayMessage(msg, isOwn, false, messageLogBox || undefined, jsonMode ? undefined : (rl || undefined));
+                                    displayMessage(msg, isOwn, false, messageLogBox || undefined);
                                 }
                                 // Re-enable input - clear the input line completely
                                 isSending = false;
@@ -421,17 +411,12 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                                     inputBox.focus();
                                     screen.render();
                                 }
-                                else if (rl) {
-                                    // Fallback to readline
-                                    process.stdout.write("\r\x1b[K");
-                                    rl.prompt();
-                                }
                             }
                             else {
                                 // Not our message, just display it normally
                                 // In JSON mode, displayMessage should never be called, but add explicit check
                                 if (!displayedMessageIds.has(msg.messageId)) {
-                                    displayMessage(msg, isOwn, false, messageLogBox || undefined, jsonMode ? undefined : (rl || undefined));
+                                    displayMessage(msg, isOwn, false, messageLogBox || undefined);
                                 }
                             }
                         }
@@ -448,14 +433,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                                 messageLogBox.setScrollPerc(100);
                                 screen?.render();
                             }
-                            else if (rl) {
-                                process.stdout.write("\r\x1b[K");
-                                console.log(chalk.yellow("⏱️  Your lease has expired. Type /renew to continue chatting."));
-                                rl.prompt(true);
-                            }
-                            else {
-                                console.log(chalk.yellow("⏱️  Your lease has expired. Type /renew to continue chatting."));
-                            }
                         }
                         leaseInfo = null;
                         if (headerBox) {
@@ -476,14 +453,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                                 messageLogBox.setScrollPerc(100);
                                 screen?.render();
                             }
-                            else if (rl) {
-                                process.stdout.write("\r\x1b[K");
-                                console.log(chalk.red(`❌ Error: ${event.error || "Unknown error"}`));
-                                rl.prompt(true);
-                            }
-                            else {
-                                console.log(chalk.red(`❌ Error: ${event.error || "Unknown error"}`));
-                            }
                         }
                     }
                 }
@@ -508,14 +477,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                         messageLogBox.setScrollPerc(100);
                         screen?.render();
                     }
-                    else if (rl) {
-                        process.stdout.write("\r\x1b[K");
-                        console.log(chalk.red(`❌ WebSocket error: ${errorMsg}`));
-                        rl.prompt(true);
-                    }
-                    else {
-                        console.log(chalk.red(`❌ WebSocket error: ${errorMsg}`));
-                    }
                 }
             });
             websocket.on("close", (code, reason) => {
@@ -557,14 +518,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                         messageLogBox.setScrollPerc(100);
                         screen?.render();
                     }
-                    else if (rl) {
-                        process.stdout.write("\r\x1b[K");
-                        console.log(chalk.yellow(message));
-                        rl.prompt(true);
-                    }
-                    else {
-                        console.log(chalk.yellow(message));
-                    }
                 }
             });
         };
@@ -586,9 +539,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                             messageLogBox.setScrollPerc(100);
                             screen?.render();
                         }
-                        else if (rl) {
-                            console.log(chalk.yellow(`🔄 Retrying WebSocket connection (attempt ${retryCount + 1}/${maxRetries})...`));
-                        }
                     }
                     await new Promise((resolve) => setTimeout(resolve, backoffDelay));
                 }
@@ -672,13 +622,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                             messageLogBox.setScrollPerc(100);
                             screen?.render();
                         }
-                        else if (rl) {
-                            console.log(chalk.red(`❌ ${finalError}`));
-                            console.log(chalk.yellow("💡 Try typing /renew to get a fresh lease"));
-                        }
-                        else {
-                            console.log(chalk.red(`❌ ${finalError}`));
-                        }
                     }
                     throw new Error(finalError);
                 }
@@ -702,9 +645,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                     messageLogBox.setScrollPerc(100);
                     screen?.render();
                 }
-                else if (rl) {
-                    console.log(chalk.yellow("⏱️  Your lease has expired. Type /renew to continue chatting."));
-                }
                 leaseInfo = null;
                 if (headerBox) {
                     updateHeaderBox(headerBox, null, tokenIdentifier, true);
@@ -712,157 +652,90 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                 }
             }
         }, 30000);
-        // Set up blessed UI or readline interface (only in interactive mode)
+        // Set up blessed UI (only in interactive mode)
         if (!jsonMode) {
-            let useBlessed = true;
-            // Check if terminal supports blessed (basic compatibility check)
-            // If not a TTY, silently fall back to readline
+            // Check if terminal supports blessed
             if (!process.stdout.isTTY) {
-                useBlessed = false;
-            }
-            // Helper function to set up readline interface
-            const setupReadline = () => {
-                rl = createInterface({
-                    input: process.stdin,
-                    output: process.stdout,
-                    prompt: "",
-                });
-                // Display header information via console
-                console.log();
-                console.log(chalk.cyan("═".repeat(80)));
-                console.log(chalk.cyan("💬 httpcat Chat Stream"));
-                console.log(chalk.cyan("═".repeat(80)));
-                console.log();
-                console.log(chalk.green("✅ Connected to chat stream"));
-                console.log();
-                console.log(chalk.dim("💰 Entry fee: $0.01 USDC (10 min lease)"));
-                console.log(chalk.dim("💬 Per message: $0.01 USDC"));
-                if (leaseInfo) {
-                    const timeRemaining = formatTimeRemaining(leaseInfo.leaseExpiresAt);
-                    console.log(chalk.dim(`⏱️  Lease expires in: ${timeRemaining}`));
-                }
-                console.log();
-                console.log(chalk.dim("💡 Type your message and press Enter to send"));
-                console.log(chalk.dim("💡 Type /exit or Ctrl+C to quit"));
-                console.log(chalk.dim("💡 Type /renew to renew your lease"));
-                if (tokenIdentifier) {
-                    console.log(chalk.dim("💡 Type /buy <amount> to buy tokens"));
-                    console.log(chalk.dim("💡 Type /sell <amount> to sell tokens"));
-                }
-                console.log(chalk.cyan("─".repeat(80)));
-                console.log();
-            };
-            // Try to create blessed screen with error handling
-            if (useBlessed) {
-                try {
-                    // Create blessed screen and widgets
-                    screen = blessed.screen({
-                        smartCSR: true,
-                        title: "httpcat Chat",
-                        fullUnicode: true,
-                        // Add error handling for terminal compatibility
-                        fastCSR: false, // Disable fast CSR to avoid rendering issues
-                    });
-                    // Calculate header height (approximately 10 lines)
-                    const headerHeight = 10;
-                    const inputHeight = 3;
-                    // Create header box (fixed at top)
-                    headerBox = blessed.box({
-                        top: 0,
-                        left: 0,
-                        width: "100%",
-                        height: headerHeight,
-                        content: "",
-                        tags: false, // Disable tags to avoid rendering issues
-                        wrap: true,
-                        scrollable: false,
-                        alwaysScroll: false,
-                        padding: {
-                            left: 1,
-                            right: 1,
-                            top: 0,
-                            bottom: 0,
-                        },
-                        style: {
-                            fg: "white",
-                            bg: "black",
-                        },
-                    });
-                    // Create message log box (scrollable, middle section)
-                    messageLogBox = blessed.log({
-                        top: headerHeight,
-                        left: 0,
-                        width: "100%",
-                        height: `100%-${headerHeight + inputHeight}`,
-                        tags: true,
-                        scrollable: true,
-                        alwaysScroll: true,
-                        scrollbar: {
-                            ch: " ",
-                            inverse: true,
-                        },
-                        style: {
-                            fg: "white",
-                            bg: "black",
-                        },
-                    });
-                    // Create input box (fixed at bottom)
-                    inputBox = blessed.textbox({
-                        bottom: 0,
-                        left: 0,
-                        width: "100%",
-                        height: inputHeight,
-                        content: "",
-                        inputOnFocus: true,
-                        tags: true,
-                        keys: true,
-                        style: {
-                            fg: "cyan",
-                            bg: "black",
-                            focus: {
-                                fg: "white",
-                                bg: "blue",
-                            },
-                        },
-                    });
-                    // Append widgets to screen
-                    screen.append(headerBox);
-                    screen.append(messageLogBox);
-                    screen.append(inputBox);
-                    // Test render to catch early errors
-                    screen.render();
-                    // Initial header update
-                    updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, false);
-                    screen.render();
-                }
-                catch (blessedError) {
-                    // Blessed failed - fallback to readline
-                    useBlessed = false;
-                    // Only show error if it's not a TTY issue (which we already handled silently)
-                    if (process.stdout.isTTY) {
-                        console.error(chalk.yellow("⚠️  Blessed UI initialization failed, falling back to readline interface"));
-                        console.error(chalk.dim(`   Error: ${blessedError instanceof Error ? blessedError.message : String(blessedError)}`));
-                    }
-                    // Clean up any partial blessed setup
-                    if (screen) {
-                        try {
-                            screen.destroy();
-                        }
-                        catch {
-                            // Ignore cleanup errors
-                        }
-                        screen = null;
-                        headerBox = null;
-                        messageLogBox = null;
-                        inputBox = null;
-                    }
-                    setupReadline();
-                }
-            }
-            else {
-                // Not a TTY or blessed disabled - use readline directly
-                setupReadline();
+                throw new Error("Chat requires an interactive terminal (TTY). Use --json mode for non-interactive usage.");
             }
+            // Create blessed screen and widgets
+            screen = blessed.screen({
+                smartCSR: true,
+                title: "httpcat Chat",
+                fullUnicode: true,
+                fastCSR: false, // Disable fast CSR to avoid rendering issues
+            });
+            // Calculate header height (approximately 10 lines)
+            const headerHeight = 10;
+            const inputHeight = 3;
+            // Create header box (fixed at top)
+            headerBox = blessed.box({
+                top: 0,
+                left: 0,
+                width: "100%",
+                height: headerHeight,
+                content: "",
+                tags: false, // Disable tags to avoid rendering issues
+                wrap: true,
+                scrollable: false,
+                alwaysScroll: false,
+                padding: {
+                    left: 1,
+                    right: 1,
+                    top: 0,
+                    bottom: 0,
+                },
+                style: {
+                    fg: "white",
+                    bg: "black",
+                },
+            });
+            // Create message log box (scrollable, middle section)
+            messageLogBox = blessed.log({
+                top: headerHeight,
+                left: 0,
+                width: "100%",
+                height: `100%-${headerHeight + inputHeight}`,
+                tags: true,
+                scrollable: true,
+                alwaysScroll: true,
+                scrollbar: {
+                    ch: " ",
+                    inverse: true,
+                },
+                style: {
+                    fg: "white",
+                    bg: "black",
+                },
+            });
+            // Create input box (fixed at bottom)
+            inputBox = blessed.textbox({
+                bottom: 0,
+                left: 0,
+                width: "100%",
+                height: inputHeight,
+                content: "",
+                inputOnFocus: true,
+                tags: true,
+                keys: true,
+                style: {
+                    fg: "cyan",
+                    bg: "black",
+                    focus: {
+                        fg: "white",
+                        bg: "blue",
+                    },
+                },
+            });
+            // Append widgets to screen
+            screen.append(headerBox);
+            screen.append(messageLogBox);
+            screen.append(inputBox);
+            // Initial render
+            screen.render();
+            // Initial header update
+            updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, false);
+            screen.render();
             // Display last messages
             if (joinResult.lastMessages.length > 0) {
                 const sortedMessages = [...joinResult.lastMessages].sort((a, b) => {
@@ -874,210 +747,218 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                     displayedMessageIds.add(msg.messageId);
                     const isOwn = msg.author === userAddress;
                     // This is inside !jsonMode block, but add explicit check for safety
-                    displayMessage(msg, isOwn, false, messageLogBox || undefined, jsonMode ? undefined : (rl || undefined));
-                });
-            }
-            // Only set up blessed-specific handlers if using blessed
-            if (useBlessed && screen) {
-                // Handle terminal resize
-                screen.on("resize", () => {
-                    screen?.render();
+                    displayMessage(msg, isOwn, false, messageLogBox || undefined);
                 });
-                // Update header with lease countdown every second
-                headerUpdateInterval = setInterval(() => {
-                    if (leaseInfo && headerBox && screen && !isExiting) {
-                        updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, true);
-                        screen.render();
-                    }
-                }, 1000);
             }
+            // Handle terminal resize
+            screen.on("resize", () => {
+                screen?.render();
+            });
+            // Update header with lease countdown every second
+            headerUpdateInterval = setInterval(() => {
+                if (leaseInfo && headerBox && screen && !isExiting) {
+                    updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, true);
+                    screen.render();
+                }
+            }, 1000);
             // Handle input submission
-            if (useBlessed && inputBox) {
-                // Blessed input handling
-                inputBox.on("submit", async (value) => {
-                    const trimmed = value.trim();
-                    // Ignore input while sending
-                    if (isSending || !trimmed) {
-                        inputBox?.clearValue();
-                        inputBox?.focus();
-                        screen?.render();
-                        return;
-                    }
-                    // Handle commands
-                    if (trimmed.startsWith("/")) {
-                        const [cmd] = trimmed.split(" ");
-                        switch (cmd) {
-                            case "/exit":
-                            case "/quit":
-                                isExiting = true;
-                                if (leaseCheckInterval)
-                                    clearInterval(leaseCheckInterval);
-                                if (headerUpdateInterval)
-                                    clearInterval(headerUpdateInterval);
-                                if (ws)
-                                    ws.close();
-                                screen?.destroy();
-                                console.log();
-                                printCat("sleeping");
-                                console.log(chalk.cyan("Chat disconnected. Goodbye! 👋"));
-                                process.exit(0);
-                                return;
-                            case "/renew": {
-                                try {
-                                    inputBox?.setValue("⏱️  Renewing lease...");
+            inputBox.on("submit", async (value) => {
+                const trimmed = value.trim();
+                // Ignore input while sending
+                if (isSending || !trimmed) {
+                    inputBox?.clearValue();
+                    inputBox?.focus();
+                    screen?.render();
+                    return;
+                }
+                // Handle commands
+                if (trimmed.startsWith("/")) {
+                    const [cmd] = trimmed.split(" ");
+                    switch (cmd) {
+                        case "/exit":
+                        case "/quit":
+                            isExiting = true;
+                            if (leaseCheckInterval)
+                                clearInterval(leaseCheckInterval);
+                            if (headerUpdateInterval)
+                                clearInterval(headerUpdateInterval);
+                            if (ws)
+                                ws.close();
+                            screen?.destroy();
+                            console.log();
+                            printCat("sleeping");
+                            console.log(chalk.cyan("Chat disconnected. Goodbye! 👋"));
+                            process.exit(0);
+                            return;
+                        case "/renew": {
+                            try {
+                                inputBox?.setValue("⏱️  Renewing lease...");
+                                screen?.render();
+                                const renewal = await renewLease(client, userAddress, leaseInfo?.leaseId);
+                                leaseInfo = {
+                                    leaseId: renewal.leaseId,
+                                    leaseExpiresAt: new Date(renewal.leaseExpiresAt),
+                                };
+                                // Update header first
+                                if (headerBox) {
+                                    updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, false);
+                                }
+                                if (messageLogBox) {
+                                    messageLogBox.log(chalk.green(`✅ Lease renewed! Expires in ${formatTimeRemaining(leaseInfo.leaseExpiresAt)}`));
+                                    messageLogBox.log(chalk.yellow("🔄 Reconnecting to chat stream..."));
+                                    messageLogBox.setScrollPerc(100);
                                     screen?.render();
-                                    const renewal = await renewLease(client, userAddress, leaseInfo?.leaseId);
-                                    leaseInfo = {
-                                        leaseId: renewal.leaseId,
-                                        leaseExpiresAt: new Date(renewal.leaseExpiresAt),
-                                    };
-                                    // Update header first
-                                    if (headerBox) {
-                                        updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, false);
-                                    }
-                                    if (messageLogBox) {
-                                        messageLogBox.log(chalk.green(`✅ Lease renewed! Expires in ${formatTimeRemaining(leaseInfo.leaseExpiresAt)}`));
-                                        messageLogBox.log(chalk.yellow("🔄 Reconnecting to chat stream..."));
-                                        messageLogBox.setScrollPerc(100);
-                                        screen?.render();
-                                    }
-                                    // Close old connection properly
-                                    if (ws) {
-                                        // Remove all listeners to prevent conflicts
-                                        ws.removeAllListeners();
-                                        // Ensure connection is fully closed
-                                        // WebSocket.OPEN = 1, WebSocket.CONNECTING = 0
-                                        if (ws.readyState === 1 || ws.readyState === 0) {
-                                            ws.close();
-                                        }
-                                        ws = null;
+                                }
+                                // Close old connection properly
+                                if (ws) {
+                                    // Remove all listeners to prevent conflicts
+                                    ws.removeAllListeners();
+                                    // Ensure connection is fully closed
+                                    // WebSocket.OPEN = 1, WebSocket.CONNECTING = 0
+                                    if (ws.readyState === 1 || ws.readyState === 0) {
+                                        ws.close();
                                     }
-                                    // Wait for database transaction to commit and old connection to fully close
-                                    // The server validates the lease in the open handler, so we need to ensure
-                                    // the database update is visible before connecting
-                                    // Increased delay to 2 seconds for better database consistency
-                                    await new Promise((resolve) => setTimeout(resolve, 2000));
-                                    // Reconnect with new lease - with retry logic
-                                    if (wsUrl) {
-                                        // Normalize WebSocket URL protocol based on agent URL
-                                        const agentUrl = client.getAgentUrl();
-                                        const normalizedWsUrl = normalizeWebSocketUrl(wsUrl, agentUrl);
-                                        const wsUrlObj = new URL(normalizedWsUrl);
-                                        wsUrlObj.searchParams.set("leaseId", leaseInfo.leaseId);
-                                        wsUrl = wsUrlObj.toString(); // Update stored URL
-                                        // Retry logic with exponential backoff
-                                        let retryCount = 0;
-                                        const maxRetries = 3;
-                                        let connected = false;
-                                        while (!connected && retryCount < maxRetries) {
-                                            try {
-                                                if (retryCount > 0) {
-                                                    const backoffDelay = Math.min(1000 * Math.pow(2, retryCount - 1), 5000);
-                                                    if (messageLogBox) {
-                                                        messageLogBox.log(chalk.yellow(`🔄 Retry ${retryCount}/${maxRetries} in ${backoffDelay}ms...`));
-                                                        messageLogBox.setScrollPerc(100);
-                                                        screen?.render();
-                                                    }
-                                                    await new Promise((resolve) => setTimeout(resolve, backoffDelay));
-                                                }
-                                                // Create new connection and wait for it to open
-                                                const newWsUrl = wsUrl; // TypeScript: ensure it's not null
-                                                await new Promise((resolve, reject) => {
-                                                    const newWs = new WebSocket(newWsUrl);
-                                                    // Attach permanent handlers FIRST (before temporary handlers)
-                                                    attachWebSocketHandlers(newWs);
-                                                    // Set up temporary handlers for connection establishment
-                                                    let timeout = null;
-                                                    let openHandler = null;
-                                                    let closeHandler = null;
-                                                    let errorHandler = null;
-                                                    const cleanup = () => {
-                                                        if (timeout)
-                                                            clearTimeout(timeout);
-                                                        if (openHandler)
-                                                            newWs.removeListener("open", openHandler);
-                                                        if (closeHandler)
-                                                            newWs.removeListener("close", closeHandler);
-                                                        if (errorHandler)
-                                                            newWs.removeListener("error", errorHandler);
-                                                    };
-                                                    timeout = setTimeout(() => {
-                                                        cleanup();
-                                                        newWs.close();
-                                                        reject(new Error("Connection timeout - lease may not be ready yet"));
-                                                    }, 10000);
-                                                    openHandler = () => {
-                                                        cleanup();
-                                                        ws = newWs; // Assign to outer variable only after successful connection
-                                                        resolve();
-                                                    };
-                                                    closeHandler = (code, reason) => {
-                                                        cleanup();
-                                                        const reasonStr = reason.toString();
-                                                        if (code === 1008 && reasonStr.includes("lease")) {
-                                                            reject(new Error("Lease validation failed - please try /renew again"));
-                                                        }
-                                                        else {
-                                                            reject(new Error(`Connection closed: ${code} - ${reasonStr}`));
-                                                        }
-                                                    };
-                                                    errorHandler = (error) => {
-                                                        cleanup();
-                                                        reject(error);
-                                                    };
-                                                    // Attach temporary handlers AFTER permanent handlers
-                                                    newWs.once("open", openHandler);
-                                                    newWs.once("close", closeHandler);
-                                                    newWs.once("error", errorHandler);
-                                                });
-                                                connected = true;
-                                                // Connection established
-                                                if (headerBox) {
-                                                    updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, true);
-                                                }
-                                                if (messageLogBox) {
-                                                    messageLogBox.log(chalk.green("✅ Reconnected to chat stream"));
-                                                    messageLogBox.setScrollPerc(100);
-                                                }
-                                                screen?.render();
-                                            }
-                                            catch (error) {
-                                                retryCount++;
-                                                const errorMsg = error instanceof Error ? error.message : String(error);
-                                                if (retryCount >= maxRetries) {
-                                                    // Final failure
-                                                    throw new Error(`Failed to reconnect after ${maxRetries} attempts: ${errorMsg}`);
-                                                }
-                                                // Log retry attempt
+                                    ws = null;
+                                }
+                                // Wait for database transaction to commit and old connection to fully close
+                                // The server validates the lease in the open handler, so we need to ensure
+                                // the database update is visible before connecting
+                                // Increased delay to 2 seconds for better database consistency
+                                await new Promise((resolve) => setTimeout(resolve, 2000));
+                                // Reconnect with new lease - with retry logic
+                                if (wsUrl) {
+                                    // Normalize WebSocket URL protocol based on agent URL
+                                    const agentUrl = client.getAgentUrl();
+                                    const normalizedWsUrl = normalizeWebSocketUrl(wsUrl, agentUrl);
+                                    const wsUrlObj = new URL(normalizedWsUrl);
+                                    wsUrlObj.searchParams.set("leaseId", leaseInfo.leaseId);
+                                    wsUrl = wsUrlObj.toString(); // Update stored URL
+                                    // Retry logic with exponential backoff
+                                    let retryCount = 0;
+                                    const maxRetries = 3;
+                                    let connected = false;
+                                    while (!connected && retryCount < maxRetries) {
+                                        try {
+                                            if (retryCount > 0) {
+                                                const backoffDelay = Math.min(1000 * Math.pow(2, retryCount - 1), 5000);
                                                 if (messageLogBox) {
-                                                    messageLogBox.log(chalk.yellow(`⚠️  Connection attempt ${retryCount} failed: ${errorMsg}`));
+                                                    messageLogBox.log(chalk.yellow(`🔄 Retry ${retryCount}/${maxRetries} in ${backoffDelay}ms...`));
                                                     messageLogBox.setScrollPerc(100);
                                                     screen?.render();
                                                 }
+                                                await new Promise((resolve) => setTimeout(resolve, backoffDelay));
+                                            }
+                                            // Create new connection and wait for it to open
+                                            const newWsUrl = wsUrl; // TypeScript: ensure it's not null
+                                            await new Promise((resolve, reject) => {
+                                                const newWs = new WebSocket(newWsUrl);
+                                                // Attach permanent handlers FIRST (before temporary handlers)
+                                                attachWebSocketHandlers(newWs);
+                                                // Set up temporary handlers for connection establishment
+                                                let timeout = null;
+                                                let openHandler = null;
+                                                let closeHandler = null;
+                                                let errorHandler = null;
+                                                const cleanup = () => {
+                                                    if (timeout)
+                                                        clearTimeout(timeout);
+                                                    if (openHandler)
+                                                        newWs.removeListener("open", openHandler);
+                                                    if (closeHandler)
+                                                        newWs.removeListener("close", closeHandler);
+                                                    if (errorHandler)
+                                                        newWs.removeListener("error", errorHandler);
+                                                };
+                                                timeout = setTimeout(() => {
+                                                    cleanup();
+                                                    newWs.close();
+                                                    reject(new Error("Connection timeout - lease may not be ready yet"));
+                                                }, 10000);
+                                                openHandler = () => {
+                                                    cleanup();
+                                                    ws = newWs; // Assign to outer variable only after successful connection
+                                                    resolve();
+                                                };
+                                                closeHandler = (code, reason) => {
+                                                    cleanup();
+                                                    const reasonStr = reason.toString();
+                                                    if (code === 1008 && reasonStr.includes("lease")) {
+                                                        reject(new Error("Lease validation failed - please try /renew again"));
+                                                    }
+                                                    else {
+                                                        reject(new Error(`Connection closed: ${code} - ${reasonStr}`));
+                                                    }
+                                                };
+                                                errorHandler = (error) => {
+                                                    cleanup();
+                                                    reject(error);
+                                                };
+                                                // Attach temporary handlers AFTER permanent handlers
+                                                newWs.once("open", openHandler);
+                                                newWs.once("close", closeHandler);
+                                                newWs.once("error", errorHandler);
+                                            });
+                                            connected = true;
+                                            // Connection established
+                                            if (headerBox) {
+                                                updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, true);
+                                            }
+                                            if (messageLogBox) {
+                                                messageLogBox.log(chalk.green("✅ Reconnected to chat stream"));
+                                                messageLogBox.setScrollPerc(100);
+                                            }
+                                            screen?.render();
+                                        }
+                                        catch (error) {
+                                            retryCount++;
+                                            const errorMsg = error instanceof Error ? error.message : String(error);
+                                            if (retryCount >= maxRetries) {
+                                                // Final failure
+                                                throw new Error(`Failed to reconnect after ${maxRetries} attempts: ${errorMsg}`);
+                                            }
+                                            // Log retry attempt
+                                            if (messageLogBox) {
+                                                messageLogBox.log(chalk.yellow(`⚠️  Connection attempt ${retryCount} failed: ${errorMsg}`));
+                                                messageLogBox.setScrollPerc(100);
+                                                screen?.render();
                                             }
                                         }
                                     }
-                                    inputBox?.clearValue();
-                                    inputBox?.focus();
-                                    screen?.render();
                                 }
-                                catch (error) {
-                                    const errorMsg = error instanceof Error ? error.message : String(error);
-                                    if (messageLogBox) {
-                                        messageLogBox.log(chalk.red(`❌ ${errorMsg}`));
-                                        messageLogBox.setScrollPerc(100);
-                                    }
-                                    inputBox?.clearValue();
-                                    inputBox?.focus();
+                                inputBox?.clearValue();
+                                inputBox?.focus();
+                                screen?.render();
+                            }
+                            catch (error) {
+                                const errorMsg = error instanceof Error ? error.message : String(error);
+                                if (messageLogBox) {
+                                    messageLogBox.log(chalk.red(`❌ ${errorMsg}`));
+                                    messageLogBox.setScrollPerc(100);
+                                }
+                                inputBox?.clearValue();
+                                inputBox?.focus();
+                                screen?.render();
+                            }
+                            return;
+                        }
+                        case "/buy": {
+                            // Only allow in token-specific chats
+                            if (!tokenIdentifier) {
+                                if (messageLogBox) {
+                                    messageLogBox.log(chalk.yellow("⚠️  /buy command only works in token-specific chats"));
+                                    messageLogBox.setScrollPerc(100);
                                     screen?.render();
                                 }
+                                inputBox?.clearValue();
+                                inputBox?.focus();
+                                screen?.render();
                                 return;
                             }
-                            case "/buy": {
-                                // Only allow in token-specific chats
-                                if (!tokenIdentifier) {
+                            try {
+                                const parts = trimmed.split(" ");
+                                if (parts.length < 2) {
                                     if (messageLogBox) {
-                                        messageLogBox.log(chalk.yellow("⚠️  /buy command only works in token-specific chats"));
+                                        messageLogBox.log(chalk.yellow("⚠️  Usage: /buy <amount> (e.g., /buy 0.05)"));
                                         messageLogBox.setScrollPerc(100);
                                         screen?.render();
                                     }
@@ -1086,52 +967,52 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                                     screen?.render();
                                     return;
                                 }
-                                try {
-                                    const parts = trimmed.split(" ");
-                                    if (parts.length < 2) {
-                                        if (messageLogBox) {
-                                            messageLogBox.log(chalk.yellow("⚠️  Usage: /buy <amount> (e.g., /buy 0.05)"));
-                                            messageLogBox.setScrollPerc(100);
-                                            screen?.render();
-                                        }
-                                        inputBox?.clearValue();
-                                        inputBox?.focus();
-                                        screen?.render();
-                                        return;
-                                    }
-                                    const amount = parts[1];
-                                    inputBox?.setValue(`💰 Buying tokens...`);
+                                const amount = parts[1];
+                                inputBox?.setValue(`💰 Buying tokens...`);
+                                screen?.render();
+                                const isTestMode = client.getNetwork().includes("sepolia");
+                                const result = await buyToken(client, tokenIdentifier, amount, isTestMode, true // silent mode
+                                );
+                                if (messageLogBox) {
+                                    messageLogBox.log(formatBuyResultCompact(result));
+                                    messageLogBox.setScrollPerc(100);
                                     screen?.render();
-                                    const isTestMode = client.getNetwork().includes("sepolia");
-                                    const result = await buyToken(client, tokenIdentifier, amount, isTestMode, true // silent mode
-                                    );
-                                    if (messageLogBox) {
-                                        messageLogBox.log(formatBuyResultCompact(result));
-                                        messageLogBox.setScrollPerc(100);
-                                        screen?.render();
-                                    }
-                                    inputBox?.clearValue();
-                                    inputBox?.focus();
+                                }
+                                inputBox?.clearValue();
+                                inputBox?.focus();
+                                screen?.render();
+                            }
+                            catch (error) {
+                                const errorMsg = error instanceof Error ? error.message : String(error);
+                                if (messageLogBox) {
+                                    messageLogBox.log(chalk.red(`❌ Buy failed: ${errorMsg}`));
+                                    messageLogBox.setScrollPerc(100);
                                     screen?.render();
                                 }
-                                catch (error) {
-                                    const errorMsg = error instanceof Error ? error.message : String(error);
-                                    if (messageLogBox) {
-                                        messageLogBox.log(chalk.red(`❌ Buy failed: ${errorMsg}`));
-                                        messageLogBox.setScrollPerc(100);
-                                        screen?.render();
-                                    }
-                                    inputBox?.clearValue();
-                                    inputBox?.focus();
+                                inputBox?.clearValue();
+                                inputBox?.focus();
+                                screen?.render();
+                            }
+                            return;
+                        }
+                        case "/sell": {
+                            // Only allow in token-specific chats
+                            if (!tokenIdentifier) {
+                                if (messageLogBox) {
+                                    messageLogBox.log(chalk.yellow("⚠️  /sell command only works in token-specific chats"));
+                                    messageLogBox.setScrollPerc(100);
                                     screen?.render();
                                 }
+                                inputBox?.clearValue();
+                                inputBox?.focus();
+                                screen?.render();
                                 return;
                             }
-                            case "/sell": {
-                                // Only allow in token-specific chats
-                                if (!tokenIdentifier) {
+                            try {
+                                const parts = trimmed.split(" ");
+                                if (parts.length < 2) {
                                     if (messageLogBox) {
-                                        messageLogBox.log(chalk.yellow("⚠️  /sell command only works in token-specific chats"));
+                                        messageLogBox.log(chalk.yellow("⚠️  Usage: /sell <amount|all|percentage> (e.g., /sell 0.05, /sell all, /sell 50%)"));
                                         messageLogBox.setScrollPerc(100);
                                         screen?.render();
                                     }
@@ -1140,493 +1021,177 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
                                     screen?.render();
                                     return;
                                 }
-                                try {
-                                    const parts = trimmed.split(" ");
-                                    if (parts.length < 2) {
-                                        if (messageLogBox) {
-                                            messageLogBox.log(chalk.yellow("⚠️  Usage: /sell <amount|all|percentage> (e.g., /sell 0.05, /sell all, /sell 50%)"));
-                                            messageLogBox.setScrollPerc(100);
-                                            screen?.render();
-                                        }
-                                        inputBox?.clearValue();
-                                        inputBox?.focus();
-                                        screen?.render();
-                                        return;
-                                    }
-                                    const amountStr = parts[1];
-                                    inputBox?.setValue(`💸 Selling tokens...`);
-                                    screen?.render();
-                                    // Get token info to check balance
-                                    if (!userAddress) {
-                                        throw new Error("User address not available");
-                                    }
-                                    const tokenInfo = await getTokenInfo(client, tokenIdentifier, userAddress, true // silent mode
-                                    );
-                                    if (!tokenInfo.userPosition || tokenInfo.userPosition.tokensOwned === "0") {
-                                        throw new Error("You do not own any of this token");
-                                    }
-                                    // Parse sell amount
-                                    const tokenAmount = parseTokenAmount(amountStr, tokenInfo.userPosition.tokensOwned);
-                                    const result = await sellToken(client, tokenIdentifier, tokenAmount, true // silent mode
-                                    );
-                                    if (messageLogBox) {
-                                        messageLogBox.log(formatSellResultCompact(result));
-                                        messageLogBox.setScrollPerc(100);
-                                        screen?.render();
-                                    }
-                                    inputBox?.clearValue();
-                                    inputBox?.focus();
-                                    screen?.render();
-                                }
-                                catch (error) {
-                                    const errorMsg = error instanceof Error ? error.message : String(error);
-                                    if (messageLogBox) {
-                                        messageLogBox.log(chalk.red(`❌ Sell failed: ${errorMsg}`));
-                                        messageLogBox.setScrollPerc(100);
-                                        screen?.render();
-                                    }
-                                    inputBox?.clearValue();
-                                    inputBox?.focus();
-                                    screen?.render();
-                                }
-                                return;
-                            }
-                            case "/help":
-                                if (messageLogBox) {
-                                    const helpText = tokenIdentifier
-                                        ? chalk.dim("Commands: /exit, /quit, /renew, /buy, /sell, /help")
-                                        : chalk.dim("Commands: /exit, /quit, /renew, /help");
-                                    messageLogBox.log(helpText);
-                                    messageLogBox.setScrollPerc(100);
+                                const amountStr = parts[1];
+                                inputBox?.setValue(`💸 Selling tokens...`);
+                                screen?.render();
+                                // Get token info to check balance
+                                if (!userAddress) {
+                                    throw new Error("User address not available");
+                                }
+                                const tokenInfo = await getTokenInfo(client, tokenIdentifier, userAddress, true // silent mode
+                                );
+                                if (!tokenInfo.userPosition || tokenInfo.userPosition.tokensOwned === "0") {
+                                    throw new Error("You do not own any of this token");
+                                }
+                                // Parse sell amount
+                                const tokenAmount = parseTokenAmount(amountStr, tokenInfo.userPosition.tokensOwned);
+                                const result = await sellToken(client, tokenIdentifier, tokenAmount, true // silent mode
+                                );
+                                if (messageLogBox) {
+                                    messageLogBox.log(formatSellResultCompact(result));
+                                    messageLogBox.setScrollPerc(100);
                                     screen?.render();
                                 }
                                 inputBox?.clearValue();
                                 inputBox?.focus();
                                 screen?.render();
-                                return;
-                            default:
+                            }
+                            catch (error) {
+                                const errorMsg = error instanceof Error ? error.message : String(error);
                                 if (messageLogBox) {
-                                    messageLogBox.log(chalk.yellow(`Unknown command: ${cmd}. Type /help for commands.`));
+                                    messageLogBox.log(chalk.red(`❌ Sell failed: ${errorMsg}`));
                                     messageLogBox.setScrollPerc(100);
                                     screen?.render();
                                 }
                                 inputBox?.clearValue();
                                 inputBox?.focus();
                                 screen?.render();
-                                return;
+                            }
+                            return;
                         }
-                    }
-                    // Check if websocket is still connected
-                    // WebSocket.OPEN = 1
-                    if (!ws || ws.readyState !== 1) {
-                        const stateMsg = ws
-                            ? ws.readyState === 0 ? "connecting"
-                                : ws.readyState === 2 ? "closing"
-                                    : ws.readyState === 3 ? "closed"
-                                        : "unknown"
-                            : "not initialized";
-                        if (messageLogBox) {
-                            messageLogBox.log(chalk.red(`❌ WebSocket is not connected (state: ${stateMsg}). Please wait for connection or type /renew.`));
-                            messageLogBox.setScrollPerc(100);
+                        case "/help":
+                            if (messageLogBox) {
+                                const helpText = tokenIdentifier
+                                    ? chalk.dim("Commands: /exit, /quit, /renew, /buy, /sell, /help")
+                                    : chalk.dim("Commands: /exit, /quit, /renew, /help");
+                                messageLogBox.log(helpText);
+                                messageLogBox.setScrollPerc(100);
+                                screen?.render();
+                            }
+                            inputBox?.clearValue();
+                            inputBox?.focus();
                             screen?.render();
-                        }
-                        inputBox?.clearValue();
-                        inputBox?.focus();
-                        screen?.render();
-                        return;
-                    }
-                    // Check if lease is valid
-                    if (!leaseInfo || leaseInfo.leaseExpiresAt.getTime() <= Date.now()) {
-                        if (messageLogBox) {
-                            messageLogBox.log(chalk.yellow("⏱️  Your lease has expired. Type /renew to continue chatting."));
-                            messageLogBox.setScrollPerc(100);
+                            return;
+                        default:
+                            if (messageLogBox) {
+                                messageLogBox.log(chalk.yellow(`Unknown command: ${cmd}. Type /help for commands.`));
+                                messageLogBox.setScrollPerc(100);
+                                screen?.render();
+                            }
+                            inputBox?.clearValue();
+                            inputBox?.focus();
                             screen?.render();
-                        }
-                        inputBox?.clearValue();
-                        inputBox?.focus();
-                        screen?.render();
-                        return;
-                    }
-                    // Send message
-                    isSending = true;
-                    currentInput = trimmed;
-                    // Show pulsing animation in input box
-                    let pulseCount = 0;
-                    let pulseInterval = null;
-                    const tempMessageId = `pending-${Date.now()}-${Math.random()}`;
-                    const updatePulse = () => {
-                        if (!inputBox || isCleaningUp)
                             return;
-                        pulseCount++;
-                        const pulseChar = pulseCount % 2 === 0 ? "●" : "○";
-                        inputBox.setValue(`${trimmed} ${pulseChar}`);
+                    }
+                }
+                // Check if websocket is still connected
+                // WebSocket.OPEN = 1
+                if (!ws || ws.readyState !== 1) {
+                    const stateMsg = ws
+                        ? ws.readyState === 0 ? "connecting"
+                            : ws.readyState === 2 ? "closing"
+                                : ws.readyState === 3 ? "closed"
+                                    : "unknown"
+                        : "not initialized";
+                    if (messageLogBox) {
+                        messageLogBox.log(chalk.red(`❌ WebSocket is not connected (state: ${stateMsg}). Please wait for connection or type /renew.`));
+                        messageLogBox.setScrollPerc(100);
                         screen?.render();
-                    };
-                    // Initial pulse
-                    updatePulse();
-                    pulseInterval = setInterval(updatePulse, 500);
-                    pulseIntervals.set(tempMessageId, pulseInterval);
-                    try {
-                        // Ensure lease is valid before sending
-                        leaseInfo = await ensureLeaseValid(client, userAddress, leaseInfo, messageLogBox || undefined, screen || undefined);
-                        if (headerBox) {
-                            updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, true);
-                            screen?.render();
-                        }
-                        // Double-check websocket is still connected after lease renewal
-                        // WebSocket.OPEN = 1
-                        if (!ws || ws.readyState !== 1) {
-                            throw new Error("WebSocket connection lost. Please wait for reconnection.");
-                        }
-                        const result = await sendChatMessage(client, trimmed, leaseInfo.leaseId, userAddress);
-                        userAddress = result.author;
-                        // Track this message
-                        pendingMessages.set(result.messageId, tempMessageId);
-                        pendingMessages.set(`text:${trimmed}`, tempMessageId);
-                        // Keep pulsing until WebSocket confirms
                     }
-                    catch (error) {
-                        // Stop pulsing
-                        if (pulseInterval) {
-                            clearInterval(pulseInterval);
-                            pulseIntervals.delete(tempMessageId);
-                        }
-                        const errorMsg = error instanceof Error ? error.message : String(error);
-                        if (messageLogBox) {
-                            messageLogBox.log(chalk.red(`❌ ${errorMsg}`));
-                            messageLogBox.setScrollPerc(100);
-                        }
-                        inputBox?.clearValue();
-                        inputBox?.focus();
-                        isSending = false;
-                        currentInput = "";
+                    inputBox?.clearValue();
+                    inputBox?.focus();
+                    screen?.render();
+                    return;
+                }
+                // Check if lease is valid
+                if (!leaseInfo || leaseInfo.leaseExpiresAt.getTime() <= Date.now()) {
+                    if (messageLogBox) {
+                        messageLogBox.log(chalk.yellow("⏱️  Your lease has expired. Type /renew to continue chatting."));
+                        messageLogBox.setScrollPerc(100);
                         screen?.render();
                     }
-                });
-            }
-            else if (rl) {
-                // Readline input handling
-                const readlineInterface = rl; // Store reference for TypeScript
-                readlineInterface.setPrompt("");
-                readlineInterface.prompt();
-                readlineInterface.on("line", async (line) => {
-                    const trimmed = line.trim();
-                    // Ignore empty input
-                    if (!trimmed) {
-                        readlineInterface.prompt();
+                    inputBox?.clearValue();
+                    inputBox?.focus();
+                    screen?.render();
+                    return;
+                }
+                // Send message
+                isSending = true;
+                currentInput = trimmed;
+                // Show pulsing animation in input box
+                let pulseCount = 0;
+                let pulseInterval = null;
+                const tempMessageId = `pending-${Date.now()}-${Math.random()}`;
+                const updatePulse = () => {
+                    if (!inputBox || isCleaningUp)
                         return;
+                    pulseCount++;
+                    const pulseChar = pulseCount % 2 === 0 ? "●" : "○";
+                    inputBox.setValue(`${trimmed} ${pulseChar}`);
+                    screen?.render();
+                };
+                // Initial pulse
+                updatePulse();
+                pulseInterval = setInterval(updatePulse, 500);
+                pulseIntervals.set(tempMessageId, pulseInterval);
+                try {
+                    // Ensure lease is valid before sending
+                    leaseInfo = await ensureLeaseValid(client, userAddress, leaseInfo, messageLogBox || undefined, screen || undefined);
+                    if (headerBox) {
+                        updateHeaderBox(headerBox, leaseInfo, tokenIdentifier, true);
+                        screen?.render();
                     }
-                    // Handle commands
-                    if (trimmed.startsWith("/")) {
-                        const [cmd] = trimmed.split(" ");
-                        switch (cmd) {
-                            case "/exit":
-                            case "/quit":
-                                isExiting = true;
-                                if (leaseCheckInterval)
-                                    clearInterval(leaseCheckInterval);
-                                if (headerUpdateInterval)
-                                    clearInterval(headerUpdateInterval);
-                                if (ws)
-                                    ws.close();
-                                readlineInterface.close();
-                                console.log();
-                                printCat("sleeping");
-                                console.log(chalk.cyan("Chat disconnected. Goodbye! 👋"));
-                                process.exit(0);
-                                return;
-                            case "/renew": {
-                                try {
-                                    console.log(chalk.yellow("⏱️  Renewing lease..."));
-                                    const renewal = await renewLease(client, userAddress, leaseInfo?.leaseId);
-                                    leaseInfo = {
-                                        leaseId: renewal.leaseId,
-                                        leaseExpiresAt: new Date(renewal.leaseExpiresAt),
-                                    };
-                                    console.log(chalk.green(`✅ Lease renewed! Expires in ${formatTimeRemaining(leaseInfo.leaseExpiresAt)}`));
-                                    console.log(chalk.yellow("🔄 Reconnecting to chat stream..."));
-                                    // Close old connection properly
-                                    if (ws) {
-                                        ws.removeAllListeners();
-                                        // WebSocket.OPEN = 1, WebSocket.CONNECTING = 0
-                                        if (ws.readyState === 1 || ws.readyState === 0) {
-                                            ws.close();
-                                        }
-                                        ws = null;
-                                    }
-                                    // Wait for database transaction to commit
-                                    await new Promise((resolve) => setTimeout(resolve, 2000));
-                                    // Reconnect with new lease
-                                    if (wsUrl) {
-                                        // Normalize WebSocket URL protocol based on agent URL
-                                        const agentUrl = client.getAgentUrl();
-                                        const normalizedWsUrl = normalizeWebSocketUrl(wsUrl, agentUrl);
-                                        const wsUrlObj = new URL(normalizedWsUrl);
-                                        wsUrlObj.searchParams.set("leaseId", leaseInfo.leaseId);
-                                        wsUrl = wsUrlObj.toString();
-                                        // Retry logic
-                                        let retryCount = 0;
-                                        const maxRetries = 3;
-                                        let connected = false;
-                                        while (!connected && retryCount < maxRetries) {
-                                            try {
-                                                if (retryCount > 0) {
-                                                    const backoffDelay = Math.min(1000 * Math.pow(2, retryCount - 1), 5000);
-                                                    console.log(chalk.yellow(`🔄 Retry ${retryCount}/${maxRetries} in ${backoffDelay}ms...`));
-                                                    await new Promise((resolve) => setTimeout(resolve, backoffDelay));
-                                                }
-                                                const newWsUrl = wsUrl;
-                                                await new Promise((resolve, reject) => {
-                                                    const newWs = new WebSocket(newWsUrl);
-                                                    attachWebSocketHandlers(newWs);
-                                                    let timeout = null;
-                                                    let openHandler = null;
-                                                    let closeHandler = null;
-                                                    let errorHandler = null;
-                                                    const cleanup = () => {
-                                                        if (timeout)
-                                                            clearTimeout(timeout);
-                                                        if (openHandler)
-                                                            newWs.removeListener("open", openHandler);
-                                                        if (closeHandler)
-                                                            newWs.removeListener("close", closeHandler);
-                                                        if (errorHandler)
-                                                            newWs.removeListener("error", errorHandler);
-                                                    };
-                                                    timeout = setTimeout(() => {
-                                                        cleanup();
-                                                        newWs.close();
-                                                        reject(new Error("Connection timeout"));
-                                                    }, 10000);
-                                                    openHandler = () => {
-                                                        cleanup();
-                                                        ws = newWs;
-                                                        resolve();
-                                                    };
-                                                    closeHandler = (code, reason) => {
-                                                        cleanup();
-                                                        const reasonStr = reason.toString();
-                                                        if (code === 1008 && reasonStr.includes("lease")) {
-                                                            reject(new Error("Lease validation failed"));
-                                                        }
-                                                        else {
-                                                            reject(new Error(`Connection closed: ${code} - ${reasonStr}`));
-                                                        }
-                                                    };
-                                                    errorHandler = (error) => {
-                                                        cleanup();
-                                                        reject(error);
-                                                    };
-                                                    newWs.once("open", openHandler);
-                                                    newWs.once("close", closeHandler);
-                                                    newWs.once("error", errorHandler);
-                                                });
-                                                connected = true;
-                                                console.log(chalk.green("✅ Reconnected to chat stream"));
-                                            }
-                                            catch (error) {
-                                                retryCount++;
-                                                const errorMsg = error instanceof Error ? error.message : String(error);
-                                                if (retryCount >= maxRetries) {
-                                                    throw new Error(`Failed to reconnect after ${maxRetries} attempts: ${errorMsg}`);
-                                                }
-                                                console.log(chalk.yellow(`⚠️  Connection attempt ${retryCount} failed: ${errorMsg}`));
-                                            }
-                                        }
-                                    }
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                }
-                                catch (error) {
-                                    const errorMsg = error instanceof Error ? error.message : String(error);
-                                    console.log(chalk.red(`❌ ${errorMsg}`));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                }
-                                return;
-                            }
-                            case "/buy": {
-                                // Only allow in token-specific chats
-                                if (!tokenIdentifier) {
-                                    console.log(chalk.yellow("⚠️  /buy command only works in token-specific chats"));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                    return;
-                                }
-                                try {
-                                    const parts = trimmed.split(" ");
-                                    if (parts.length < 2) {
-                                        console.log(chalk.yellow("⚠️  Usage: /buy <amount> (e.g., /buy 0.05)"));
-                                        if (readlineInterface)
-                                            readlineInterface.prompt();
-                                        return;
-                                    }
-                                    const amount = parts[1];
-                                    console.log(chalk.yellow("💰 Buying tokens..."));
-                                    const isTestMode = client.getNetwork().includes("sepolia");
-                                    const result = await buyToken(client, tokenIdentifier, amount, isTestMode, true // silent mode
-                                    );
-                                    console.log(formatBuyResultCompact(result));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                }
-                                catch (error) {
-                                    const errorMsg = error instanceof Error ? error.message : String(error);
-                                    console.log(chalk.red(`❌ Buy failed: ${errorMsg}`));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                }
-                                return;
-                            }
-                            case "/sell": {
-                                // Only allow in token-specific chats
-                                if (!tokenIdentifier) {
-                                    console.log(chalk.yellow("⚠️  /sell command only works in token-specific chats"));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                    return;
-                                }
-                                try {
-                                    const parts = trimmed.split(" ");
-                                    if (parts.length < 2) {
-                                        console.log(chalk.yellow("⚠️  Usage: /sell <amount|all|percentage> (e.g., /sell 0.05, /sell all, /sell 50%)"));
-                                        if (readlineInterface)
-                                            readlineInterface.prompt();
-                                        return;
-                                    }
-                                    const amountStr = parts[1];
-                                    console.log(chalk.yellow("💸 Selling tokens..."));
-                                    // Get token info to check balance
-                                    if (!userAddress) {
-                                        throw new Error("User address not available");
-                                    }
-                                    const tokenInfo = await getTokenInfo(client, tokenIdentifier, userAddress, true // silent mode
-                                    );
-                                    if (!tokenInfo.userPosition || tokenInfo.userPosition.tokensOwned === "0") {
-                                        throw new Error("You do not own any of this token");
-                                    }
-                                    // Parse sell amount
-                                    const tokenAmount = parseTokenAmount(amountStr, tokenInfo.userPosition.tokensOwned);
-                                    const result = await sellToken(client, tokenIdentifier, tokenAmount, true // silent mode
-                                    );
-                                    console.log(formatSellResultCompact(result));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                }
-                                catch (error) {
-                                    const errorMsg = error instanceof Error ? error.message : String(error);
-                                    console.log(chalk.red(`❌ Sell failed: ${errorMsg}`));
-                                    if (readlineInterface)
-                                        readlineInterface.prompt();
-                                }
-                                return;
-                            }
-                            case "/help":
-                                const helpText = tokenIdentifier
-                                    ? chalk.dim("Commands: /exit, /quit, /renew, /buy, /sell, /help")
-                                    : chalk.dim("Commands: /exit, /quit, /renew, /help");
-                                console.log(helpText);
-                                if (readlineInterface)
-                                    readlineInterface.prompt();
-                                return;
-                            default:
-                                console.log(chalk.yellow(`Unknown command: ${cmd}. Type /help for commands.`));
-                                if (readlineInterface)
-                                    readlineInterface.prompt();
-                                return;
-                        }
-                    }
-                    // Check if websocket is still connected
+                    // Double-check websocket is still connected after lease renewal
+                    // WebSocket.OPEN = 1
                     if (!ws || ws.readyState !== 1) {
-                        const stateMsg = ws
-                            ? ws.readyState === 0 ? "connecting"
-                                : ws.readyState === 2 ? "closing"
-                                    : ws.readyState === 3 ? "closed"
-                                        : "unknown"
-                            : "not initialized";
-                        console.log(chalk.red(`❌ WebSocket is not connected (state: ${stateMsg}). Please wait for connection or type /renew.`));
-                        if (readlineInterface)
-                            readlineInterface.prompt();
-                        return;
+                        throw new Error("WebSocket connection lost. Please wait for reconnection.");
                     }
-                    // Check if lease is valid
-                    if (!leaseInfo || leaseInfo.leaseExpiresAt.getTime() <= Date.now()) {
-                        console.log(chalk.yellow("⏱️  Your lease has expired. Type /renew to continue chatting."));
-                        if (readlineInterface)
-                            readlineInterface.prompt();
-                        return;
-                    }
-                    // Send message
-                    isSending = true;
-                    currentInput = trimmed;
-                    try {
-                        // Ensure lease is valid before sending
-                        leaseInfo = await ensureLeaseValid(client, userAddress, leaseInfo, undefined, undefined);
-                        // Double-check websocket is still connected
-                        if (!ws || ws.readyState !== 1) {
-                            throw new Error("WebSocket connection lost. Please wait for reconnection.");
-                        }
-                        const result = await sendChatMessage(client, trimmed, leaseInfo.leaseId, userAddress);
-                        // Track this message
-                        const tempMessageId = `pending-${Date.now()}-${Math.random()}`;
-                        pendingMessages.set(result.messageId, tempMessageId);
-                        pendingMessages.set(`text:${trimmed}`, tempMessageId);
-                        // Message sent - will be displayed when received via WebSocket
+                    const result = await sendChatMessage(client, trimmed, leaseInfo.leaseId, userAddress);
+                    userAddress = result.author;
+                    // Track this message
+                    pendingMessages.set(result.messageId, tempMessageId);
+                    pendingMessages.set(`text:${trimmed}`, tempMessageId);
+                    // Keep pulsing until WebSocket confirms
+                }
+                catch (error) {
+                    // Stop pulsing
+                    if (pulseInterval) {
+                        clearInterval(pulseInterval);
+                        pulseIntervals.delete(tempMessageId);
                     }
-                    catch (error) {
-                        const errorMsg = error instanceof Error ? error.message : String(error);
-                        console.log(chalk.red(`❌ ${errorMsg}`));
-                        isSending = false;
-                        currentInput = "";
+                    const errorMsg = error instanceof Error ? error.message : String(error);
+                    if (messageLogBox) {
+                        messageLogBox.log(chalk.red(`❌ ${errorMsg}`));
+                        messageLogBox.setScrollPerc(100);
                     }
-                    if (readlineInterface)
-                        readlineInterface.prompt();
-                });
-                // Handle Ctrl+C for readline
-                readlineInterface.on("SIGINT", () => {
-                    isExiting = true;
-                    isSending = false;
-                    pulseIntervals.forEach((interval) => clearInterval(interval));
-                    pulseIntervals.clear();
-                    if (leaseCheckInterval)
-                        clearInterval(leaseCheckInterval);
-                    if (headerUpdateInterval)
-                        clearInterval(headerUpdateInterval);
-                    if (ws)
-                        ws.close();
-                    if (readlineInterface)
-                        readlineInterface.close();
-                    console.log();
-                    printCat("sleeping");
-                    console.log(chalk.cyan("Chat disconnected. Goodbye! 👋"));
-                    process.exit(0);
-                });
-            }
-            // Handle Ctrl+C (for blessed mode)
-            if (useBlessed && screen) {
-                screen.key(["C-c"], () => {
-                    isExiting = true;
+                    inputBox?.clearValue();
+                    inputBox?.focus();
                     isSending = false;
-                    pulseIntervals.forEach((interval) => clearInterval(interval));
-                    pulseIntervals.clear();
-                    if (leaseCheckInterval)
-                        clearInterval(leaseCheckInterval);
-                    if (headerUpdateInterval)
-                        clearInterval(headerUpdateInterval);
-                    if (ws)
-                        ws.close();
-                    screen?.destroy();
-                    console.log();
-                    printCat("sleeping");
-                    console.log(chalk.cyan("Chat disconnected. Goodbye! 👋"));
-                    process.exit(0);
-                });
-                // Focus input box and render (only for blessed)
-                if (inputBox) {
-                    inputBox.focus();
-                    screen.render();
+                    currentInput = "";
+                    screen?.render();
                 }
-            }
+            });
+            // Handle Ctrl+C
+            screen.key(["C-c"], () => {
+                isExiting = true;
+                isSending = false;
+                pulseIntervals.forEach((interval) => clearInterval(interval));
+                pulseIntervals.clear();
+                if (leaseCheckInterval)
+                    clearInterval(leaseCheckInterval);
+                if (headerUpdateInterval)
+                    clearInterval(headerUpdateInterval);
+                if (ws)
+                    ws.close();
+                screen?.destroy();
+                console.log();
+                printCat("sleeping");
+                console.log(chalk.cyan("Chat disconnected. Goodbye! 👋"));
+                process.exit(0);
+            });
+            // Focus input box and render
+            inputBox.focus();
+            screen.render();
         }
         else {
             // JSON mode: read messages from stdin and output JSON to stdout
@@ -1929,10 +1494,6 @@ export async function startChatStream(client, jsonMode = false, tokenIdentifier,
             if (screen) {
                 screen.destroy();
             }
-            // Only close readline if not in JSON mode (readline should never exist in JSON mode)
-            if (rl && !jsonMode) {
-                rl.close();
-            }
         }
         catch (cleanupError) {
             // Ignore cleanup errors