@vincentbanana/bananacli 0.4.6 → 0.4.8

package/dist/server/terminal.js

@@ -0,0 +1,305 @@
+// 内嵌终端：真实 PTY + 多会话。
+// 用 @lydell/node-pty（自带预编译二进制），Windows 走 ConPTY，输出天然是 UTF-8，
+// 所以中文路径和中文输出不会再乱码，提示符也由 shell 自己打印（D:\banana>）。
+import { existsSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+const isWin = process.platform === 'win32';
+/** 在 PATH 里找一个可执行文件（Windows 会补 .exe）。不依赖 shell，避免启动时开子进程。 */
+function findOnPath(name) {
+    const paths = (process.env['PATH'] ?? '').split(isWin ? ';' : ':').filter(Boolean);
+    const exts = isWin ? ['', '.exe', '.cmd', '.bat'] : [''];
+    for (const dir of paths) {
+        for (const ext of exts) {
+            const candidate = join(dir, name.toLowerCase().endsWith(ext.toLowerCase()) ? name : name + ext);
+            try {
+                if (existsSync(candidate) && statSync(candidate).isFile())
+                    return candidate;
+            }
+            catch {
+                /* 无权限的目录跳过 */
+            }
+        }
+    }
+    return null;
+}
+/** 探测机器上可用的 shell，顺序即默认优先级。 */
+export function detectShells() {
+    const shells = [];
+    const seen = new Set();
+    const push = (item) => {
+        if (!item || seen.has(item.id))
+            return;
+        seen.add(item.id);
+        shells.push(item);
+    };
+    if (isWin) {
+        const pwsh = findOnPath('pwsh');
+        push(pwsh ? { id: 'pwsh', name: 'PowerShell 7', file: pwsh, args: ['-NoLogo'] } : null);
+        const powershell = findOnPath('powershell');
+        push(powershell ? { id: 'powershell', name: 'Windows PowerShell', file: powershell, args: ['-NoLogo'] } : null);
+        const comspec = process.env['ComSpec'] ?? findOnPath('cmd');
+        push(comspec ? { id: 'cmd', name: '命令提示符', file: comspec, args: [] } : null);
+        for (const bash of [
+            'C:\\Program Files\\Git\\bin\\bash.exe',
+            'C:\\Program Files (x86)\\Git\\bin\\bash.exe',
+            join(process.env['LOCALAPPDATA'] ?? '', 'Programs', 'Git', 'bin', 'bash.exe'),
+        ]) {
+            if (bash && existsSync(bash)) {
+                push({ id: 'bash', name: 'Git Bash', file: bash, args: ['--login', '-i'] });
+                break;
+            }
+        }
+        const wsl = findOnPath('wsl');
+        push(wsl ? { id: 'wsl', name: 'WSL', file: wsl, args: [] } : null);
+    }
+    else {
+        const candidates = [
+            { id: 'zsh', name: 'zsh', file: findOnPath('zsh') },
+            { id: 'bash', name: 'bash', file: findOnPath('bash') },
+            { id: 'sh', name: 'sh', file: findOnPath('sh') ?? '/bin/sh' },
+        ];
+        const preferred = process.env['SHELL'];
+        for (const item of candidates) {
+            if (!item.file)
+                continue;
+            push({ id: item.id, name: item.name, file: item.file, args: ['-l'] });
+        }
+        if (preferred) {
+            const found = shells.find((item) => item.file === preferred);
+            if (found) {
+                shells.splice(shells.indexOf(found), 1);
+                shells.unshift(found);
+            }
+        }
+    }
+    return shells;
+}
+export class TerminalManager {
+    sessions = new Map();
+    seq = 0;
+    shells;
+    constructor(shells) {
+        const detected = shells ?? detectShells();
+        this.shells = detected.length
+            ? detected
+            : [{ id: 'sh', name: 'sh', file: isWin ? (process.env['ComSpec'] ?? 'cmd.exe') : '/bin/sh', args: [] }];
+    }
+    defaultShell() {
+        return this.shells[0];
+    }
+    find(id) {
+        return this.sessions.get(id);
+    }
+    create(shellId, cwd, cols = 100, rows = 28) {
+        const shell = this.shells.find((item) => item.id === shellId) ?? this.defaultShell();
+        const id = `t${++this.seq}`;
+        const session = new TerminalSession(id, shell, cwd, cols, rows);
+        this.sessions.set(id, session);
+        return session;
+    }
+    async dispose() {
+        const sessions = [...this.sessions.values()];
+        this.sessions.clear();
+        await Promise.all(sessions.map((session) => session.dispose()));
+    }
+}
+export class TerminalSession {
+    id;
+    shell;
+    pty = null;
+    clients = new Set();
+    buffer = '';
+    startedAt = '';
+    cwd;
+    exitPromise = Promise.resolve();
+    exitResolve = null;
+    cols;
+    rows;
+    running = false;
+    constructor(id, shell, cwd, cols, rows) {
+        this.id = id;
+        this.shell = shell;
+        this.cwd = existsSync(cwd) ? cwd : process.cwd();
+        this.cols = Math.max(20, cols);
+        this.rows = Math.max(4, rows);
+        this.start();
+    }
+    info() {
+        return { id: this.id, shell: this.shell.id, name: this.shell.name, running: this.running, cwd: this.cwd };
+    }
+    start() {
+        this.startedAt = new Date().toISOString();
+        const env = {};
+        for (const [key, value] of Object.entries(process.env)) {
+            if (typeof value === 'string')
+                env[key] = value;
+        }
+        env['TERM'] = 'xterm-256color';
+        env['COLORTERM'] = 'truecolor';
+        // Windows 终端里让 Python / Node 也走 UTF-8，避免第三方程序自己输出 GBK
+        env['PYTHONIOENCODING'] = 'utf-8';
+        env['PYTHONUTF8'] = '1';
+        try {
+            // 延迟到运行时加载：没装到对应平台的预编译包时，服务本身仍然能启动
+            const spawnPty = globalThis.__bananaPtySpawn;
+            if (!spawnPty)
+                throw new Error('PTY 未加载');
+            this.pty = spawnPty(this.shell.file, this.shell.args, {
+                name: 'xterm-256color',
+                cols: this.cols,
+                rows: this.rows,
+                cwd: this.cwd,
+                env,
+            });
+        }
+        catch (error) {
+            this.running = false;
+            this.broadcast({
+                type: 'error',
+                message: `终端启动失败：${error instanceof Error ? error.message : String(error)}\n` +
+                    'PTY 原生模块可能没装上，试试重新安装：npm install -g @vincentbanana/bananacli',
+            });
+            return;
+        }
+        const pty = this.pty;
+        this.running = true;
+        this.exitPromise = new Promise((resolvePromise) => {
+            this.exitResolve = resolvePromise;
+        });
+        pty.onData((data) => {
+            this.buffer = (this.buffer + data).slice(-200_000);
+            this.broadcast({ type: 'data', data });
+        });
+        pty.onExit(({ exitCode, signal }) => {
+            // restart 时旧进程的退出事件可能晚到，不能把新进程的状态覆盖掉
+            if (this.pty !== pty)
+                return;
+            this.running = false;
+            this.pty = null;
+            this.exitResolve?.();
+            this.exitResolve = null;
+            const notice = `\r\n\x1b[90m[进程已退出，代码 ${exitCode ?? 0}]\x1b[0m\r\n`;
+            this.buffer += notice;
+            this.broadcast({ type: 'data', data: notice });
+            this.broadcast({ type: 'exit', code: exitCode ?? 0, signal: signal ?? null });
+        });
+    }
+    broadcast(payload) {
+        const line = JSON.stringify(payload);
+        for (const client of this.clients) {
+            if (client.ws.readyState === 1)
+                client.ws.send(line);
+        }
+    }
+    attach(ws) {
+        const client = { ws, alive: true };
+        this.clients.add(client);
+        ws.send(JSON.stringify({ type: 'ready', ...this.info(), startedAt: this.startedAt }));
+        // 重连时把最近的屏幕内容一次性补上，再让前端继续增量渲染
+        if (this.buffer)
+            ws.send(JSON.stringify({ type: 'data', data: this.buffer }));
+        ws.on('message', (raw) => {
+            let message;
+            try {
+                message = JSON.parse(String(raw));
+            }
+            catch {
+                return;
+            }
+            if (message.type === 'input' && typeof message.data === 'string')
+                this.write(message.data);
+            else if (message.type === 'resize')
+                this.resize(Number(message.cols) || 0, Number(message.rows) || 0);
+            else if (message.type === 'restart')
+                this.restart();
+            else if (message.type === 'close')
+                this.dispose();
+        });
+        ws.on('close', () => this.clients.delete(client));
+        ws.on('error', () => this.clients.delete(client));
+    }
+    write(data) {
+        if (this.pty && this.running)
+            this.pty.write(data);
+    }
+    resize(cols, rows) {
+        if (!cols || !rows)
+            return;
+        this.cols = Math.max(20, Math.floor(cols));
+        this.rows = Math.max(4, Math.floor(rows));
+        try {
+            this.pty?.resize(this.cols, this.rows);
+        }
+        catch {
+            /* 进程刚退出时 resize 会抛，忽略 */
+        }
+    }
+    restart() {
+        this.disposePty();
+        this.buffer = '';
+        this.start();
+        const pty = this.pty;
+        if (pty)
+            this.broadcast({ type: 'ready', ...this.info(), startedAt: this.startedAt });
+    }
+    async dispose() {
+        const pty = this.pty;
+        if (pty) {
+            try {
+                pty.kill();
+            }
+            catch {
+                /* 已经退出 */
+            }
+            // 等 PTY 真正退出，避免子进程的 stdout 句柄拖住父进程（npm publish 时会卡住）
+            await Promise.race([
+                this.exitPromise,
+                new Promise((resolvePromise) => setTimeout(resolvePromise, 1500)),
+            ]);
+        }
+        this.pty = null;
+        this.running = false;
+        for (const client of this.clients) {
+            try {
+                client.ws.close();
+            }
+            catch {
+                /* 已经断开 */
+            }
+        }
+        this.clients.clear();
+    }
+    disposePty() {
+        try {
+            this.pty?.kill();
+        }
+        catch {
+            /* 已经退出 */
+        }
+        this.pty = null;
+        this.running = false;
+    }
+}
+/** 启动时把 PTY 模块解析一次，失败不影响整个 GUI 服务。 */
+export async function loadPty() {
+    try {
+        const mod = await import('@lydell/node-pty');
+        globalThis.__bananaPtySpawn = mod.spawn;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function normalizeCwd(cwd, fallback) {
+    const raw = cwd?.trim();
+    if (!raw)
+        return fallback;
+    const next = resolve(raw);
+    try {
+        return existsSync(next) && statSync(next).isDirectory() ? next : fallback;
+    }
+    catch {
+        return fallback;
+    }
+}

package/dist/server/ui-server.js

@@ -4,7 +4,10 @@ import { mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { extname, join, resolve, dirname } from 'node:path';
 import { spawn } from 'node:child_process';
+import { WebSocketServer } from 'ws';
 import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
+import { TerminalManager, loadPty, normalizeCwd } from "./terminal.js";
 import { bananaHome } from "../config/config.js";
 import { runTurn } from "../agent/loop.js";
 import { compactMessages } from "../agent/context.js";
@@ -24,6 +27,12 @@ const MIME = {
     '.js': 'text/javascript; charset=utf-8',
     '.svg': 'image/svg+xml',
 };
+const VENDOR_FILES = {
+    'xterm.js': '@xterm/xterm/lib/xterm.js',
+    'xterm.css': '@xterm/xterm/css/xterm.css',
+    'addon-fit.js': '@xterm/addon-fit/lib/addon-fit.js',
+    'highlight.min.js': '@highlightjs/cdn-assets/highlight.min.js',
+};
 const IMAGE_TYPES = {
     '.png': 'image/png',
     '.jpg': 'image/jpeg',
@@ -81,6 +90,9 @@ export async function startUiServer(options) {
             '多半是内核版本太旧或安装不完整，重新安装即可：npm install -g @vincentbanana/bananacli\n');
     }
     let turn = null;
+    // 当前会话记在服务进程内存里：新建对话后所有后续请求都认它，
+    // 不再依赖「磁盘上谁最新」这种容易串台的推断。
+    let activeId = null;
     // 内嵌终端：不弹外部窗口，命令在当前工作区里执行，cd 之后的工作目录会被记住
     let terminalCwd = null;
     let terminalChild = null;
@@ -126,6 +138,31 @@ export async function startUiServer(options) {
                 res.end();
         });
     });
+    // 内嵌终端：WebSocket 双向通道 + 真实 PTY（cmd / pwsh / bash）
+    const terminals = new TerminalManager();
+    void loadPty();
+    const wss = new WebSocketServer({ noServer: true });
+    server.on('upgrade', (req, socket, head) => {
+        try {
+            const url = new URL(req.url ?? '/', `http://${host}`);
+            if (url.pathname !== `${prefix}/api/terminal/ws`) {
+                socket.destroy();
+                return;
+            }
+            wss.handleUpgrade(req, socket, head, (ws) => {
+                const shellId = url.searchParams.get('shell') ?? terminals.defaultShell().id;
+                const cwd = normalizeCwd(url.searchParams.get('cwd'), config.workspace);
+                const existing = url.searchParams.get('id');
+                const session = (existing ? terminals.find(existing) : undefined) ??
+                    terminals.create(shellId, cwd, Number(url.searchParams.get('cols')) || 100, Number(url.searchParams.get('rows')) || 28);
+                ws.send(JSON.stringify({ type: 'id', id: session.id }));
+                session.attach(ws);
+            });
+        }
+        catch {
+            socket.destroy();
+        }
+    });
     async function handle(req, res) {
         const url = new URL(req.url ?? '/', `http://${host}`);
         if (!url.pathname.startsWith(prefix))
@@ -137,7 +174,18 @@ export async function startUiServer(options) {
             return sendFile(res, 'style.css');
         if (path === '/app.js')
             return sendFile(res, 'app.js');
-        let session = turn?.session ?? (await store.lastActive().then(async (id) => (id ? await store.load(id) : null))) ?? store.create();
+        // 终端与语法高亮的本地资源：只放行固定文件，避免任意路径读取
+        if (path.startsWith('/vendor/')) {
+            const name = path.slice('/vendor/'.length);
+            if (Object.hasOwn(VENDOR_FILES, name))
+                return sendFile(res, `vendor/${name}`);
+            return notFound(res);
+        }
+        let session = turn?.session ??
+            (activeId ? await store.load(activeId) : null) ??
+            (await store.lastActive().then(async (id) => (id ? await store.load(id) : null))) ??
+            store.create();
+        activeId = session.id;
         if (path === '/api/info' && req.method === 'GET')
             return json(res, 200, await info(session));
         if (path === '/api/sessions' && req.method === 'GET')
@@ -207,6 +255,7 @@ export async function startUiServer(options) {
             }
             if (turn)
                 turn.session = session;
+            activeId = session.id;
             return json(res, 200, { session: session.id, sessions: await listSessions(), info: await info(session) });
         }
         if (path === '/api/complete' && req.method === 'GET') {
@@ -320,110 +369,24 @@ export async function startUiServer(options) {
             const body = await readJson(req);
             if (turn)
                 return json(res, 409, { error: '当前正在跑一轮对话' });
-            return chat(body, res, session);
+            // 前端会带上会话 id：以它为准，避免新建对话后又被解析回旧对话
+            let target = session;
+            if (body.session && body.session !== session.id) {
+                const found = await store.load(body.session);
+                if (found)
+                    target = found;
+            }
+            activeId = target.id;
+            return chat(body, res, target);
         }
-        if (path === '/api/terminal' && req.method === 'POST') {
-            const body = await readJson(req);
-            return runTerminal(String(body.command ?? ''), res);
+        if (path === '/api/shells' && req.method === 'GET') {
+            return json(res, 200, {
+                shells: terminals.shells,
+                default: terminals.defaultShell().id,
+            });
         }
         return notFound(res);
     }
-    /**
-     * 内嵌终端：把一条命令跑在工作区里，输出按行流式推给界面。
-     * 这里刻意不依赖 node-pty（原生编译在 Windows 上太重），用管道 + 目录标记实现，
-     * 足以跑 git/npm/测试这类常用命令；cd 之后目录会被记住，Ctrl+C 会杀掉子进程。
-     */
-    async function runTerminal(command, res) {
-        const cwd = terminalWorkdir();
-        const trimmed = command.trim();
-        if (!trimmed)
-            return json(res, 200, { cwd });
-        if (terminalChild)
-            return json(res, 409, { error: '上一条命令还在跑，先按停止。' });
-        res.writeHead(200, {
-            'Content-Type': 'text/event-stream; charset=utf-8',
-            'Cache-Control': 'no-cache, no-transform',
-            Connection: 'keep-alive',
-            'X-Accel-Buffering': 'no',
-        });
-        const send = (type, payload = {}) => {
-            if (!res.writableEnded)
-                res.write(`data: ${JSON.stringify({ type, ...payload })}\n\n`);
-        };
-        send('start', { cwd });
-        const isWin = process.platform === 'win32';
-        const marker = '__BANANA_CWD__';
-        // 命令跑完后回显一次当前目录，用来记住 cd 的结果
-        const wrapped = isWin ? `${trimmed} & echo ${marker}%CD%` : `${trimmed}\n echo ${marker}$(pwd)`;
-        let child;
-        try {
-            child = isWin
-                ? spawn('cmd.exe', ['/d', '/s', '/c', wrapped], { cwd, env: process.env, windowsHide: true })
-                : spawn('/bin/sh', ['-c', wrapped], { cwd, env: process.env, windowsHide: true });
-        }
-        catch (error) {
-            send('exit', { code: -1, error: error instanceof Error ? error.message : String(error), cwd });
-            res.end();
-            return;
-        }
-        terminalChild = child;
-        let tailOut = '';
-        let tailErr = '';
-        const pump = (text, stream) => {
-            let buffer = (stream === 'stdout' ? tailOut : tailErr) + text;
-            const lines = buffer.split('\n');
-            buffer = lines.pop() ?? '';
-            for (const raw of lines) {
-                const line = raw.replace(/\r$/, '');
-                if (line.startsWith(marker)) {
-                    const next = line.slice(marker.length).trim();
-                    if (next && existsSync(next))
-                        terminalCwd = next;
-                    continue;
-                }
-                send('out', { stream, data: line + '\n' });
-            }
-            if (stream === 'stdout')
-                tailOut = buffer;
-            else
-                tailErr = buffer;
-        };
-        const flush = () => {
-            for (const [buffer, stream] of [[tailOut, 'stdout'], [tailErr, 'stderr']]) {
-                if (!buffer)
-                    continue;
-                if (!buffer.startsWith(marker))
-                    send('out', { stream, data: buffer.replace(/\r$/, '') });
-            }
-            tailOut = '';
-            tailErr = '';
-        };
-        child.stdout?.setEncoding('utf8');
-        child.stderr?.setEncoding('utf8');
-        child.stdout?.on('data', (chunk) => pump(chunk, 'stdout'));
-        child.stderr?.on('data', (chunk) => pump(chunk, 'stderr'));
-        // 前端断开（按停止 / 关页面）时连同子进程一起收掉
-        res.on('close', () => {
-            if (terminalChild === child)
-                terminalChild = null;
-            if (!child.killed)
-                child.kill();
-        });
-        await new Promise((resolvePromise) => {
-            child.on('error', (error) => {
-                send('out', { stream: 'stderr', data: `启动失败：${error.message}\n` });
-            });
-            child.on('close', (code) => {
-                flush();
-                if (terminalChild === child)
-                    terminalChild = null;
-                send('exit', { code: code ?? 0, cwd: terminalWorkdir() });
-                if (!res.writableEnded)
-                    res.end();
-                resolvePromise();
-            });
-        });
-    }
     /**
      * 执行 CLI 命令：命令表只有一份（cli/commands.ts），GUI 只是换了个输出通道。
      * 输出逐行推给前端，行为和终端里一致。
@@ -656,6 +619,8 @@ export async function startUiServer(options) {
         token,
         port,
         close: async () => {
+            await terminals.dispose();
+            wss.close();
             // 浏览器可能留着 keep-alive 连接，先断开再关，否则 Windows 上会触发 libuv 断言
             server.closeAllConnections?.();
             await new Promise((resolvePromise) => server.close(() => resolvePromise()));
@@ -710,7 +675,22 @@ function notFound(res) {
 async function sendFile(res, name) {
     const { readFile } = await import('node:fs/promises');
     try {
-        const file = await readFile(join(assetRoot(), name));
+        let target = join(assetRoot(), name);
+        // 源码模式（npm start）下 src/ui 里没有打包拷贝的 vendor；
+        // 直接从依赖包读，开发时也能秒开终端，不用先 build。
+        if (name.startsWith('vendor/') && !existsSync(target)) {
+            const vendorName = name.slice('vendor/'.length);
+            const specifier = VENDOR_FILES[vendorName];
+            if (specifier) {
+                try {
+                    target = createRequire(import.meta.url).resolve(specifier);
+                }
+                catch {
+                    /* 依赖缺失，走下面的 404 */
+                }
+            }
+        }
+        const file = await readFile(target);
         res.writeHead(200, {
             'Content-Type': MIME[extname(name)] ?? 'application/octet-stream',
             'Content-Length': file.byteLength,