@vincentbanana/bananacli 0.4.4 → 0.4.6

package/dist/config/config.js

@@ -1,10 +1,41 @@
-import { existsSync } from 'node:fs';
+import { existsSync, mkdirSync, copyFileSync, cpSync } from 'node:fs';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 export function bananaHome() {
     const custom = process.env['BANANA_HOME']?.trim();
-    return custom ? resolve(custom) : join(homedir(), '.banana');
+    if (custom)
+        return resolve(custom);
+    // Windows 默认落到 D 盘：配置、会话、备份、缓存都不写系统盘。
+    // 老版本的数据在 %USERPROFILE%\.banana，第一次启动时自动搬过去（只搬一次）。
+    if (process.platform === 'win32') {
+        for (const candidate of ['D:\\BananaCLI-data', 'D:\\BananaData']) {
+            try {
+                mkdirSync(candidate, { recursive: true });
+                const legacy = join(homedir(), '.banana');
+                if (existsSync(legacy)) {
+                    if (!existsSync(join(candidate, 'config.json')) && existsSync(join(legacy, 'config.json'))) {
+                        copyFileSync(join(legacy, 'config.json'), join(candidate, 'config.json'));
+                    }
+                    for (const name of ['sessions', 'backups']) {
+                        if (!existsSync(join(candidate, name)) && existsSync(join(legacy, name))) {
+                            try {
+                                cpSync(join(legacy, name), join(candidate, name), { recursive: true });
+                            }
+                            catch {
+                                // 单个会话复制失败不影响启动
+                            }
+                        }
+                    }
+                }
+                return candidate;
+            }
+            catch {
+                // 没有 D 盘或没写权限，试下一个位置
+            }
+        }
+    }
+    return join(homedir(), '.banana');
 }
 export function configPath() {
     const custom = process.env['BANANA_CONFIG']?.trim();

package/dist/server/ui-server.js

@@ -81,6 +81,10 @@ export async function startUiServer(options) {
             '多半是内核版本太旧或安装不完整，重新安装即可：npm install -g @vincentbanana/bananacli\n');
     }
     let turn = null;
