ys-code-agent 2.0.1 → 3.0.0

package/dist/ui/index.js

@@ -1,9 +1,10 @@
 import chalk from 'chalk';
 import { getLogger } from '../logger/index.js';
 import { configManager } from '../config/index.js';
-import { phoneConfig } from './phoneOptimizer.js';
 import { CommandPopup, CATEGORY_ICONS } from './CommandPopup.js';
 import { generateWelcome } from './WelcomeScreen.js';
+import { renderMarkdown } from '../utils/renderMarkdown.js';
+import { cursorTo, clearLine, moveCursor, emitKeypressEvents } from 'readline';
 const logger = getLogger('ui');
 const INDICATORS = {
     idle: '○',
@@ -27,24 +28,21 @@ export class TUI {
     status = 'idle';
     approvalMode = 'normal';
     agentMode = 'chat';
-    outputLines = [];
-    maxOutputLines = 1000;
     onInput = null;
-    onSpecialKey = null;
+    onCancelRequest = null;
     running = false;
     commandPopup;
-    inputBuffer = '';
     inputHistory = [];
     historyIndex = -1;
-    cursorPos = 0;
     popupActive = false;
     cancelRequested = false;
-    onCancelRequest = null;
-    stdinRaw = false;
+    inputBuffer = '';
+    cursorPos = 0;
+    popupLineCount = 0;
+    prevInput = null;
     constructor() {
         this.commandPopup = new CommandPopup();
         this.loadHistory();
-        this.setupRawMode();
     }
     loadHistory() {
         try {
@@ -69,340 +67,280 @@ export class TUI {
         }
         catch { }
     }
-    setupRawMode() {
-        if (!process.stdin.isTTY)
-            return;
-        try {
-            process.stdin.setRawMode?.(true);
-            this.stdinRaw = true;
-        }
-        catch {
-            this.stdinRaw = false;
-        }
-    }
     setOnCancelRequest(cb) {
         this.onCancelRequest = cb;
     }
     start() {
         this.running = true;
-        this.showPrompt();
-        this.startKeyListener();
-    }
-    startKeyListener() {
         if (!process.stdin.isTTY) {
             this.startLineMode();
             return;
         }
-        process.stdin.on('data', (data) => {
-            if (!this.running)
-                return;
-            const input = data.toString('utf-8');
-            if (this.popupActive) {
-                this.handlePopupKey(input);
-                this.renderScreen();
-                return;
-            }
-            if (input === '\x1b' || input === '\x1b[' || input === '\x1b[' && data.length > 2) {
-                if (input === '\x1b') {
-                    if (this.inputBuffer.length === 0) {
-                        void this.handleSpecialKey('escape');
-                    }
-                    else {
-                        this.inputBuffer = '';
-                        this.cursorPos = 0;
-                        this.renderScreen();
-                    }
-                    return;
-                }
-                return;
-            }
-            if (input === '\x1b[A') {
-                void this.handleSpecialKey('up');
-                return;
-            }
-            if (input === '\x1b[B') {
-                void this.handleSpecialKey('down');
-                return;
-            }
-            if (input === '\x1b[C') {
-                void this.handleSpecialKey('right');
-                return;
-            }
-            if (input === '\x1b[D') {
-                void this.handleSpecialKey('left');
-                return;
-            }
-            if (input === '\r' || input === '\n') {
-                void this.handleSpecialKey('enter');
-                return;
-            }
-            if (input === '\x7f' || input === '\b') {
-                void this.handleSpecialKey('backspace');
-                return;
+        this.startTTYMode();
+    }
+    startLineMode() {
+        const { createInterface } = require('readline');
+        const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: '' });
+        rl.on('line', (line) => {
+            const trimmed = line.trim();
+            if (trimmed && this.onInput) {
+                this.addHistory(trimmed);
+                this.onInput(trimmed);
             }
-            if (input === '\x03') {
-                void this.handleSpecialKey('ctrl_c');
-                return;
+            rl.prompt();
+        });
+        rl.on('SIGINT', () => process.exit(0));
+        rl.prompt();
+    }
+    startTTYMode() {
+        try {
+            process.stdin.setRawMode?.(true);
+        }
+        catch { }
+        emitKeypressEvents(process.stdin);
+        this.inputBuffer = '';
+        this.cursorPos = 0;
+        this.popupLineCount = 0;
+        process.stdin.on('keypress', this.handleKeypress.bind(this));
+        this.renderScreen();
+    }
+    async handleKeypress(str, key) {
+        if (!this.running)
+            return;
+        if (!key)
+            key = {};
+        const k = key.name || '';
+        const c = key.ctrl || false;
+        if (this.popupActive) {
+            await this.handlePopupKeypress(str, key);
+            return;
+        }
+        if (k === 'escape') {
+            if (this.inputBuffer.length > 0) {
+                this.inputBuffer = '';
+                this.cursorPos = 0;
             }
-            if (input === '\x0c') {
-                void this.handleSpecialKey('ctrl_l');
-                return;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'return' || k === 'enter') {
+            const input = this.inputBuffer.trim();
+            this.inputBuffer = '';
+            this.cursorPos = 0;
+            if (input) {
+                this.addHistory(input);
+                if (this.onInput) {
+                    await this.onInput(input);
+                }
             }
-            if (input === '\x01') {
-                void this.handleSpecialKey('ctrl_a');
-                return;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'backspace') {
+            if (this.cursorPos > 0) {
+                this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos - 1) + this.inputBuffer.slice(this.cursorPos);
+                this.cursorPos--;
             }
-            if (input === '\x05') {
-                void this.handleSpecialKey('ctrl_e');
-                return;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'up') {
+            if (this.inputHistory.length > 0) {
+                if (this.historyIndex === -1) {
+                    this.historyIndex = this.inputHistory.length - 1;
+                }
+                else if (this.historyIndex > 0) {
+                    this.historyIndex--;
+                }
+                this.inputBuffer = this.inputHistory[this.historyIndex];
+                this.cursorPos = this.inputBuffer.length;
             }
-            if (input === '\x0a' || input === '\x0d') {
-                return;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'down') {
+            if (this.historyIndex >= 0) {
+                this.historyIndex++;
+                if (this.historyIndex >= this.inputHistory.length) {
+                    this.historyIndex = -1;
+                    this.inputBuffer = '';
+                }
+                else {
+                    this.inputBuffer = this.inputHistory[this.historyIndex];
+                }
+                this.cursorPos = this.inputBuffer.length;
             }
-            if (input === '\x09') {
-                void this.handleSpecialKey('tab');
-                return;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'left') {
+            if (this.cursorPos > 0)
+                this.cursorPos--;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'right') {
+            if (this.cursorPos < this.inputBuffer.length)
+                this.cursorPos++;
+            this.renderScreen();
+            return;
+        }
+        if (k === 'tab') {
+            this.handleTab();
+            this.renderScreen();
+            return;
+        }
+        if (c && k === 'c') {
+            if (this.cancelRequested || this.status === 'thinking' || this.status === 'executing') {
+                if (this.onCancelRequest)
+                    this.onCancelRequest();
             }
-            if (input === '\x0f') {
-                void this.handleSpecialKey('ctrl_o');
-                return;
+            else {
+                this.printLine('');
+                this.printLine(chalk.yellow('Use /exit to quit, or press Ctrl+C again to force quit'));
+                this.cancelRequested = true;
+                setTimeout(() => { this.cancelRequested = false; }, 2000);
             }
-            if (input === '\x18') {
-                void this.handleSpecialKey('ctrl_x');
+            this.renderScreen();
+            return;
+        }
+        if (c && k === 'l') {
+            this.clear();
+            this.renderScreen();
+            return;
+        }
+        if (c && k === 'x') {
+            await this.openExternalEditor();
+            return;
+        }
+        if (c && k === 'a') {
+            this.cursorPos = 0;
+            this.renderScreen();
+            return;
+        }
+        if (c && k === 'e') {
+            this.cursorPos = this.inputBuffer.length;
+            this.renderScreen();
+            return;
+        }
+        if (str && str.length === 1 && str.charCodeAt(0) >= 32) {
+            this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos) + str + this.inputBuffer.slice(this.cursorPos);
+            this.cursorPos++;
+            if (str === '/') {
+                this.popupActive = true;
+                this.commandPopup.open();
+                this.commandPopup.setFilter('');
+                this.renderScreen();
                 return;
             }
-            this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos) + input + this.inputBuffer.slice(this.cursorPos);
-            this.cursorPos += input.length;
-            if (input === '/') {
+            if (this.inputBuffer.startsWith('/') && this.inputBuffer.length > 1) {
                 this.popupActive = true;
                 this.commandPopup.open();
-                this.commandPopup.setFilter(input);
-            }
-            else {
-                if (this.inputBuffer.startsWith('/') && this.inputBuffer.length > 1) {
-                    this.popupActive = true;
-                    this.commandPopup.open();
-                    this.commandPopup.setFilter(this.inputBuffer);
-                }
+                this.commandPopup.setFilter(this.inputBuffer.slice(1));
+                this.renderScreen();
+                return;
             }
-            this.renderScreen();
-        });
-        process.stdin.on('end', () => { });
+        }
+        this.renderScreen();
     }
-    startLineMode() {
-        const { createInterface } = require('readline');
-        const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: '' });
-        rl.on('line', (line) => {
-            this.inputBuffer = line.trim();
-            if (this.inputBuffer && this.onInput) {
-                this.addHistory(this.inputBuffer);
-                this.onInput(this.inputBuffer);
+    clearPopupLines() {
+        if (this.popupLineCount > 0) {
+            try {
+                moveCursor(process.stdout, 0, -(this.popupLineCount + 1));
             }
-            this.inputBuffer = '';
-            this.showPrompt();
-        });
-        rl.on('SIGINT', () => process.exit(0));
-        this.showPrompt();
+            catch { }
+            for (let i = 0; i <= this.popupLineCount; i++) {
+                try {
+                    cursorTo(process.stdout, 0);
+                    clearLine(process.stdout, 1);
+                    process.stdout.write('\n');
+                }
+                catch { }
+            }
+            this.popupLineCount = 0;
+        }
     }
-    handlePopupKey(input) {
-        if (input === '\x1b') {
+    async handlePopupKeypress(str, key) {
+        const k = key.name || '';
+        if (k === 'escape') {
+            this.clearPopupLines();
             this.popupActive = false;
             this.commandPopup.close();
             this.inputBuffer = '';
             this.cursorPos = 0;
+            this.renderScreen();
             return;
         }
-        if (input === '\x1b[A' || input === '\x1bOA') {
+        if (k === 'up') {
             this.commandPopup.moveUp();
+            this.renderScreen();
             return;
         }
-        if (input === '\x1b[B' || input === '\x1bOB') {
+        if (k === 'down') {
             this.commandPopup.moveDown();
+            this.renderScreen();
             return;
         }
-        if (input === '\r' || input === '\n') {
-            const selectedCmd = this.commandPopup.getSelectedCommand();
-            if (selectedCmd) {
-                this.popupActive = false;
-                this.commandPopup.close();
-                const fullCmd = `/${selectedCmd} `;
-                this.inputBuffer = fullCmd;
-                this.cursorPos = fullCmd.length;
+        if (k === 'return' || k === 'enter') {
+            const cmd = this.commandPopup.getSelectedCommand();
+            this.popupActive = false;
+            this.commandPopup.close();
+            this.clearPopupLines();
+            if (cmd) {
+                const fullInput = `/${cmd} `;
+                if (this.onInput) {
+                    await this.onInput(fullInput.trim());
+                }
             }
+            this.renderScreen();
             return;
         }
-        if (input === '\x09') {
-            const selectedCmd = this.commandPopup.getSelectedCommand();
-            if (selectedCmd) {
+        if (k === 'backspace') {
+            this.commandPopup.deleteChar();
+            const filter = this.commandPopup.getFilterText();
+            if (filter.length === 0) {
+                this.clearPopupLines();
                 this.popupActive = false;
                 this.commandPopup.close();
-                const fullCmd = `/${selectedCmd} `;
-                this.inputBuffer = fullCmd;
-                this.cursorPos = fullCmd.length;
+                this.inputBuffer = '/';
+                this.cursorPos = 1;
             }
+            this.renderScreen();
             return;
         }
-        if (input === '\x7f' || input === '\b') {
-            const currentFilter = this.commandPopup.getFilterText();
-            if (currentFilter.length <= 1) {
-                this.popupActive = false;
-                this.commandPopup.close();
-                this.inputBuffer = '';
-                this.cursorPos = 0;
-                return;
-            }
-            this.commandPopup.deleteChar();
+        if (str && str.length === 1 && str.charCodeAt(0) >= 32) {
+            this.commandPopup.appendChar(str);
+            this.renderScreen();
             return;
         }
-        if (input.length === 1 && input.charCodeAt(0) >= 32) {
-            this.commandPopup.appendChar(input);
-            this.inputBuffer = this.commandPopup.getFilterText();
-            this.cursorPos = this.inputBuffer.length;
-        }
     }
-    async handleSpecialKey(key) {
-        switch (key) {
-            case 'escape':
-                if (this.inputBuffer.length > 0) {
-                    this.inputBuffer = '';
-                    this.cursorPos = 0;
-                    this.renderScreen();
-                }
-                break;
-            case 'enter':
-                if (this.inputBuffer.trim()) {
-                    this.addHistory(this.inputBuffer.trim());
-                    const msg = this.inputBuffer.trim();
-                    this.inputBuffer = '';
-                    this.cursorPos = 0;
-                    this.clearOutputLine();
-                    if (this.onInput)
-                        this.onInput(msg);
-                }
-                this.renderScreen();
-                break;
-            case 'backspace':
-                if (this.cursorPos > 0) {
-                    this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos - 1) + this.inputBuffer.slice(this.cursorPos);
-                    this.cursorPos--;
-                    this.updatePopupFilter();
-                }
-                this.renderScreen();
-                break;
-            case 'up':
-                if (this.inputHistory.length > 0) {
-                    if (this.historyIndex === -1) {
-                        this.historyIndex = this.inputHistory.length - 1;
-                    }
-                    else if (this.historyIndex > 0) {
-                        this.historyIndex--;
-                    }
-                    this.inputBuffer = this.inputHistory[this.historyIndex];
-                    this.cursorPos = this.inputBuffer.length;
-                    this.renderScreen();
-                }
-                break;
-            case 'down':
-                if (this.historyIndex >= 0) {
-                    this.historyIndex++;
-                    if (this.historyIndex >= this.inputHistory.length) {
-                        this.historyIndex = -1;
-                        this.inputBuffer = '';
-                    }
-                    else {
-                        this.inputBuffer = this.inputHistory[this.historyIndex];
-                    }
-                    this.cursorPos = this.inputBuffer.length;
-                    this.renderScreen();
-                }
-                break;
-            case 'left':
-                if (this.cursorPos > 0) {
-                    this.cursorPos--;
-                    this.renderScreen();
-                }
-                break;
-            case 'right':
-                if (this.cursorPos < this.inputBuffer.length) {
-                    this.cursorPos++;
-                    this.renderScreen();
-                }
-                break;
-            case 'ctrl_a':
-                this.cursorPos = 0;
-                this.renderScreen();
-                break;
-            case 'ctrl_e':
+    handleTab() {
+        const match = this.inputBuffer.match(/^\/?(\w*)$/);
+        if (match) {
+            const partial = match[1].toLowerCase();
+            const { ALL_COMMANDS } = require('./CommandPopup.js');
+            const cmds = ALL_COMMANDS.map((c) => c.command).filter((c) => c.startsWith(partial));
+            if (cmds.length === 1) {
+                this.inputBuffer = `/${cmds[0]} `;
                 this.cursorPos = this.inputBuffer.length;
-                this.renderScreen();
-                break;
-            case 'ctrl_c':
-                if (this.cancelRequested || this.status === 'thinking' || this.status === 'executing') {
-                    if (this.onCancelRequest)
-                        this.onCancelRequest();
-                }
-                else {
-                    this.printLine('\n' + chalk.yellow('Use /exit to quit, or press Ctrl+C again to force quit'));
-                    this.cancelRequested = true;
-                    setTimeout(() => { this.cancelRequested = false; }, 2000);
-                }
-                break;
-            case 'ctrl_l':
-                this.clear();
-                this.printWelcome();
-                this.showPrompt();
-                break;
-            case 'tab': {
-                const match = this.inputBuffer.match(/^\/?(\w*)$/);
-                if (match) {
-                    const partial = match[1].toLowerCase();
-                    const cmds = this.getAllCommands().filter((c) => c.startsWith(partial));
-                    if (cmds.length === 1) {
-                        this.inputBuffer = `/${cmds[0]} `;
-                        this.cursorPos = this.inputBuffer.length;
-                        this.renderScreen();
-                    }
-                }
-                break;
-            }
-            case 'ctrl_o':
-                break;
-            case 'ctrl_x':
-                void this.openExternalEditor();
-                break;
-        }
-    }
-    updatePopupFilter() {
-        if (this.popupActive) {
-            this.commandPopup.setFilter(this.inputBuffer);
-            if (this.inputBuffer === '/' || this.inputBuffer === '') {
-                this.popupActive = false;
-                this.commandPopup.close();
             }
         }
     }
-    getAllCommands() {
-        const { ALL_COMMANDS } = require('./CommandPopup.js');
-        return ALL_COMMANDS.map((c) => c.command);
-    }
     async openExternalEditor() {
         const editor = process.env.EDITOR || 'nano';
-        const { writeFileSync, unlinkSync, existsSync, mkdirSync } = await import('fs');
-        const { join } = await import('path');
+        const { writeFileSync, unlinkSync, existsSync, mkdirSync, readFileSync } = await import('fs');
         const tmpDir = '/tmp/ys-agent';
         if (!existsSync(tmpDir))
             mkdirSync(tmpDir, { recursive: true });
-        const tmpFile = join(tmpDir, `input-${Date.now()}.md`);
+        const tmpFile = `/tmp/ys-agent/input-${Date.now()}.md`;
         writeFileSync(tmpFile, this.inputBuffer, 'utf-8');
         const { execSync } = await import('child_process');
         try {
             execSync(`${editor} "${tmpFile}"`, { stdio: 'inherit' });
-            const { readFileSync } = await import('fs');
             const content = readFileSync(tmpFile, 'utf-8').trim();
             if (content) {
                 this.inputBuffer = content;
                 this.cursorPos = content.length;
-                this.renderScreen();
             }
         }
         catch { }
@@ -410,147 +348,42 @@ export class TUI {
             unlinkSync(tmpFile);
         }
         catch { }
-    }
-    addHistory(input) {
-        if (this.inputHistory[this.inputHistory.length - 1] !== input) {
-            this.inputHistory.push(input);
-        }
-        this.historyIndex = -1;
-        this.saveHistory();
+        this.renderScreen();
     }
     renderScreen() {
         if (!process.stdout.isTTY)
             return;
-        const lines = this.buildDisplayLines();
-        const clearSeq = `\x1b[0J\x1b[${process.stdout.rows || 24};0H`;
-        const output = clearSeq + lines.join('\n');
-        try {
-            cursorToSync(process.stdout, 0, (process.stdout.rows || 24) - lines.length);
-            process.stdout.write(output);
-        }
-        catch { }
-    }
-    buildDisplayLines() {
-        const lines = [];
-        if (this.popupActive) {
-            const popupLines = this.commandPopup.render().split('\n');
-            lines.push(...popupLines);
-        }
-        lines.push(this.buildPromptLine());
-        return lines;
-    }
-    stop() {
-        this.running = false;
-        if (this.stdinRaw && process.stdin.isTTY) {
+        const promptLine = this.buildPromptLine();
+        if (this.popupLineCount > 0) {
             try {
-                process.stdin.setRawMode?.(false);
+                moveCursor(process.stdout, 0, -(this.popupLineCount + 1));
             }
             catch { }
         }
-        process.stdin.removeAllListeners('data');
-        this.showShutdownScreen();
-    }
-    clear() {
-        console.clear();
-    }
-    clearOutputLine() {
+        if (this.popupActive && this.commandPopup.isVisible()) {
+            const popup = this.commandPopup.render();
+            const popupLines = popup.split('\n');
+            this.popupLineCount = popupLines.length;
+            for (const l of popupLines) {
+                try {
+                    cursorTo(process.stdout, 0);
+                    clearLine(process.stdout, 1);
+                    process.stdout.write(l + '\n');
+                }
+                catch { }
+            }
+        }
+        else {
+            this.popupLineCount = 0;
+        }
         try {
-            const { cursorTo, clearLine } = require('readline');
             cursorTo(process.stdout, 0);
             clearLine(process.stdout, 1);
+            process.stdout.write(promptLine);
         }
         catch { }
     }
-    printWelcome() {
-        const welcome = generateWelcome();
-        const lines = welcome.split('\n');
-        for (const line of lines) {
-            this.printLine(line);
-        }
-        this.printLine('');
-        if (configManager.getConfig().security.readOnlyMode) {
-            this.printWarning('Read-only mode active. File modifications will be blocked.');
-        }
-        if (this.approvalMode === 'yolo') {
-            this.printWarning('YOLO mode active. Agent will execute actions without confirmation.');
-        }
-    }
-    printHelp() {
-        const { ALL_COMMANDS } = require('./CommandPopup.js');
-        const w = Math.max(Math.min(process.stdout.columns || 80, 72), 30);
-        const top = `╔${'═'.repeat(w)}╗`;
-        const bottom = `╚${'═'.repeat(w)}╝`;
-        const lines = [top];
-        const title = ` YS Code Agent — Commands `;
-        const titlePad = Math.max(0, Math.floor((w - title.length) / 2));
-        lines.push(`║${' '.repeat(titlePad)}${chalk.cyan(title)}${' '.repeat(Math.max(0, w - titlePad - title.length))}║`);
-        lines.push(`╠${'═'.repeat(w)}╣`);
-        const categories = {};
-        for (const cmd of ALL_COMMANDS) {
-            if (!categories[cmd.category])
-                categories[cmd.category] = [];
-            categories[cmd.category].push(cmd);
-        }
-        let first = true;
-        for (const [cat, cmds] of Object.entries(categories)) {
-            if (!first)
-                lines.push(`║${' '.repeat(w)}║`);
-            first = false;
-            const icon = CATEGORY_ICONS[cat] || ' ';
-            lines.push(`║  ${icon} ${chalk.white(cat.toUpperCase())}${' '.repeat(Math.max(0, w - 5 - cat.length))}║`);
-            for (const cmd of cmds) {
-                const usage = cmd.usage || `/${cmd.command}`;
-                const cmdStr = chalk.yellow(usage);
-                const desc = chalk.gray(cmd.description);
-                const padding = ' '.repeat(Math.max(0, w - usage.length - cmd.description.length - 6));
-                lines.push(`║  ${cmdStr}${padding}${desc}  ║`);
-            }
-        }
-        lines.push(`╠${'═'.repeat(w)}╣`);
-        lines.push(`║  ${chalk.gray('Keyboard Shortcuts:')}${' '.repeat(Math.max(0, w - 22))}║`);
-        const shortcuts = [
-            ['↑/↓', 'History navigation'],
-            ['Tab', 'Autocomplete commands'],
-            ['Ctrl+C', 'Cancel request'],
-            ['Ctrl+L', 'Clear screen'],
-            ['Ctrl+A', 'Line start'],
-            ['Ctrl+E', 'Line end'],
-            ['Ctrl+X', 'Open editor'],
-            ['Esc', 'Cancel / clear input'],
-        ];
-        for (const [key, desc] of shortcuts) {
-            const keyStr = chalk.cyan(key);
-            const descStr = chalk.gray(desc);
-            const padding = ' '.repeat(Math.max(0, w - key.length - desc.length - 6));
-            lines.push(`║  ${keyStr}${padding}${descStr}  ║`);
-        }
-        lines.push(bottom);
-        for (const l of lines)
-            this.printLine(l);
-    }
-    printWarning(message) {
-        const w = Math.max(Math.min(process.stdout.columns || 80, 60), 10);
-        const top = `╔${'═'.repeat(w)}╗`;
-        const bottom = `╚${'═'.repeat(w)}╝`;
-        this.printLine('');
-        this.printLine(chalk.yellow(top));
-        const warnLine = `  ⚠  ${chalk.yellow(message)}`;
-        const pad = Math.max(0, w - warnLine.length);
-        this.printLine(`║${warnLine}${' '.repeat(pad)}║`);
-        this.printLine(chalk.yellow(bottom));
-    }
-    showPrompt() {
-        if (!this.running)
-            return;
-        const promptLine = this.buildPromptLine();
-        if (phoneConfig.isTermux) {
-            this.printLine(promptLine);
-        }
-        else {
-            this.renderScreen();
-        }
-    }
-    buildPromptLine() {
+    buildPromptPrefix() {
         const statusIndicator = STATUS_COLORS[this.status](INDICATORS[this.status]);
         const config = configManager.getConfig();
         const model = config.model.model;
@@ -567,28 +400,37 @@ export class TUI {
             approvalBadge = chalk.cyan(' [safe]');
         else if (this.approvalMode === 'yolo')
             approvalBadge = chalk.red(' [yolo]');
-        const promptStr = `${statusIndicator} ${chalk.cyan('ys')} ${chalk.yellow(`[${modelShort}]`)}${modeBadge}${approvalBadge} ${chalk.gray('›')} `;
-        const inputStr = this.inputBuffer || ' ';
-        const cursorChar = phoneConfig.isTermux ? '█' : '█';
-        const cursor = chalk.gray(cursorChar);
-        const displayedInput = inputStr.length > 0 ? inputStr : '';
-        let cursorLine = '';
-        if (this.cursorPos >= displayedInput.length) {
-            cursorLine = promptStr + displayedInput + cursor;
+        return `${statusIndicator} ${chalk.cyan('ys')} ${chalk.yellow(`[${modelShort}]`)}${modeBadge}${approvalBadge} ${chalk.gray('›')} `;
+    }
+    buildPromptLine() {
+        const prefix = this.buildPromptPrefix();
+        const input = this.inputBuffer || '';
+        const cursor = chalk.gray('█');
+        let line;
+        if (this.cursorPos >= input.length) {
+            line = prefix + input + cursor;
         }
         else {
-            const before = displayedInput.slice(0, this.cursorPos);
-            const after = displayedInput.slice(this.cursorPos);
-            cursorLine = promptStr + before + cursor + after;
+            const before = input.slice(0, this.cursorPos);
+            const after = input.slice(this.cursorPos);
+            line = prefix + before + cursor + after;
+        }
+        return line;
+    }
+    showPrompt() {
+        if (this.running)
+            this.renderScreen();
+    }
+    addHistory(input) {
+        if (this.inputHistory[this.inputHistory.length - 1] !== input) {
+            this.inputHistory.push(input);
         }
-        return cursorLine + '\n' + chalk.gray(`  💡 / for commands  |  ↑↓ history  |  Tab complete`);
+        this.historyIndex = -1;
+        this.saveHistory();
     }
     setOnInput(handler) {
         this.onInput = handler;
     }
-    setOnSpecialKey(handler) {
-        this.onSpecialKey = handler;
-    }
     setStatus(status) {
         this.status = status;
     }
@@ -610,32 +452,28 @@ export class TUI {
             return;
         }
         try {
-            const { cursorTo, clearLine } = require('readline');
             cursorTo(process.stdout, 0);
             clearLine(process.stdout, 1);
-            console.log(line);
+            process.stdout.write(line + '\n');
         }
         catch {
             console.log(line);
         }
-        this.outputLines.push(line);
-        if (this.outputLines.length > this.maxOutputLines) {
-            this.outputLines.shift();
-        }
     }
     printAssistant(message) {
-        this.printLine('');
-        const formatted = chalk.green(message);
-        this.printLine(formatted);
+        const rendered = renderMarkdown(message);
+        for (const line of rendered.split('\n')) {
+            this.printLine(line);
+        }
+    }
+    printWarning(message) {
+        this.printLine(chalk.yellow(`⚠ ${message}`));
     }
     printError(error) {
         const w = Math.max(Math.min(process.stdout.columns || 80, 56), 10);
-        const top = `╔${'═'.repeat(w)}╗`;
-        const bottom = `╚${'═'.repeat(w)}╝`;
-        this.printLine('');
-        this.printLine(chalk.red(top));
-        this.printLine(`║  ${chalk.red('✗')} ${chalk.white(error)}${' '.repeat(Math.max(0, w - error.length - 7))}║`);
-        this.printLine(chalk.red(bottom));
+        this.printLine(chalk.red(`╔${'═'.repeat(w)}╗`));
+        this.printLine(chalk.red(`║`) + `  ${chalk.red('✗')} ${chalk.white(error)}${' '.repeat(Math.max(0, w - error.length - 7))}` + chalk.red(`║`));
+        this.printLine(chalk.red(`╚${'═'.repeat(w)}╝`));
     }
     printToolCall(toolName, args) {
         const argsStr = Object.entries(args)
@@ -652,75 +490,91 @@ export class TUI {
             this.printLine(chalk.gray(`  ✕ ${chalk.red(result.error || 'failed')}`));
         }
     }
-    showStatusBar(info) {
-        const statusColor = STATUS_COLORS[info.status];
-        const statusIcon = INDICATORS[info.status];
-        const truncated = info.task ? info.task.slice(0, 40) + (info.task.length > 40 ? '...' : '') : '';
-        const parts = [
-            `${statusColor(`${statusIcon} ${info.status}`)}`,
-            chalk.gray(`msgs:${info.messages}`),
-            chalk.gray(`tok:${info.tokens}`),
-        ];
-        if (info.provider)
-            parts.push(chalk.gray(`prov:${info.provider}`));
-        if (truncated)
-            parts.push(chalk.gray(`task:${truncated}`));
-    }
-    showShutdownScreen() {
-        const w = Math.max(Math.min(process.stdout.columns || 80, 50), 30);
-        const top = `╭${'─'.repeat(w)}╮`;
-        const bottom = `╰${'─'.repeat(w)}╯`;
-        console.log('');
-        console.log(chalk.cyan(top));
-        console.log(`│${' '.repeat(w)}│`);
-        const titleLine = '  ◆ YS Code Agent — Session Complete  ';
-        const titlePad = Math.max(0, Math.floor((w - titleLine.length) / 2));
-        console.log(`│${' '.repeat(titlePad)}${chalk.cyan(titleLine)}${' '.repeat(Math.max(0, w - titlePad - titleLine.length))}│`);
-        console.log(`│${' '.repeat(w)}│`);
-        const { sessionManager } = require('../session/index.js');
-        const session = sessionManager.getCurrentSession();
-        if (session) {
-            const sessionId = session.id.slice(0, 8);
-            const duration = formatDuration(Date.now() - session.createdAt);
-            const msgCount = session.state.messages.length;
-            console.log(`│  ${chalk.white('Session')}: ${chalk.yellow(sessionId.padEnd(w - 13))}│`);
-            console.log(`│  ${chalk.white('Duration')}: ${chalk.yellow(duration.padEnd(w - 14))}│`);
-            console.log(`│  ${chalk.white('Messages')}: ${chalk.yellow(String(msgCount).padEnd(w - 14))}│`);
-        }
-        console.log(`│${' '.repeat(w)}│`);
-        console.log(`│  ${chalk.gray('Session saved. Resume with:')} ${chalk.yellow('ys --resume <session>')}${' '.repeat(Math.max(0, w - 43))}│`);
-        console.log(`│${' '.repeat(w)}│`);
-        console.log(chalk.cyan(bottom));
-        console.log('');
+    showStatusBar(_info) {
     }
-    destroy() {
-        if (this.stdinRaw && process.stdin.isTTY) {
-            try {
-                process.stdin.setRawMode?.(false);
+    printWelcome() {
+        const welcome = generateWelcome();
+        for (const line of welcome.split('\n')) {
+            this.printLine(line);
+        }
+        this.printLine('');
+        if (configManager.getConfig().security.readOnlyMode) {
+            this.printWarning('Read-only mode active. File modifications will be blocked.');
+        }
+        if (this.approvalMode === 'yolo') {
+            this.printWarning('YOLO mode active. Agent will execute actions without confirmation.');
+        }
+    }
+    printHelp() {
+        const { ALL_COMMANDS } = require('./CommandPopup.js');
+        const w = Math.max(Math.min(process.stdout.columns || 80, 72), 30);
+        const top = `╔${'═'.repeat(w)}╗`;
+        const bottom = `╚${'═'.repeat(w)}╝`;
+        const lines = [top];
+        const title = ` YS Code Agent — Commands `;
+        const titlePad = Math.max(0, Math.floor((w - title.length) / 2));
+        lines.push(`║${' '.repeat(titlePad)}${chalk.cyan(title)}${' '.repeat(Math.max(0, w - titlePad - title.length))}║`);
+        lines.push(`╠${'═'.repeat(w)}╣`);
+        const categories = {};
+        for (const cmd of ALL_COMMANDS) {
+            if (!categories[cmd.category])
+                categories[cmd.category] = [];
+            categories[cmd.category].push(cmd);
+        }
+        let first = true;
+        for (const [cat, cmds] of Object.entries(categories)) {
+            if (!first)
+                lines.push(`║${' '.repeat(w)}║`);
+            first = false;
+            const icon = CATEGORY_ICONS[cat] || ' ';
+            lines.push(`║  ${icon} ${chalk.white(cat.toUpperCase())}${' '.repeat(Math.max(0, w - 5 - cat.length))}║`);
+            for (const cmd of cmds) {
+                const usage = cmd.usage || `/${cmd.command}`;
+                const cmdStr = chalk.yellow(usage);
+                const desc = chalk.gray(cmd.description);
+                const padding = ' '.repeat(Math.max(0, w - usage.length - cmd.description.length - 6));
+                lines.push(`║  ${cmdStr}${padding}${desc}  ║`);
             }
-            catch { }
         }
-        process.stdin.removeAllListeners('data');
+        lines.push(`╠${'═'.repeat(w)}╣`);
+        lines.push(`║  ${chalk.gray('Keyboard Shortcuts:')}${' '.repeat(Math.max(0, w - 22))}║`);
+        const shortcuts = [
+            ['↑/↓', 'History navigation'],
+            ['Tab', 'Autocomplete commands'],
+            ['Ctrl+C', 'Cancel request'],
+            ['Ctrl+L', 'Clear screen'],
+            ['Ctrl+A', 'Line start'],
+            ['Ctrl+E', 'Line end'],
+            ['Ctrl+X', 'Open editor'],
+            ['Esc', 'Cancel / clear input'],
+        ];
+        for (const [key, desc] of shortcuts) {
+            const keyStr = chalk.cyan(key);
+            const descStr = chalk.gray(desc);
+            const padding = ' '.repeat(Math.max(0, w - key.length - desc.length - 6));
+            lines.push(`║  ${keyStr}${padding}${descStr}  ║`);
+        }
+        lines.push(bottom);
+        for (const l of lines)
+            this.printLine(l);
     }
-    getOutputLineCount() {
-        return this.outputLines.length;
+    clear() {
+        console.clear();
     }
-}
-function formatDuration(ms) {
-    if (ms < 1000)
-        return `${ms}ms`;
-    if (ms < 60000)
-        return `${(ms / 1000).toFixed(1)}s`;
-    const m = Math.floor(ms / 60000);
-    const s = Math.floor((ms % 60000) / 1000);
-    return `${m}m ${s}s`;
-}
-function cursorToSync(stream, x, y) {
-    try {
-        const { cursorTo } = require('readline');
-        cursorTo(stream, x, y);
+    stop() {
+        this.running = false;
+        process.stdin.removeAllListeners('keypress');
+        try {
+            process.stdin.setRawMode?.(false);
+        }
+        catch { }
+    }
+    destroy() {
+        this.stop();
+    }
+    getOutputLineCount() {
+        return 0;
     }
-    catch { }
 }
 export const tui = new TUI();
 //# sourceMappingURL=index.js.map