@bolloon/bolloon-agent 0.3.20 → 0.3.21

package/dist/cli/loading-tui.js

@@ -63,7 +63,7 @@ export const BOLLOON_BANNER = [
     `${C_DIM}Bolloon Agent v${BOLLOON_VERSION}${RESET}`,
 ].join('\n');
 /** 艺术字全部行 (图标在左, BOLLOON 艺术字在右), 供框内渲染 */
-function brandArtLines() {
+export function brandArtLines() {
     const icon = BOLLOON_ICON.split('\n');
     const banner = BOLLOON_BANNER.split('\n');
     const gap = 2;
@@ -107,7 +107,7 @@ function stripAnsi(s) {
     return s.replace(/\x1b\[[0-9;]*m/g, '');
 }
 /** 显示宽度: CJK / 全角符号算 2, 其余算 1 (ANSI 转义不计入) */
-function dispWidth(s) {
+export function dispWidth(s) {
     const clean = s.replace(/\x1b\[[0-9;]*m/g, '');
     let n = 0;
     for (const ch of clean) {

package/dist/index.js

@@ -15,7 +15,7 @@ import { createSubAgentManager } from './agents/subagent-manager.js';
 import { getGlobalSharedContext } from './social/global-shared-context.js';
 import { createBollharnessIntegration } from './bollharness-integration/index.js';
 import * as readline from 'readline';
-import { printBanner, renderDialog, renderUserMessage, renderAgentMessage, renderToolCall, flowConnector, termWidth } from './cli/loading-tui.js';
+import { printBanner, renderDialog, renderUserMessage, renderAgentMessage, renderToolCall, flowConnector, termWidth, brandArtLines, boxTop, boxRow, boxBottom, dispWidth } from './cli/loading-tui.js';
 // 启动自动检查更新：后台、节流、检测到新版本自动安装（可被 --no-update / BOLLOON_SKIP_UPDATE 关闭）
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
@@ -345,16 +345,8 @@ function rpcErr(code, msg) {
 }
 // ---------------------------------------------------------------------------
 // CLI with persistent bottom prompt
-// ---------------------------------------------------------------------------
-const SAVE_CURSOR = '\x1b[s';
-const RESTORE_CURSOR = '\x1b[u';
-const MOVE_TO_BOTTOM = '\x1b[999A';
-const HIDE_CURSOR_SEQ = '\x1b[?25l';
-const SHOW_CURSOR_SEQ = '\x1b[?25h';
-const MOVE_UP_1 = '\x1b[1A';
+// 2026-07-28: 改用 readline.createInterface + replReadline 循环
 let isRunning = false;
-let currentInput = '';
-let promptVisible = false;
 let queueMode = false;
 const pendingQueue = [];
 // 底部状态栏数据
@@ -379,40 +371,14 @@ function statusBarLine() {
     const bar = C_OK + '█'.repeat(filled) + C_DIM + '░'.repeat(barLen - filled) + RESET;
     return `${C_ACCENT}${cliModelName}${RESET}${C_DIM}  │${RESET} ${cliAgentName} ${C_DIM}│${RESET} ⏱ ${C_ACCENT}${dur}${RESET} ${C_DIM}│${RESET} ${bar} ${C_DIM}${cliContextPct}%${RESET}`;
 }
-function showBottomPrompt() {
-    if (!isRunning)
-        return;
-    promptVisible = true;
-    const tw = process.stdout.columns || 80;
-    const sep = C_DIM + '─'.repeat(tw) + RESET;
-    const hint = currentInput.length === 0 && !queueMode
-        ? ` ${C_DIM}!cmd${RESET}  ${C_DIM}/queue${RESET}  ${C_DIM}/help${RESET}`
-        : queueMode ? ` ${C_WARN}[队列${pendingQueue.length}]${RESET}` : '';
-    const prefix = queueMode ? `${C_WARN}▸${RESET}` : `${C_ACCENT}❯${RESET}`;
-    process.stdout.write(`\n${sep}\n${statusBarLine()}\n${sep}\n${C_DIM}${'─'.repeat(tw)}${RESET}\n${prefix} ${currentInput}${hint}`);
-}
-function clearPromptLine() {
-    promptVisible = false;
-}
 function startCLI(comm) {
     isRunning = true;
-    currentInput = '';
-    promptVisible = false;
-    try {
-        process.stdin.setRawMode(true);
-    }
-    catch {
-    }
-    readline.emitKeypressEvents(process.stdin);
-    process.stdout.write(CLEAR_LINE);
-    // ── Bolloon Agent 仪表盘 (ASCII 艺术字 + 品牌图标) ──
-    printBanner(_BOLLOON_VERSION);
     let peerCount = 0;
     try {
         peerCount = comm.getConnections().length;
     }
     catch { /* */ }
-    // 读取 LLM 模型名 (支持多 provider)
+    // 读取 LLM 模型名
     const providerNames = [
         ['OPENAI_API_KEY', 'OpenAI'],
         ['ANTHROPIC_API_KEY', 'Anthropic'],
@@ -427,64 +393,39 @@ function startCLI(comm) {
     cliModelName = foundProvider ? foundProvider[1] : '未配置';
     cliAgentName = agentIdentity?.name || 'bolloon';
     cliStartTime = Date.now();
-    process.stdout.write(`${C_DIM}Bolloon CLI ready. 输入 !cmd /queue /help${RESET}\n\n`);
-    showBottomPrompt();
-    const handleInput = (chunk, key) => {
+    process.stdout.write(`${C_DIM}输入 !cmd 执行终端 · /queue 入队 · /help 帮助${RESET}\n\n`);
+    // 启动框: logo 左对齐（无状态栏 — 状态栏在输入框上方）
+    const art = brandArtLines();
+    const maxArt = art.reduce((m, l) => Math.max(m, dispWidth(l)), 0);
+    const boxW = Math.min(termWidth() - 2, Math.max(40, maxArt) + 4);
+    process.stdout.write(boxTop('Bolloon Agent', boxW) + '\n');
+    for (const l of art)
+        process.stdout.write(boxRow(l, boxW, 'left') + '\n');
+    process.stdout.write(boxBottom(boxW) + '\n\n');
+    // readline 输入循环（底部没有独立状态栏）
+    replReadline(comm);
+}
+async function replReadline(comm) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const SEP = '\x1b[90m─';
+    const RST = '\x1b[0m';
+    while (isRunning) {
+        const tw = process.stdout.columns || 80;
+        const sepLine = SEP.repeat(tw) + RST;
+        const prefix = queueMode ? `${C_WARN}▸${RST}` : `${C_ACCENT}❯${RST}`;
+        const raw = await new Promise(resolve => rl.question(`\n${sepLine}\n${statusBarLine()}\n${sepLine}\n${prefix} `, resolve));
+        const trimmed = raw.trim();
+        process.stdout.write(`\n${sepLine}\n\n\n\n\n`);
+        if (!trimmed)
+            continue;
         if (!isRunning)
-            return;
-        if (!key)
-            return;
-        if (key.ctrl && key.name === 'c') {
-            clearPromptLine();
-            process.stdout.write(`\n${CYAN}👋 再见！${RESET}\n`);
-            try {
-                process.stdin.setRawMode(false);
-            }
-            catch { }
-            process.exit(0);
-            return;
-        }
-        if (key.name === 'return') {
-            const trimmed = currentInput.trim();
-            currentInput = '';
-            clearPromptLine();
-            if (trimmed) {
-                process.stdout.write('\n');
-                processInput(trimmed, comm).then(() => {
-                    if (isRunning)
-                        showBottomPrompt();
-                });
-            }
-            else {
-                showBottomPrompt();
-            }
-            return;
-        }
-        if (key.name === 'backspace') {
-            if (currentInput.length > 0) {
-                currentInput = currentInput.slice(0, -1);
-                showBottomPrompt();
-            }
-            return;
-        }
-        if (key.name === 'escape' || (key.ctrl && key.name === 'u')) {
-            currentInput = '';
-            showBottomPrompt();
-            return;
-        }
-        if (key.name === 'tab') {
-            return;
-        }
-        if (key.name && key.name.length === 1) {
-            currentInput += chunk.toString();
-            showBottomPrompt();
-        }
-    };
-    process.stdin.on('data', handleInput);
-    process.on('exit', () => {
-        isRunning = false;
-        process.stdout.write(SHOW_CURSOR_SEQ);
-    });
+            break;
+        await processInput(trimmed, comm);
+    }
+    rl.close();
+    process.stdout.write(`\n${CYAN}👋 再见！${RESET}\n`);
+    process.stdin.destroy();
+    comm.stop();
 }
 async function processInput(input, comm) {
     const trimmed = input.trim();
@@ -546,11 +487,8 @@ async function processInput(input, comm) {
         return;
     }
     if (trimmed === '退出' || trimmed === 'exit' || trimmed === 'quit') {
-        clearPromptLine();
-        process.stdout.write(`${CYAN}👋 再见！${RESET}\n`);
+        process.stdout.write(`\n${CYAN}👋 再见！${RESET}\n`);
         isRunning = false;
-        process.stdin.destroy();
-        comm.stop();
         return;
     }
     if (trimmed.toLowerCase() === 'peers') {