@bolloon/bolloon-agent 0.3.5 → 0.3.7

package/dist/index.js

@@ -5,6 +5,7 @@ import * as ed25519 from '@noble/ed25519';
 import { sha512 } from '@noble/hashes/sha2.js';
 import * as fs from 'fs/promises';
 import * as path from 'path';
+import { spawn } from 'child_process';
 import { documentReader } from './documents/reader.js';
 import { initMinimax } from './constraints/index.js';
 import { createAgentSession } from './agents/pi-sdk.js';
@@ -12,8 +13,8 @@ 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 { LoadingTUI } from './cli/loading-tui.js';
-// 启动时自动检查更新已禁用 (改用 --update-check / --update-now 显式触发)
+import { printBanner, renderDashboard, renderDialog, renderUserMessage, renderAgentMessage, renderToolCall, flowConnector, termWidth } from './cli/loading-tui.js';
+// 启动自动检查更新：后台、节流、检测到新版本自动安装（可被 --no-update / BOLLOON_SKIP_UPDATE 关闭）
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 const _BOLLOON_VERSION = (() => {
@@ -43,14 +44,7 @@ const HIDE_CURSOR = '\x1b[?25l';
 const SHOW_CURSOR = '\x1b[?25h';
 const s = {
     banner: () => {
-        const verStr = ` v${_BOLLOON_VERSION}`;
-        const pad = Math.max(0, 39 - 17 - verStr.length);
-        const spaces = ' '.repeat(pad);
-        console.log(`\n${CYAN}${BOLD}
-   ╔═══════════════════════════════════════════╗
-   ║      ${WHITE}🤖 Bolloon ${CYAN}${verStr}${spaces}║
-   ║      ${WHITE}P2P AI Document Processor${CYAN}                ║
-   ╚═══════════════════════════════════════════╝${RESET}\n`);
+        printBanner(_BOLLOON_VERSION);
     },
     step: (num, total, text, status) => {
         const check = status === 'ok' ? `${GREEN}✓` :
@@ -97,6 +91,7 @@ const s = {
     },
     dialog: async (title, promptText) => {
         return new Promise((resolve) => {
+            console.log(renderDialog({ title, prompt: promptText }));
             const rl = readline.createInterface({
                 input: process.stdin,
                 output: process.stdout
@@ -369,6 +364,30 @@ function startCLI(comm) {
     }
     readline.emitKeypressEvents(process.stdin);
     process.stdout.write(CLEAR_LINE);
+    // ── Bolloon Agent 仪表盘 (ASCII 艺术字 + 品牌图标) ──
+    printBanner(_BOLLOON_VERSION);
+    let peerCount = 0;
+    try {
+        peerCount = comm.getConnections().length;
+    }
+    catch { /* */ }
+    const llmName = process.env.MINIMAX_API_KEY ? 'MiniMax'
+        : process.env.OPENAI_API_KEY ? 'OpenAI'
+            : process.env.ANTHROPIC_API_KEY ? 'Anthropic'
+                : process.env.DEEPSEEK_API_KEY ? 'DeepSeek'
+                    : '未配置';
+    process.stdout.write(renderDashboard({
+        title: '系统状态',
+        rows: [
+            { label: 'LLM Provider', status: llmName === '未配置' ? 'warn' : 'ok', detail: llmName },
+            { label: 'P2P 节点', status: peerCount > 0 ? 'ok' : 'warn', detail: `${peerCount} 个` },
+            { label: '输入方式', status: 'info', detail: '底部对话框' },
+        ],
+    }) + '\n');
+    process.stdout.write(renderDialog({
+        title: 'Bolloon Agent',
+        prompt: '输入消息开始对话 · 输入 help 查看命令',
+    }) + '\n');
     showBottomPrompt();
     const promptTimer = setInterval(() => {
         if (isRunning && promptVisible) {
@@ -463,16 +482,43 @@ async function processInput(input, comm) {
         return;
     }
     try {
+        // 已发送消息框
+        process.stdout.write(renderUserMessage(trimmed) + '\n');
         const a = await getAgent();
-        const thinking = setInterval(() => {
-            if (!isRunning)
-                return;
-            process.stdout.write('\r  \x1b[33m⟳\x1b[0m 思考中...    \x1b[?25l');
-        }, 80);
-        const response = await a.prompt(trimmed);
-        clearInterval(thinking);
-        process.stdout.write('\r' + ' '.repeat(30) + '\r');
-        process.stdout.write(`${response}\n`);
+        const boxW = Math.min(termWidth() - 2, 76);
+        const pending = [];
+        let firstEvent = true;
+        const clearThinking = () => {
+            if (firstEvent) {
+                process.stdout.write('\r' + ' '.repeat(30) + '\r');
+                firstEvent = false;
+            }
+        };
+        const onStream = (e) => {
+            if (e.type === 'step_start') {
+                pending.push({ tool: e.tool, args: e.args, t0: Date.now() });
+            }
+            else if (e.type === 'step_done' || e.type === 'step_error') {
+                const p = pending.shift();
+                clearThinking();
+                // 连接线只在第 2 个及之后的工具框前出现
+                if (!firstEvent)
+                    process.stdout.write(flowConnector(boxW) + '\n');
+                process.stdout.write(renderToolCall({
+                    tool: e.tool ?? p?.tool ?? '?',
+                    args: p?.args,
+                    status: e.type === 'step_done' ? 'ok' : 'error',
+                    output: e.output,
+                    error: e.error,
+                    durationMs: p ? Date.now() - p.t0 : undefined,
+                    width: boxW,
+                }) + '\n');
+            }
+        };
+        const response = await a.prompt(trimmed, { onStream });
+        clearThinking();
+        // 智能体回复框 (圆角)
+        process.stdout.write(renderAgentMessage(response) + '\n');
     }
     catch (e) {
         if (!e.message?.includes('ERR_USE_AFTER_CLOSE') && !e.message?.includes('write after end')) {
@@ -1809,70 +1855,66 @@ function printHelp() {
 // ---------------------------------------------------------------------------
 // Entry point
 // ---------------------------------------------------------------------------
+/**
+ * 以相同参数重新启动当前 Node 进程（用于更新后自动应用新版本）。
+ * 先 detached 拉起新进程，再退出旧进程。
+ */
+function restartCurrentProcess() {
+    try {
+        const entry = process.argv[1];
+        const child = spawn(process.execPath, [entry, ...process.argv.slice(2)], {
+            stdio: 'inherit',
+            detached: true,
+            env: { ...process.env },
+        });
+        child.unref();
+    }
+    catch {
+        // 拉起失败则退回手动重启
+    }
+    process.exit(0);
+}
 async function main() {
-    let loading = null;
     try {
         const args = parseArgs();
         if (args.help) {
             printHelp();
             process.exit(0);
         }
-        // 自动更新已禁用: 启动时不再自动检查/安装更新.
-        // 想手动检查: bolloon --update-check
-        // 想手动更新: bolloon --update-now [package]
-        // 想完全屏蔽 (CI / sandbox): BOLLOON_SKIP_UPDATE=true
+        // 启动自动更新检查（后台执行，不阻塞主流程）。
+        // 检测到新版本会自动安装；安装成功后自动重启以应用新版本。
+        // 可用 --no-update / BOLLOON_SKIP_UPDATE 关闭，
+        // 或用 config.json 的 autoUpdate:false / autoRestart:false / BOLLOON_AUTO_UPDATE=1 控制。
+        // 手动检查: bolloon --update-check
+        // 手动更新: bolloon --update-now [package]
+        if (!args.updateCheck && !args.updateNow) {
+            void (async () => {
+                try {
+                    const { checkAndUpdate } = await import('./utils/auto-update.js');
+                    await checkAndUpdate({ onUpdated: restartCurrentProcess });
+                }
+                catch {
+                    // 自动更新失败不影响主程序启动
+                }
+            })();
+        }
         const mode = args.web ? 'web' : 'cli';
         const isNonInteractive = !!(args.tool || args.prompt);
-        const isTuiMode = mode === 'cli' && !isNonInteractive && args.tui;
         const originalLog = console.log;
         const originalInfo = console.info;
         const originalStdoutWrite = process.stdout.write.bind(process.stdout);
         const isSdkLog = (msg) => {
             return /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(msg);
         };
-        // CLI interactive mode: suppress all startup output, show minimal spinner
         const isCLIInteractive = mode === 'cli' && !isNonInteractive;
-        loading = isCLIInteractive ? new LoadingTUI() : null;
-        if (loading) {
-            loading.setSteps([
-                'LLM provider 检测',
-                'DIAP 身份生成',
-                'DID 发布到 IPFS',
-                'P2P 网络启动',
-                'iroh transport 启动',
-                'Bolloon 上下文 bootstrap',
-                'Web 服务启动',
-            ]);
-            loading.start('启动中...');
+        if (isCLIInteractive) {
             console.log = () => { };
             console.info = () => { };
             process.stdout.write = () => true;
         }
-        else if (isTuiMode) {
-            console.log = (...args) => {
-                const msg = args.join(' ');
-                if (isSdkLog(msg))
-                    return;
-                originalLog.apply(console, args);
-            };
-            console.info = (...args) => {
-                const msg = args.join(' ');
-                if (isSdkLog(msg))
-                    return;
-                originalInfo.apply(console, args);
-            };
-            process.stdout.write = (chunk, ...args) => {
-                const msg = String(chunk);
-                if (isSdkLog(msg))
-                    return true;
-                return originalStdoutWrite(chunk, ...args);
-            };
-        }
         if (isNonInteractive) {
             console.error = () => { };
         }
-        s.banner();
-        s.section('系统初始化');
         const hasOpenAI = !!process.env.OPENAI_API_KEY;
         // 2026-06-15: 修复 — 之前 anthropic 401 是因为 shell env 残留的旧 ANTHROPIC_API_KEY 抢了 provider 选择
         //   用 BOLLOON_LLM_PROVIDER env 显式覆盖, 否则还是按 env hasXxx 顺序自动选
@@ -1896,32 +1938,21 @@ async function main() {
                                         hasGlm ? 'GLM' :
                                             hasQwen ? 'Qwen' : null;
         if (llmProvider) {
-            s.step(0, 4, `LLM: ${llmProvider}`, 'ok');
-            loading?.completeStep(0, 'ok', `LLM: ${llmProvider}`);
             initMinimax({ provider: llmProvider.toLowerCase() });
         }
         else {
-            s.step(0, 4, 'LLM: 未配置', 'warn');
-            loading?.completeStep(0, 'warn', 'LLM: 未配置');
             if (isNonInteractive) {
                 s.warn('未设置任何 LLM API Key，功能受限');
             }
         }
-        loading?.startStep(1, '生成 DIAP 身份...');
         const { keypair, did, name } = await bootstrapIdentity();
         agentIdentity = { did, name, publicKey: Buffer.from(keypair.publicKey).toString('hex') };
-        loading?.completeStep(1, 'ok', `身份 ${name}`);
-        loading?.startStep(2, '发布 DID 到 IPFS...');
         publishDID(name, keypair).then(({ cid, ipnsName }) => {
             if (cid)
                 agentIdentity.cid = cid;
             if (ipnsName)
                 agentIdentity.ipnsName = ipnsName;
-            loading?.completeStep(2, cid ? 'ok' : 'warn', cid ? 'DID 已发布' : 'DID 本地模式');
-        }).catch(() => {
-            loading?.completeStep(2, 'warn', 'DID 本地模式');
-        });
-        loading?.startStep(3, '启动 P2P 网络...');
+        }).catch(() => { });
         const verifier = createVerificationManager();
         let comm = null;
         try {
@@ -1933,9 +1964,7 @@ async function main() {
                         agentIdentity.peerId = connections[0].publicKey;
                         agentIdentity.p2pChannel = 'bolloon-agent-harness';
                     }
-                    loading?.completeStep(3, 'ok', 'P2P 已连接');
                 }).catch(err => {
-                    loading?.completeStep(3, 'warn', 'P2P Web 模式启动失败');
                     s.warn(`P2P Web 模式启动失败: ${err.message}`);
                 });
             }
@@ -1946,32 +1975,24 @@ async function main() {
                     agentIdentity.peerId = connections[0].publicKey;
                     agentIdentity.p2pChannel = 'bolloon-agent-harness';
                 }
-                loading?.completeStep(3, 'ok', 'P2P 已连接');
             }
         }
         catch (err) {
             s.warn(`P2P 初始化失败: ${err.message}`);
             s.warn('将使用无 P2P 模式运行');
-            loading?.completeStep(3, 'error', 'P2P 初始化失败');
         }
-        loading?.startStep(4, '启动 iroh transport...');
         await bootstrapIroh(keypair, name);
-        loading?.completeStep(4, 'ok', 'iroh 已就绪');
         // Bolloon Bootstrap: 启动扫描 + Context 收集 + 挂定时任务
         // 失败静默 (主流程不被阻塞)
-        loading?.startStep(5, '正在 bootstrap bolloon 上下文...');
         try {
             const { bootstrapBolloon } = await import('./pi-ecosystem-judgment/human-value-pipeline.js');
             s.info('正在 bootstrap bolloon 上下文...');
             const bs = await bootstrapBolloon({ cwd: process.cwd() });
             s.info(`Bootstrap 完成 (${bs.durationMs}ms, ${bs.errors.length} 个非致命错误)`);
-            loading?.completeStep(5, 'ok', `Bootstrap 完成 (${bs.durationMs}ms)`);
         }
         catch (err) {
             s.warn(`Bootstrap 失败 (非致命, 主流程继续): ${err.message}`);
-            loading?.completeStep(5, 'warn', 'Bootstrap 失败 (已跳过)');
         }
-        s.divider();
         if (mode === 'web') {
             const port = parseInt(process.env.PORT || '54188');
             // 2026-06-16: BOLLOON_DEV_MODE=1 或 selfImprove=true 启动项 → 开发者模式, 启用自迭代 (健康监控+自改总线)
@@ -1981,12 +2002,9 @@ async function main() {
                 console.log('[startup] BOLLOON_DEV_MODE=1, 开发者模式: 自迭代已启用');
             }
             const { createWebServer, openBrowser } = await import('./web/server.js');
-            loading?.startStep(6, `启动 Web 服务端口 ${port}...`);
-            s.info(`启动 Web 服务端口 ${port}...`);
             // 2026-06-24: CLI 默认 loopback bind (安全), LAN 访问需 BOLLOON_HOST=0.0.0.0
             const bindHost = process.env.BOLLOON_HOST;
             const { port: actualPort } = await createWebServer(port, { selfImprove, ...(bindHost ? { host: bindHost } : {}) });
-            loading?.completeStep(6, 'ok', `Web 服务 :${actualPort}`);
             const displayHost = bindHost ?? '127.0.0.1';
             s.success(`浏览器已打开 → http://${displayHost}:${actualPort}`);
             openBrowser(`http://${displayHost}:${actualPort}`);
@@ -2005,46 +2023,13 @@ async function main() {
             }
         }
         else {
-            // Restore logging and stop loading spinner
-            if (loading) {
-                console.log = originalLog;
-                console.info = originalInfo;
-                process.stdout.write = originalStdoutWrite;
-                loading.stop(true);
-            }
-            else {
-                // For non-loading TUI CLI mode: apply SDK filtering if needed
-                if (isTuiMode) {
-                    console.log = (...args) => {
-                        const msg = args.join(' ');
-                        if (isSdkLog(msg))
-                            return;
-                        originalLog.apply(console, args);
-                    };
-                    console.info = (...args) => {
-                        const msg = args.join(' ');
-                        if (isSdkLog(msg))
-                            return;
-                        originalInfo.apply(console, args);
-                    };
-                    process.stdout.write = (chunk, ...args) => {
-                        const msg = String(chunk);
-                        if (isSdkLog(msg))
-                            return true;
-                        return originalStdoutWrite(chunk, ...args);
-                    };
-                }
-                else {
-                    console.log = originalLog;
-                    console.info = originalInfo;
-                    process.stdout.write = originalStdoutWrite;
-                }
-            }
+            console.log = originalLog;
+            console.info = originalInfo;
+            process.stdout.write = originalStdoutWrite;
             startCLI(comm);
         }
     }
     catch (e) {
-        loading?.stop(false);
         throw e;
     }
 }