+    // 内嵌终端：不弹外部窗口，命令在当前工作区里执行，cd 之后的工作目录会被记住
+    let terminalCwd = null;
+    let terminalChild = null;
+    const terminalWorkdir = () => terminalCwd && existsSync(terminalCwd) ? terminalCwd : config.workspace;
     const provider = () => createProvider(config.current, config);
     const backups = (sessionId) => new BackupStore(join(bananaHome(), 'backups'), sessionId);
     const info = async (session) => ({
@@ -263,23 +267,8 @@ export async function startUiServer(options) {
                     return json(res, 400, { error: `目录不存在：${next}` });
                 }
                 config.workspace = next;
-            }
-            else if (body.action === 'terminal') {
-                // 在系统终端里打开当前工作区（GUI 跑在浏览器里，开终端必须借系统命令）
-                const dir = config.workspace;
-                if (!existsSync(dir))
-                    return json(res, 400, { error: `目录不存在：${dir}` });
-                try {
-                    const target = process.platform === 'win32'
-                        ? { file: 'cmd', args: ['/c', 'start', '', 'cmd', '/k', 'cd', '/d', dir] }
-                        : process.platform === 'darwin'
-                            ? { file: 'open', args: ['-a', 'Terminal', dir] }
-                            : { file: 'x-terminal-emulator', args: ['--working-directory', dir] };
-                    spawn(target.file, target.args, { detached: true, stdio: 'ignore' }).unref();
-                }
-                catch (error) {
-                    return json(res, 500, { error: `打开终端失败：${error instanceof Error ? error.message : String(error)}` });
-                }
+                // 换工作区后终端也要跟着换，否则 cd 还停在旧目录
+                terminalCwd = null;
             }
             const { saveConfig } = await import("../config/config.js");
             await saveConfig(config);
@@ -333,8 +322,108 @@ export async function startUiServer(options) {
                 return json(res, 409, { error: '当前正在跑一轮对话' });
             return chat(body, res, session);
         }
+        if (path === '/api/terminal' && req.method === 'POST') {
+            const body = await readJson(req);
+            return runTerminal(String(body.command ?? ''), res);
+        }
         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 只是换了个输出通道。
      * 输出逐行推给前端，行为和终端里一致。

package/dist/session/store.js

@@ -106,7 +106,8 @@ export class SessionStore {
     /** 返回最近一次更新且有内容的会话 id。 */
     async lastActive() {
         const sessions = await this.list();
-        const withMessages = sessions.find((item) => item.turns > 0) ?? sessions[0];
-        return withMessages?.id ?? null;
+        // 必须用「最近更新的会话」，包括刚建好的空会话。
+        // 以前写的是「优先找有消息的会话」，结果新建对话后第一次发消息会被悄悄塞进上一个旧对话。
+        return sessions[0]?.id ?? null;
     }
 }

package/dist/ui/app.js

@@ -976,15 +976,11 @@ function renderSettings() {
   const terminalField = document.createElement('div');
   terminalField.className = 'field';
   terminalField.innerHTML =
-    '<label>终端</label><div class="row"><button class="btn">在工作区打开终端</button></div>' +
-    '<div class="hint">会弹出一个系统终端窗口，已切到当前工作区，方便你手动跑命令。</div>';
-  terminalField.querySelector('button').addEventListener('click', async () => {
-    try {
-      await post('action', { action: 'terminal' });
-      toast('终端已打开');
-    } catch (error) {
-      toast('打开终端失败：' + (error?.message ?? error));
-    }
+    '<label>终端</label><div class="row"><button class="btn">在界面里打开终端</button></div>' +
+    '<div class="hint">内嵌在对话下方，不弹外部窗口；直接在当前工作区执行命令，cd 会记住目录。</div>';
+  terminalField.querySelector('button').addEventListener('click', () => {
+    closeSettings();
+    termOpen();
   });
   body.appendChild(terminalField);
 
@@ -1198,6 +1194,199 @@ function closeSettings() {
   setTimeout(() => { if ($('settingsSheet').hidden) $('settingsBody').innerHTML = ''; }, 240);
 }
 
+// ---------------- 内嵌终端 ----------------
+const term = { open: false, running: false, history: [], cursor: 0, controller: null, size: 0 };
+
+const ANSI_COLORS = {
+  30: '#6b6b72', 31: '#b4453a', 32: '#2f7d50', 33: '#966d1f',
+  34: '#3b63b0', 35: '#7b4d9e', 36: '#257f80', 37: '#55555c',
+  90: '#8c8c93', 91: '#c9564a', 92: '#3f9a66', 93: '#b0852d',
+  94: '#527cd1', 95: '#9a67c4', 96: '#2f9a9a', 97: '#16161a',
+};
+
+/** 把 ANSI 上色转成 span；其他控制序列直接丢掉，避免满屏乱码。 */
+function ansiToHtml(input) {
+  const text = input.replace(/\x1b\][^\x07]*\x07/g, '').replace(/\x1b\[[0-9;?]*[A-LN-Za-ln-z]/g, '');
+  let out = '';
+  let last = 0;
+  let color = '';
+  let bold = false;
+  let dim = false;
+  const style = () =>
+    color || bold || dim
+      ? `color:${color || 'inherit'};font-weight:${bold ? 600 : 400};opacity:${dim ? 0.7 : 1}`
+      : '';
+  for (const match of text.matchAll(/\x1b\[([0-9;]*)m/g)) {
+    out += `<span style="${style()}">${escapeHtml(text.slice(last, match.index))}</span>`;
+    last = match.index + match[0].length;
+    for (const code of (match[1] || '0').split(';').filter(Boolean).map(Number)) {
+      if (code === 0) { color = ''; bold = false; dim = false; }
+      else if (code === 1) bold = true;
+      else if (code === 2) dim = true;
+      else if (code === 22) { bold = false; dim = false; }
+      else if (code === 39) color = '';
+      else if (ANSI_COLORS[code]) color = ANSI_COLORS[code];
+    }
+  }
+  out += `<span style="${style()}">${escapeHtml(text.slice(last))}</span>`;
+  return out;
+}
+
+function termWrite(text, kind = 'out') {
+  if (!text) return;
+  const body = $('termBody');
+  const chunk = document.createElement('span');
+  chunk.className = 'term-chunk' + (kind === 'stderr' ? ' stderr' : kind === 'input' ? ' input' : '');
+  chunk.innerHTML = ansiToHtml(text);
+  body.appendChild(chunk);
+  term.size += text.length;
+  if (term.size > 240_000) {
+    body.textContent = '';
+    term.size = 0;
+    termWrite('输出太多，已清空旧内容。\n', 'input');
+  }
+  body.scrollTop = body.scrollHeight;
+}
+
+function termOpen() {
+  const panel = $('terminalPanel');
+  if (!term.open) {
+    term.open = true;
+    panel.hidden = false;
+    requestAnimationFrame(() => panel.classList.add('show'));
+    if (!term.size) {
+      termWrite('在当前工作区执行命令；cd 会记住目录，clear 清屏。\n', 'input');
+    }
+  }
+  $('termCwd').textContent = state.info?.workspace ?? '';
+  $('termInput').focus();
+}
+
+function termClose() {
+  term.open = false;
+  const panel = $('terminalPanel');
+  panel.classList.remove('show');
+  panel.classList.add('closing');
+  setTimeout(() => {
+    if (term.open) return;
+    panel.hidden = true;
+    panel.classList.remove('closing');
+  }, 160);
+}
+
+function termToggle() {
+  if (term.open) termClose();
+  else termOpen();
+}
+
+async function termRun(command) {
+  const cmd = command.trim();
+  if (!cmd || term.running) return;
+  if (/^(clear|cls)$/i.test(cmd)) {
+    $('termBody').textContent = '';
+    term.size = 0;
+    return;
+  }
+  term.running = true;
+  $('termStop').hidden = false;
+  $('termSend').disabled = true;
+  termWrite(`\n> ${cmd}\n`, 'input');
+
+  const history = term.history;
+  if (history[history.length - 1] !== cmd) history.push(cmd);
+  term.cursor = history.length;
+
+  term.controller = new AbortController();
+  try {
+    const response = await fetch(API + 'terminal', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ command: cmd }),
+      signal: term.controller.signal,
+    });
+    if (!response.ok) {
+      const payload = await response.json().catch(() => ({}));
+      termWrite((payload.error ?? `终端启动失败（${response.status}）`) + '\n', 'stderr');
+      return;
+    }
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = '';
+    for (;;) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      let index;
+      while ((index = buffer.indexOf('\n\n')) >= 0) {
+        const raw = buffer.slice(0, index);
+        buffer = buffer.slice(index + 2);
+        const line = raw.startsWith('data: ') ? raw.slice(6) : raw;
+        if (!line) continue;
+        let event;
+        try { event = JSON.parse(line); } catch { continue; }
+        if (event.type === 'out') termWrite(event.data, event.stream);
+        else if (event.type === 'start' || event.type === 'exit') {
+          if (event.cwd) $('termCwd').textContent = event.cwd;
+          if (event.error) termWrite(event.error + '\n', 'stderr');
+          if (event.type === 'exit' && event.code) termWrite(`进程退出，代码 ${event.code}\n`, 'stderr');
+        }
+      }
+    }
+  } catch (error) {
+    if (error?.name !== 'AbortError') termWrite(`终端错误：${error?.message ?? error}\n`, 'stderr');
+    else termWrite('已停止。\n', 'input');
+  } finally {
+    term.running = false;
+    term.controller = null;
+    $('termStop').hidden = true;
+    $('termSend').disabled = false;
+    if (term.open) $('termInput').focus();
+  }
+}
+
+function bindTerminal() {
+  $('termBtn').innerHTML = svg('terminal');
+  $('termStop').innerHTML = svg('stop');
+  $('termClear').innerHTML = svg('trash');
+  $('termClose').innerHTML = svg('x');
+  $('termBtn').addEventListener('click', termToggle);
+  $('termClose').addEventListener('click', termClose);
+  $('termClear').addEventListener('click', () => {
+    $('termBody').textContent = '';
+    term.size = 0;
+  });
+  $('termStop').addEventListener('click', () => term.controller?.abort());
+  $('termForm').addEventListener('submit', (event) => {
+    event.preventDefault();
+    const input = $('termInput');
+    const value = input.value;
+    input.value = '';
+    termRun(value);
+  });
+  $('termInput').addEventListener('keydown', (event) => {
+    if (event.key === 'ArrowUp') {
+      event.preventDefault();
+      if (!term.history.length) return;
+      term.cursor = Math.max(0, term.cursor - 1);
+      $('termInput').value = term.history[term.cursor] ?? '';
+    } else if (event.key === 'ArrowDown') {
+      event.preventDefault();
+      term.cursor = Math.min(term.history.length, term.cursor + 1);
+      $('termInput').value = term.history[term.cursor] ?? '';
+    } else if (event.key === 'Escape') {
+      termClose();
+    }
+  });
+  window.addEventListener('keydown', (event) => {
+    if (event.ctrlKey && event.key === '`') {
+      event.preventDefault();
+      termToggle();
+    }
+  });
+  // 新建 / 切换会话时同步一下工作区显示
+  $('termCwd').textContent = state.info?.workspace ?? '';
+}
+
 function bind() {
   $('newChat').innerHTML = svg('plus');
   $('sendBtn').innerHTML = svg('send');
@@ -1206,6 +1395,7 @@ function bind() {
   $('closeSettings').innerHTML = svg('x');
   $('filesBtn').innerHTML = svg('panel');
   $('closeFiles').innerHTML = svg('x');
+  bindTerminal();
   hydrate();
   loadTheme();
 

package/dist/ui/index.html

@@ -43,6 +43,7 @@
               <span data-icon="chip"></span><span id="modelLabel">—</span>
             </button>
             <button class="icon-btn" id="filesBtn" title="项目文件" aria-label="项目文件"></button>
+            <button class="icon-btn" id="termBtn" title="终端（Ctrl+`）" aria-label="终端"></button>
             <button class="icon-btn" id="themeBtn" title="切换主题" aria-label="切换主题"></button>
             <button class="icon-btn" id="abortBtn" title="停止" aria-label="停止" hidden></button>
           </div>
@@ -50,6 +51,25 @@
 
         <div class="thread" id="thread"></div>
 
+        <section class="terminal" id="terminalPanel" hidden>
+          <header class="term-head">
+            <span class="term-dot" aria-hidden="true"></span>
+            <span class="term-title">终端</span>
+            <span class="term-cwd" id="termCwd"></span>
+            <div class="term-actions">
+              <button class="icon-btn" id="termStop" title="停止" aria-label="停止" hidden></button>
+              <button class="icon-btn" id="termClear" title="清空" aria-label="清空"></button>
+              <button class="icon-btn" id="termClose" title="收起（Ctrl+`）" aria-label="收起"></button>
+            </div>
+          </header>
+          <div class="term-body" id="termBody" aria-live="polite"></div>
+          <form class="term-row" id="termForm">
+            <span class="term-prompt" aria-hidden="true">&gt;</span>
+            <input id="termInput" autocomplete="off" spellcheck="false" placeholder="输入命令，Enter 执行，↑↓ 翻历史" />
+            <button class="btn tiny" type="submit" id="termSend">运行</button>
+          </form>
+        </section>
+
         <div class="composer-wrap">
           <div class="attachments" id="attachments" hidden></div>
           <form class="composer" id="composer">

package/dist/ui/style.css

@@ -933,4 +933,116 @@ pre.code code { border: 0; background: none; padding: 0; font-size: 12.6px; line
   .only-narrow { display: inline-grid; }
   .msg { padding: 0 16px; }
   .composer-wrap { padding: 8px 14px 12px; }
-}
+}
+
+/* ---------- 内嵌终端 ---------- */
+.terminal {
+  display: flex;
+  flex-direction: column;
+  height: 38vh;
+  min-height: 170px;
+  border-top: 1px solid var(--line);
+  background: var(--panel);
+  animation: termIn 220ms var(--spring) both;
+}
+.terminal[hidden] { display: none; }
+.terminal.closing { animation: termOut 150ms var(--ease-in) both; }
+@keyframes termIn { from { opacity: 0; transform: translateY(14px) scale(0.995); } to { opacity: 1; transform: none; } }
+@keyframes termOut { to { opacity: 0; transform: translateY(10px); } }
+
+.term-head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  height: 38px;
+  padding: 0 10px 0 14px;
+  border-bottom: 1px solid var(--line);
+  font-size: 12px;
+  color: var(--text-3);
+}
+.term-dot { width: 6px; height: 6px; border-radius: 50%; background: currentColor; opacity: 0.55; }
+.term-title { font-weight: 600; color: var(--text-2); letter-spacing: 0.02em; }
+.term-cwd { font-family: var(--mono); font-size: 11.5px; color: var(--text-3); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.term-actions { margin-left: auto; display: flex; gap: 2px; align-items: center; }
+
+.term-body {
+  flex: 1;
+  overflow-y: auto;
+  padding: 10px 14px;
+  font-family: var(--mono);
+  font-size: 12.4px;
+  line-height: 1.6;
+  color: var(--text-2);
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  scrollbar-gutter: stable;
+}
+.term-chunk.stderr { color: #a8493d; }
+.term-chunk.input { color: var(--text-3); }
+
+.term-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 12px;
+  border-top: 1px solid var(--line);
+  background: var(--bg);
+}
+.term-prompt { font-family: var(--mono); color: var(--text-3); font-size: 13px; }
+.term-row input {
+  flex: 1;
+  min-width: 0;
+  height: 30px;
+  border: 0;
+  outline: none;
+  background: transparent;
+  color: var(--text);
+  font-family: var(--mono);
+  font-size: 12.8px;
+}
+.term-row input:focus { transform: none; box-shadow: none; }
+
+/* ---------- 全局轻微弹力 ----------
+   所有可点组件统一手感：按下回缩、松开弹回；幅度很小，不抢内容。 */
+button,
+.session-item,
+.popover button,
+.files-row,
+.palette-item,
+.suggest button,
+.tool-head,
+summary {
+  transition:
+    transform 200ms var(--spring),
+    background-color 140ms var(--ease),
+    color 140ms var(--ease),
+    border-color 160ms var(--ease),
+    box-shadow 160ms var(--ease),
+    opacity 140ms var(--ease);
+}
+button:active,
+.session-item:active,
+.files-row:active,
+.palette-item:active {
+  transform: scale(0.96);
+}
+@media (hover: hover) {
+  button:hover,
+  .files-row:hover,
+  .palette-item:hover {
+    transform: translateY(-1px);
+  }
+}
+
+/* 输入类控件聚焦时轻轻抬起 */
+.field input,
+.field select,
+.term-row input,
+.composer textarea {
+  transition: transform 180ms var(--spring), border-color 160ms var(--ease), box-shadow 160ms var(--ease);
+}
+.field input:focus,
+.field select:focus,
+.composer textarea:focus {
+  transform: translateY(-1px);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincentbanana/bananacli",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A multi-provider AI agent for your terminal: file tools, shell, web search, persistent sessions, diff preview and undo",
   "type": "module",
   "engines": {