@vincentbanana/bananacli 0.4.2 → 0.4.4

package/dist/server/ui-server.js

@@ -258,7 +258,28 @@ export async function startUiServer(options) {
                 config.systemPrompt = body.value;
             }
             else if (body.action === 'workspace' && body.value) {
-                config.workspace = resolve(body.value);
+                const next = resolve(String(body.value).trim());
+                if (!existsSync(next)) {
+                    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)}` });
+                }
             }
             const { saveConfig } = await import("../config/config.js");
             await saveConfig(config);

package/dist/tools/web.js

@@ -54,7 +54,7 @@ function unwrapDuckDuckGo(href) {
     return decodeURIComponent(match[1]);
 }
 async function searchTavily(query, count, ctx) {
-    const apiKey = process.env['TAVILY_API_KEY'];
+    const apiKey = process.env['TAVILY_API_KEY'] ?? process.env['BANANA_TAVILY_KEY'];
     if (!apiKey)
         return null;
     const response = await fetch('https://api.tavily.com/search', {
@@ -73,10 +73,10 @@ async function searchTavily(query, count, ctx) {
     }));
 }
 async function searchBrave(query, count, ctx) {
-    const apiKey = process.env['BRAVE_API_KEY'];
+    const apiKey = process.env['BRAVE_API_KEY'] ?? process.env['BANANA_BRAVE_KEY'];
     if (!apiKey)
         return null;
-    const url = `https://api.brave.com/res/v1/web/search?q=${encodeURIComponent(query)}&count=${count}`;
+    const url = `https://api.search.brave.com/res/v1/web/search?q=${encodeURIComponent(query)}&count=${count}`;
     const response = await fetch(url, {
         headers: { 'x-subscription-token': apiKey, accept: 'application/json' },
         signal: ctx.signal,
@@ -176,6 +176,43 @@ function parseDuckDuckGo(html, count) {
     }
     return hits;
 }
+/** 归一化 URL：忽略大小写、www. 前缀、末尾斜杠和 #hash，用来去重。 */
+export function normalizeUrl(href) {
+    try {
+        const url = new URL(href);
+        const host = url.hostname.replace(/^www\./i, '').toLowerCase();
+        const path = url.pathname.replace(/\/+$/, '');
+        return `${host}${path}${url.search}`;
+    }
+    catch {
+        return href.trim();
+    }
+}
+/** 搜索结果清洗：去掉站内跳转、重复链接和空条目。 */
+export function sanitizeHits(hits, count) {
+    const seen = new Set();
+    const out = [];
+    for (const hit of hits) {
+        const url = (hit.url ?? '').trim();
+        if (!/^https?:\/\//i.test(url))
+            continue;
+        // 搜索引擎自己的搜索页 / 跳转页不是结果
+        if (/^https?:\/\/([^/]*\.)?(bing|duckduckgo|google|baidu)\.(com|cn)\//i.test(url) && /\/(search|ck\/a|url|link)\b/i.test(url))
+            continue;
+        const key = normalizeUrl(url);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        out.push({
+            title: (hit.title ?? '').trim() || url,
+            url,
+            snippet: (hit.snippet ?? '').trim().slice(0, 500),
+        });
+        if (out.length >= count)
+            break;
+    }
+    return out;
+}
 export const webSearchTool = {
     name: 'web_search',
     description: [
@@ -221,6 +258,7 @@ export const webSearchTool = {
                 hits = await searchDuckDuckGo(query, count, ctx);
             if (problems.length)
                 ctx.log(`搜索 API 降级: ${problems.join('; ')}`);
+            hits = sanitizeHits(hits, count);
             if (!hits.length)
                 return fail(`没有找到 "${query}" 的结果，换个关键词试试。`);
             const body = hits

package/dist/ui/app.js

@@ -135,6 +135,33 @@ function closeSidebarIfOverlay() {
   if (window.matchMedia('(max-width: 900px)').matches) $('sidebar').classList.remove('open');
 }
 
+let switching = false;
+/**
+ * 切换会话。直接吃 POST 返回的 info/sessions，不再多跑一次 refresh：
+ * 少一次往返、也不会和其他请求抢着改 state（之前表现为「点了没反应」）。
+ */
+async function switchSession(ref) {
+  if (switching) return;
+  switching = true;
+  document.body.classList.add('switching');
+  try {
+    const result = await post('session', { action: 'switch', ref });
+    if (result?.info) state.info = result.info;
+    if (result?.sessions) state.sessions = result.sessions;
+    renderHeader();
+    renderSidebar();
+    renderThread();
+    $('filesTitle').textContent = `项目文件 · ${state.info?.workspace ?? ''}`;
+    closeSidebarIfOverlay();
+  } catch (error) {
+    toast('切换会话失败：' + (error?.message ?? error));
+    await refresh(true);
+  } finally {
+    switching = false;
+    document.body.classList.remove('switching');
+  }
+}
+
 function renderSidebar() {
   const list = $('sessionList');
   list.innerHTML = '';
@@ -152,10 +179,7 @@ function renderSidebar() {
 
     node.addEventListener('click', (event) => {
       if (event.target.closest('[data-del], [data-menu]')) return;
-      post('session', { action: 'switch', ref: item.id }).then(() => {
-        refresh(true);
-        closeSidebarIfOverlay();
-      });
+      switchSession(item.id);
     });
 
     node.querySelector('[data-del]').addEventListener('click', (event) => {
@@ -207,9 +231,7 @@ function openSessionMenu(item, anchor) {
     event.stopPropagation();
     close();
     if (action === 'switch') {
-      await post('session', { action: 'switch', ref: item.id });
-      await refresh(true);
-      closeSidebarIfOverlay();
+      await switchSession(item.id);
     } else if (action === 'rename') {
       const title = prompt('新的标题', item.title || '');
       if (title && title.trim()) {
@@ -219,8 +241,7 @@ function openSessionMenu(item, anchor) {
         toast('已重命名');
       }
     } else {
-      await post('session', { action: 'switch', ref: item.id });
-      await refresh(true);
+      await switchSession(item.id);
       downloadSession(action === 'json' ? 'json' : 'md', item.id);
     }
   });
@@ -350,7 +371,8 @@ function renderThread() {
     if (node) THREAD.appendChild(node);
   }
   renderTurnMeta();
-  scrollToEnd();
+  // 切换会话时瞬间定位到底部；平滑滚动只用于新消息
+  scrollToEnd(false);
 }
 
 function renderTurnMeta() {
@@ -488,7 +510,7 @@ async function send() {
   renderEmpty();
 
   const userMsg = document.createElement('article');
-  userMsg.className = 'msg user';
+  userMsg.className = 'msg user enter';
   userMsg.innerHTML = '<div class="msg-role">你</div>';
   const userBody = document.createElement('div');
   userBody.className = 'msg-body';
@@ -497,7 +519,7 @@ async function send() {
   THREAD.appendChild(userMsg);
 
   const botMsg = document.createElement('article');
-  botMsg.className = 'msg assistant';
+  botMsg.className = 'msg assistant enter';
   botMsg.innerHTML = '<div class="msg-role">Banana</div>';
   const toolWrap = document.createElement('div');
   toolWrap.className = 'tool-group';
@@ -800,7 +822,7 @@ async function runCommand(text) {
   THREAD.appendChild(userMsg);
 
   const botMsg = document.createElement('article');
-  botMsg.className = 'msg assistant';
+  botMsg.className = 'msg assistant enter';
   const role = document.createElement('div');
   role.className = 'msg-role';
   role.textContent = '命令输出';
@@ -923,6 +945,49 @@ function renderSettings() {
   });
   body.appendChild(keyField);
 
+  // 工作区：换目录后所有文件工具和命令都跟着换，所以放显眼位置
+  const workspaceField = document.createElement('div');
+  workspaceField.className = 'field';
+  workspaceField.innerHTML =
+    '<label>工作区</label>' +
+    `<div class="row"><input value="${escapeHtml(info.workspace ?? '')}" spellcheck="false" /><button class="btn">切换</button></div>` +
+    '<div class="hint">Banana 只能读写这个目录下的文件，命令也在这里执行。绝对路径，例如 D:\\project。</div>';
+  workspaceField.querySelector('button').addEventListener('click', async () => {
+    const input = workspaceField.querySelector('input');
+    const value = input.value.trim();
+    if (!value) {
+      toast('请填写目录路径');
+      return;
+    }
+    try {
+      await post('action', { action: 'workspace', value });
+      await refreshSettings();
+      renderHeader();
+      toast('工作区已切换到 ' + value);
+    } catch (error) {
+      toast('切换失败：' + (error?.message ?? error));
+    }
+  });
+  workspaceField.querySelector('input').addEventListener('keydown', (event) => {
+    if (event.key === 'Enter') workspaceField.querySelector('button').click();
+  });
+  body.appendChild(workspaceField);
+
+  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));
+    }
+  });
+  body.appendChild(terminalField);
+
   const permField = document.createElement('div');
   permField.className = 'field';
   permField.innerHTML = '<label>权限</label>';

package/dist/ui/style.css

@@ -13,6 +13,8 @@
   --radius: 12px;
   --ease: cubic-bezier(0.22, 1, 0.36, 1);
   --ease-in: cubic-bezier(0.4, 0, 1, 1);
+  /* 带一点点回弹，用于按压力气和弹出层，别过量 */
+  --spring: cubic-bezier(0.34, 1.56, 0.64, 1);
   --dur: 220ms;
   --sidebar: 274px;
   --mono: ui-monospace, "SF Mono", "JetBrains Mono", Menlo, Consolas, monospace;
@@ -204,8 +206,7 @@ button, input, textarea, select { font: inherit; color: inherit; }
   height: 54px;
   padding: 0 16px;
   border-bottom: 1px solid var(--line);
-  background: color-mix(in srgb, var(--bg) 82%, transparent);
-  backdrop-filter: saturate(140%) blur(8px);
+  background: var(--bg);
 }
 
 .topbar-title {
@@ -257,8 +258,57 @@ button, input, textarea, select { font: inherit; color: inherit; }
   max-width: 780px;
   margin: 0 auto;
   padding: 0 24px;
-  animation: rise 320ms var(--ease) both;
+  /* 历史消息不做入场动画：切换会话时整屏重绘，动画会让人以为界面在乱动，
+     长对话里还会明显卡顿。新消息的即时感交给滚动和光标。 */
+  content-visibility: auto;
+  contain-intrinsic-size: auto 120px;
+}
+
+/* ---------- 轻微回弹 ----------
+   只给「按下去」和「弹出来」加一点过冲，不影响滚动手感。 */
+.btn,
+.icon-btn,
+.send-btn,
+.s-act,
+.popover button,
+.session-item {
+  transition:
+    background 140ms var(--ease),
+    color 140ms var(--ease),
+    border-color 140ms var(--ease),
+    transform 180ms var(--spring);
+}
+
+.btn:active,
+.popover button:active,
+.s-act:active {
+  transform: scale(0.95);
+}
+
+.btn:hover,
+.icon-btn:hover {
+  transform: translateY(-1px);
+}
+
+.send-btn:not(:disabled):hover {
+  transform: translateY(-1px) scale(1.04);
+}
+
+.send-btn:not(:disabled):active {
+  transform: scale(0.93);
+}
+
+.session-item:active {
+  transform: scale(0.985);
+}
+
+/* 新消息轻轻上浮，只有真正新产生的消息走这条 */
+.msg.enter {
+  animation: rise 240ms var(--spring) both;
 }
+.thread { transition: opacity 120ms var(--ease); }
+body.switching .thread { opacity: 0.45; }
+body.switching { cursor: progress; }
 
 @keyframes rise {
   from { opacity: 0; transform: translateY(8px); }
@@ -513,7 +563,7 @@ pre.code code { border: 0; background: none; padding: 0; font-size: 12.6px; line
   box-shadow: var(--shadow-lg);
   display: flex;
   flex-direction: column;
-  animation: slide var(--dur) var(--ease) both;
+  animation: slide 250ms var(--spring) both;
   will-change: transform;
 }
 @keyframes slide {
@@ -767,7 +817,8 @@ pre.code code { border: 0; background: none; padding: 0; font-size: 12.6px; line
   border-radius: 10px;
   background: var(--bg);
   box-shadow: var(--shadow-lg);
-  animation: pop 160ms var(--ease) both;
+  animation: pop 190ms var(--spring) both;
+  transform-origin: top right;
 }
 .popover button {
   display: block;

package/package.json

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