@vincentbanana/bananacli 0.4.7 → 0.4.9

package/dist/server/ui-server.js

@@ -1,10 +1,21 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import { createServer } from 'node:http';
 import { randomBytes } from 'node:crypto';
 import { mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
-import { extname, join, resolve, dirname } from 'node:path';
+import { extname, join, resolve, dirname, sep } from 'node:path';
 import { spawn } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
+import { WebSocketServer } from 'ws';
+import { fileURLToPath, pathToFileURL } 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";
@@ -13,7 +24,7 @@ import { estimateCost, formatCost, resolvePricing } from "../providers/pricing.j
 import { SessionStore } from "../session/store.js";
 import { BackupStore, newTurnId } from "../session/backups.js";
 import { allTools, permissionFor, summarizeInput } from "../tools/index.js";
-import { loadPluginTools } from "../tools/plugins.js";
+import { loadPluginTools, pluginTemplate } from "../tools/plugins.js";
 import { resolvePath } from "../tools/fs.js";
 import { commands, findCommand, suggestCommand } from "../cli/commands.js";
 import { completeCommand, completeFileReference } from "../cli/completion.js";
@@ -24,6 +35,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',
@@ -106,6 +123,9 @@ export async function startUiServer(options) {
         workspace: config.workspace,
         platform: process.platform,
         permissions: config.permissions,
+        systemPrompt: config.systemPrompt,
+        showReasoning: config.showReasoning,
+        disabledPlugins: config.disabledPlugins,
         tools: options.tools.map((tool) => ({ name: tool.name, approval: tool.approval, permission: permissionFor(config.permissions, tool) })),
         session: {
             id: session.id,
@@ -121,6 +141,29 @@ export async function startUiServer(options) {
         updatedAt: item.updatedAt,
         turns: item.turns,
     }));
+    // ---------- 插件：本地插件工坊 ----------
+    const builtinTools = options.tools.filter((tool) => !(options.pluginTools ?? []).some((plugin) => plugin.name === tool.name));
+    const pluginDirs = () => [
+        { id: 'global', label: '全局插件', path: join(bananaHome(), 'tools') },
+        { id: 'project', label: '项目插件', path: join(config.workspace, '.banana', 'tools') },
+    ];
+    const syncPlugins = async () => {
+        const dirs = pluginDirs();
+        const result = await loadPluginTools(dirs.map((dir) => dir.path), new Set(builtinTools.map((tool) => tool.name)));
+        const disabled = new Set(config.disabledPlugins);
+        const enabledTools = result.tools.filter((tool) => !disabled.has(tool.name));
+        options.tools.splice(0, options.tools.length, ...builtinTools, ...enabledTools);
+        return {
+            dirs,
+            plugins: result.plugins.map((plugin) => ({
+                ...plugin,
+                disabled: disabled.has(plugin.name),
+                enabled: plugin.ok && !disabled.has(plugin.name),
+            })),
+            errors: result.errors,
+            toolCount: options.tools.length,
+        };
+    };
     const server = createServer((req, res) => {
         handle(req, res).catch((error) => {
             if (!res.headersSent)
@@ -129,6 +172,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))
@@ -140,6 +208,13 @@ export async function startUiServer(options) {
             return sendFile(res, 'style.css');
         if (path === '/app.js')
             return sendFile(res, 'app.js');
+        // 终端与语法高亮的本地资源：只放行固定文件，避免任意路径读取
+        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))) ??
@@ -232,6 +307,53 @@ export async function startUiServer(options) {
             const body = await readJson(req);
             return runCliCommand(body.input ?? '', res, session);
         }
+        if (path === '/api/find' && req.method === 'GET') {
+            const query = (url.searchParams.get('q') ?? '').trim().toLowerCase();
+            const limit = Math.max(1, Math.min(120, Number(url.searchParams.get('limit') ?? 60) || 60));
+            const skip = new Set([
+                '.git', 'node_modules', 'dist', 'build', 'out', 'coverage', '.next', '.nuxt',
+                '.venv', 'venv', '__pycache__', '.idea', '.vscode', '.cache', '.banana', 'vendor',
+            ]);
+            const results = [];
+            let scanned = 0;
+            const walk = async (dir, rel, depth) => {
+                if (results.length >= limit || scanned > 6000 || depth > 8)
+                    return;
+                let entries;
+                try {
+                    entries = await readdir(dir, { withFileTypes: true });
+                }
+                catch {
+                    return;
+                }
+                entries.sort((a, b) => a.name.localeCompare(b.name));
+                for (const entry of entries) {
+                    if (results.length >= limit || scanned > 6000)
+                        return;
+                    if (entry.name.startsWith('.') && entry.name !== '.env.example')
+                        continue;
+                    if (skip.has(entry.name))
+                        continue;
+                    const childRel = rel ? `${rel}/${entry.name}` : entry.name;
+                    if (entry.isDirectory()) {
+                        await walk(join(dir, entry.name), childRel, depth + 1);
+                        continue;
+                    }
+                    if (!entry.isFile())
+                        continue;
+                    scanned += 1;
+                    if (!query || childRel.toLowerCase().includes(query))
+                        results.push(childRel);
+                }
+            };
+            try {
+                await walk(config.workspace, '', 0);
+                return json(res, 200, { files: results, scanned });
+            }
+            catch (error) {
+                return json(res, 400, { error: error instanceof Error ? error.message : String(error) });
+            }
+        }
         if (path === '/api/commands' && req.method === 'GET') {
             return json(res, 200, {
                 commands: commands.map((command) => ({
@@ -269,6 +391,9 @@ export async function startUiServer(options) {
             else if (body.action === 'system' && body.value) {
                 config.systemPrompt = body.value;
             }
+            else if (body.action === 'showReasoning') {
+                config.showReasoning = body.value === 'true' || body.value === '1';
+            }
             else if (body.action === 'workspace' && body.value) {
                 const next = resolve(String(body.value).trim());
                 if (!existsSync(next)) {
@@ -338,107 +463,99 @@ export async function startUiServer(options) {
             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/plugins' && req.method === 'GET') {
+            return json(res, 200, await syncPlugins());
         }
-        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;
+        if (path === '/api/plugins' && req.method === 'POST') {
+            const body = await readJson(req);
+            const action = String(body.action ?? '');
+            const { saveConfig } = await import("../config/config.js");
+            if (action === 'reload') {
+                return json(res, 200, await syncPlugins());
+            }
+            if (action === 'toggle' && body.name) {
+                const name = String(body.name);
+                const set = new Set(config.disabledPlugins);
+                if (body.disabled)
+                    set.add(name);
+                else
+                    set.delete(name);
+                config.disabledPlugins = [...set];
+                await saveConfig(config);
+                return json(res, 200, await syncPlugins());
+            }
+            if (action === 'create') {
+                const scope = body.scope === 'project' ? 'project' : 'global';
+                const dir = pluginDirs().find((item) => item.id === scope).path;
+                await mkdir(dir, { recursive: true });
+                const safe = String(body.name ?? 'my_tool').replace(/[^a-zA-Z0-9_-]/g, '_').slice(0, 48) || 'my_tool';
+                let file = join(dir, `${safe}.mjs`);
+                let index = 2;
+                while (existsSync(file))
+                    file = join(dir, `${safe}-${index++}.mjs`);
+                await writeFile(file, pluginTemplate(safe), 'utf8');
+                return json(res, 200, { file, ...(await syncPlugins()) });
+            }
+            if (action === 'open') {
+                const scope = body.scope === 'project' ? 'project' : 'global';
+                const dir = pluginDirs().find((item) => item.id === scope).path;
+                await mkdir(dir, { recursive: true });
+                const command = process.platform === 'darwin'
+                    ? { file: 'open', args: [dir] }
+                    : process.platform === 'win32'
+                        ? { file: 'explorer.exe', args: [dir] }
+                        : { file: 'xdg-open', args: [dir] };
+                try {
+                    spawn(command.file, command.args, { detached: true, stdio: 'ignore', windowsHide: true }).unref();
+                }
+                catch {
+                    return json(res, 400, { error: '打不开文件管理器，请手动打开：' + dir });
                 }
-                send('out', { stream, data: line + '\n' });
+                return json(res, 200, { dir });
             }
-            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$/, '') });
+            if (action === 'test' && body.file) {
+                const file = resolve(String(body.file));
+                const allowed = pluginDirs().some((dir) => {
+                    const root = resolve(dir.path);
+                    return file === root || file.startsWith(root + sep);
+                });
+                if (!allowed)
+                    return json(res, 400, { error: '只能运行插件目录里的文件' });
+                if (!existsSync(file))
+                    return json(res, 400, { error: '插件文件不存在' });
+                try {
+                    const module = (await import(__rewriteRelativeImportExtension(`${pathToFileURL(file).href}?t=${Date.now()}`)));
+                    const definition = module.default ?? module;
+                    if (typeof definition.run !== 'function')
+                        throw new Error('插件没有导出 run 函数');
+                    const input = body.input && typeof body.input === 'object'
+                        ? body.input
+                        : (() => {
+                            try {
+                                return JSON.parse(String(body.input ?? '{}'));
+                            }
+                            catch {
+                                return {};
+                            }
+                        })();
+                    const result = await definition.run(input, {});
+                    return json(res, 200, {
+                        result: typeof result === 'string' ? result : JSON.stringify(result, null, 2),
+                    });
+                }
+                catch (error) {
+                    return json(res, 400, { error: error instanceof Error ? error.message : String(error) });
+                }
             }
-            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();
+            return json(res, 400, { error: '未知的插件操作' });
+        }
+        if (path === '/api/shells' && req.method === 'GET') {
+            return json(res, 200, {
+                shells: terminals.shells,
+                default: terminals.defaultShell().id,
             });
-        });
+        }
+        return notFound(res);
     }
     /**
      * 执行 CLI 命令：命令表只有一份（cli/commands.ts），GUI 只是换了个输出通道。
@@ -672,6 +789,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()));
@@ -726,7 +845,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,

package/dist/tools/plugins.js

@@ -78,6 +78,7 @@ function toTool(definition, source) {
 export async function loadPluginTools(dirs, existingNames = new Set()) {
     const tools = [];
     const errors = [];
+    const plugins = [];
     const seen = new Set(existingNames);
     for (const dir of dirs) {
         const absolute = resolve(dir);
@@ -99,38 +100,65 @@ export async function loadPluginTools(dirs, existingNames = new Set()) {
             if (entry.name.endsWith('.test.mjs'))
                 continue;
             const file = join(absolute, entry.name);
+            const base = {
+                file,
+                dir: absolute,
+                name: entry.name,
+                description: '',
+                approval: 'never',
+                ok: false,
+            };
             try {
                 const module = (await import(__rewriteRelativeImportExtension(pathToFileURL(file).href)));
                 const definition = (module.default ?? module);
                 if (!definition || typeof definition !== 'object') {
-                    errors.push(`${entry.name}: 需要一个默认导出的对象`);
+                    base.error = '需要一个默认导出的对象';
+                    errors.push(`${entry.name}: ${base.error}`);
+                    plugins.push(base);
                     continue;
                 }
                 if (typeof definition.name !== 'string' || !TOOL_NAME.test(definition.name)) {
-                    errors.push(`${entry.name}: name 必须是字母开头的 1-64 位字母/数字/下划线`);
+                    base.error = 'name 必须是字母开头的 1-64 位字母/数字/下划线';
+                    errors.push(`${entry.name}: ${base.error}`);
+                    plugins.push(base);
                     continue;
                 }
-                if (typeof definition.description !== 'string' || !definition.description.trim()) {
-                    errors.push(`${entry.name}: 缺少 description`);
+                base.name = definition.name;
+                base.description = typeof definition.description === 'string' ? definition.description : '';
+                base.approval = VALID_APPROVALS.includes(definition.approval)
+                    ? definition.approval
+                    : 'never';
+                if (!definition.description || !definition.description.trim()) {
+                    base.error = '缺少 description';
+                    errors.push(`${entry.name}: ${base.error}`);
+                    plugins.push(base);
                     continue;
                 }
                 if (typeof definition.run !== 'function') {
-                    errors.push(`${entry.name}: 缺少 run(input, ctx) 函数`);
+                    base.error = '缺少 run(input, ctx) 函数';
+                    errors.push(`${entry.name}: ${base.error}`);
+                    plugins.push(base);
                     continue;
                 }
                 if (seen.has(definition.name)) {
-                    errors.push(`${entry.name}: 工具名 ${definition.name} 与已有工具冲突`);
+                    base.error = `工具名 ${definition.name} 与已有工具冲突`;
+                    errors.push(`${entry.name}: ${base.error}`);
+                    plugins.push(base);
                     continue;
                 }
                 seen.add(definition.name);
                 tools.push(toTool(definition, entry.name));
+                base.ok = true;
+                plugins.push(base);
             }
             catch (error) {
-                errors.push(`${entry.name}: ${error instanceof Error ? error.message : String(error)}`);
+                base.error = error instanceof Error ? error.message : String(error);
+                errors.push(`${entry.name}: ${base.error}`);
+                plugins.push(base);
             }
         }
     }
-    return { tools, errors };
+    return { tools, errors, plugins };
 }
 /** 生成插件模板，方便用户照着写。 */
 export function pluginTemplate(name = 'my_tool') {