@vincentbanana/bananacli 0.4.1 → 0.4.3

package/dist/tools/web.js

@@ -1,6 +1,6 @@
 import { fail, ok } from "./types.js";
 const DEFAULT_TIMEOUT_MS = 30_000;
-const USER_AGENT = 'Mozilla/5.0 (compatible; BananaCLI/0.1; +https://github.com/banana-cli) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36';
+const USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36';
 async function fetchText(url, init, ctx) {
     const controller = new AbortController();
     const timeoutMs = init.timeoutMs ?? DEFAULT_TIMEOUT_MS;
@@ -26,6 +26,12 @@ function decodeEntities(text) {
         .replace(/"/g, '"')
         .replace(/'/g, "'")
         .replace(/ /g, ' ')
+        .replace(/ /g, ' ')
+        .replace(/ /g, ' ')
+        .replace(/·/g, '·')
+        .replace(/…/g, '…')
+        .replace(/—/g, '—')
+        .replace(/–/g, '–')
         .replace(/&lt;/g, '<')
         .replace(/&gt;/g, '>')
         .replace(/&amp;/g, '&');
@@ -84,6 +90,55 @@ async function searchBrave(query, count, ctx) {
         snippet: stripTags(item.description ?? '').slice(0, 500),
     }));
 }
+async function searchBing(query, count, ctx) {
+    const html = await fetchText(`https://www.bing.com/search?q=${encodeURIComponent(query)}&count=${count}`, {
+        headers: {
+            'user-agent': USER_AGENT,
+            accept: 'text/html,application/xhtml+xml',
+            'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8',
+        },
+        timeoutMs: 20_000,
+    }, ctx);
+    return parseBing(html, count);
+}
+/** Bing 有时把结果包成 /ck/a?...&u=a1<base64> 的跳转链接，这里还原成真实地址。 */
+export function unwrapBing(href) {
+    if (!/bing\.com\/ck\/a/i.test(href))
+        return href;
+    try {
+        const raw = new URL(href).searchParams.get('u');
+        if (!raw || !raw.startsWith('a1'))
+            return href;
+        const base64 = raw.slice(2).replace(/-/g, '+').replace(/_/g, '/');
+        const padded = base64 + '='.repeat((4 - (base64.length % 4)) % 4);
+        const decoded = Buffer.from(padded, 'base64').toString('utf8');
+        return /^https?:/i.test(decoded) ? decoded : href;
+    }
+    catch {
+        return href;
+    }
+}
+export function parseBing(html, count) {
+    const hits = [];
+    for (const block of html.matchAll(/<li class="b_algo"[\s\S]*?<\/li>/gi)) {
+        const item = block[0];
+        const link = item.match(/<h2[^>]*>\s*<a[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/i);
+        if (!link)
+            continue;
+        const url = unwrapBing(decodeEntities(link[1] ?? ''));
+        if (!/^https?:/i.test(url))
+            continue;
+        const snippet = item.match(/<p[^>]*>([\s\S]*?)<\/p>/i);
+        hits.push({
+            title: decodeEntities(stripTags(link[2] ?? '')).trim(),
+            url,
+            snippet: decodeEntities(stripTags(snippet?.[1] ?? '')).trim().slice(0, 500),
+        });
+        if (hits.length >= count)
+            break;
+    }
+    return hits;
+}
 async function searchDuckDuckGo(query, count, ctx) {
     const errors = [];
     const endpoints = [
@@ -125,7 +180,7 @@ export const webSearchTool = {
     name: 'web_search',
     description: [
         '联网搜索，返回标题 + 链接 + 摘要。',
-        '优先使用 TAVILY_API_KEY / BRAVE_API_KEY；没有配置时自动回退到 DuckDuckGo。',
+        '优先使用 TAVILY_API_KEY / BRAVE_API_KEY；没有配置时自动回退到 Bing、DuckDuckGo。',
         '搜不到就换关键词再试，别靠猜。',
     ].join(''),
     parameters: {
@@ -148,13 +203,15 @@ export const webSearchTool = {
             const order = [
                 () => searchTavily(query, count, ctx),
                 () => searchBrave(query, count, ctx),
+                () => searchBing(query, count, ctx),
             ];
             const problems = [];
             for (const attempt of order) {
                 try {
                     hits = await attempt();
-                    if (hits)
+                    if (hits && hits.length)
                         break;
+                    hits = null;
                 }
                 catch (error) {
                     problems.push(error.message);

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() {

package/dist/ui/style.css

@@ -204,8 +204,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,9 +256,17 @@ 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;
 }
 
+/* 切换会话时给一点即时反馈，避免点了像没反应 */
+.thread { transition: opacity 120ms var(--ease); }
+body.switching .thread { opacity: 0.45; }
+body.switching { cursor: progress; }
+
 @keyframes rise {
   from { opacity: 0; transform: translateY(8px); }
   to { opacity: 1; transform: none; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincentbanana/bananacli",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "A multi-provider AI agent for your terminal: file tools, shell, web search, persistent sessions, diff preview and undo",
   "type": "module",
   "engines": {
@@ -25,7 +25,7 @@
     "build": "tsc -p tsconfig.build.json && node scripts/copy-ui.mjs",
     "typecheck": "tsc --noEmit",
     "dev": "node --watch src/index.ts",
-    "test": "node test/prompt.test.mjs && node test/ui.test.mjs && node test/p0.test.mjs && node test/features.test.mjs && node test/gui.test.mjs && node test/smoke.mjs",
+    "test": "node test/prompt.test.mjs && node test/ui.test.mjs && node test/p0.test.mjs && node test/features.test.mjs && node test/gui.test.mjs && node test/web-search.test.mjs && node test/smoke.mjs",
     "gui:sync": "node scripts/sync-gui.mjs",
     "prepare": "npm run build",
     "prepublishOnly": "npm run typecheck && npm test && npm run build && node test/pack.test.mjs"