yiyan-browser-agent 1.10.3 → 1.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yiyan-browser-agent",
-  "version": "1.10.3",
+  "version": "1.11.1",
   "description": "AI coding agent powered by Yiyan (文心一言) via browser automation (chat.baidu.com) — no API key needed. Performance-optimized. Enhanced with comprehensive security.",
   "main": "src/index.js",
   "bin": {

package/src/browser.js

@@ -14,12 +14,11 @@ const CrashHandler = require('./stability/crash-handler');
 
 const SEL = {
   chatInput: [
-    '.editable__T7WAW4uW',
-    '[role="textbox"]',
-    '.editable',
-    '#chat-input',
+    '#chat-textarea',
+    'textarea.ci-textarea',
     'textarea[placeholder]',
     'textarea',
+    '[role="textbox"]',
     '[contenteditable="true"][role="textbox"]',
     '[contenteditable="true"]',
     '[class*="input-box"]',
@@ -46,12 +45,16 @@ const SEL = {
     'button[aria-label*="停止"]',
     '[aria-label*="stop generating" i]',
     '[data-testid="stop-button"]',
+    '[class*="stop-gen"]',
+    '[class*="stopGen"]',
     '[class*="stop-btn"]',
     '[class*="stopBtn"]',
     '[class*="abort"]',
   ],
 
   newChat: [
+    '.new-dialog-container-button',
+    '[class*="new-dialog-container"]',
     'button[aria-label*="New chat" i]',
     'button[aria-label*="新对话"]',
     'button[aria-label*="New conversation" i]',
@@ -61,15 +64,19 @@ const SEL = {
     '[class*="newChat"]',
   ],
 
-  // Response ready indicators
+  // Response ready indicators (chat.baidu.com)
   responseReady: [
+    '.ai-entry-block.ai-markdown',
+    '.answer-container',
+    '.cs-answer-container',
+    '.answer-box',
     '[class*="answer"]',
-    '[class*="response"]',
     '[class*="markdown"]',
-    '.ds-markdown',
   ],
 
   messageContainer: [
+    '#chat-container-main',
+    '[class*="chat-container"]',
     '[class*="chat-content"]',
     '[class*="message-list"]',
     '[class*="conversation"]',
@@ -178,17 +185,22 @@ class YiyanBrowser {
 
     const needsLogin = await this.page.evaluate(() => {
       const url = window.location.href;
+      // URL 中包含登录/认证路径 → 需要登录
+      if (url.includes('/auth') || url.includes('/login') || url.includes('/sign')) {
+        return true;
+      }
+      // 存在密码输入框 → 需要登录
+      if (document.querySelector('input[type="password"]')) {
+        return true;
+      }
+      // 页面主体区域被登录界面遮挡（排除侧栏的"请登录"提示）
       const bodyText = document.body?.innerText || '';
-      return (
-        url.includes('/auth') ||
-        url.includes('/login') ||
-        url.includes('/sign') ||
-        bodyText.includes('Sign in') ||
-        bodyText.includes('Log in') ||
-        bodyText.includes('登录') ||
-        bodyText.includes('登 录') ||
-        !!document.querySelector('input[type="password"]')
-      );
+      const mainInput = document.querySelector('#chat-textarea, textarea.ci-textarea');
+      if (!mainInput) {
+        // 输入框不存在可能是需要登录
+        return bodyText.includes('Sign in') || bodyText.includes('Log in');
+      }
+      return false;
     });
 
     if (needsLogin) {
@@ -235,18 +247,24 @@ class YiyanBrowser {
   // ── Sending Messages (stable: keyboard.type) ────────────────────────────────
 
   async sendMessage(text) {
-    const { el } = await this._findInput();
-
-    // Focus and select all existing content
-    await el.click({ clickCount: 3, force: true });
-    await this.page.waitForTimeout(100);
-
-    // Clear by pressing Delete
-    await this.page.keyboard.press('Delete');
-    await this.page.waitForTimeout(50);
-
-    // Type text character by character (stable, works reliably)
-    await this.page.keyboard.type(text, { delay: 10 });
+    const { el, isTextarea } = await this._findInput();
+
+    if (isTextarea) {
+      // textarea 元素：用 fill() 快速填充
+      await el.click({ force: true });
+      await this.page.waitForTimeout(100);
+      await el.fill('');
+      await this.page.waitForTimeout(50);
+      await el.fill(text);
+      await this.page.waitForTimeout(100);
+    } else {
+      // contenteditable 元素：用键盘输入
+      await el.click({ clickCount: 3, force: true });
+      await this.page.waitForTimeout(100);
+      await this.page.keyboard.press('Delete');
+      await this.page.waitForTimeout(50);
+      await this.page.keyboard.type(text, { delay: 10 });
+    }
 
     // Press Enter to send
     await this.page.keyboard.press('Enter');
@@ -302,15 +320,28 @@ class YiyanBrowser {
     let lastThinkingText    = '';
     let stableCount         = 0;
     let lastStableTime      = Date.now();
+    let textChangedAt       = Date.now();  // 文本最后变化时间
     let dotCount            = 0;
     let hasCompletionMarker = false;
 
     while (Date.now() - start < timeout) {
       const text = await this._extractLastMessage();
 
-      // ── 思考区域内容检测 ──
+      // ── 思考区域内容检测 (chat.baidu.com) ──
       const thinkingInfo = await this.page.evaluate(() => {
-        const thinkingEl = document.querySelector('.container__SPpahQHm, [class*="container__SPpah"]');
+        // chat.baidu.com 深度思考区域
+        const thinkingSelectors = [
+          '[class*="deep-think"]',
+          '[class*="deepThink"]',
+          '[class*="deep-search"]',
+          '[class*="thinking-container"]',
+          '[class*="container__SPpah"]',  // 旧版兼容
+        ];
+        let thinkingEl = null;
+        for (const sel of thinkingSelectors) {
+          thinkingEl = document.querySelector(sel);
+          if (thinkingEl) break;
+        }
         if (!thinkingEl) return { text: '', exists: false };
 
         const s = window.getComputedStyle(thinkingEl);
@@ -320,17 +351,22 @@ class YiyanBrowser {
         return { text, exists: true };
       });
 
-      // ── 统一稳定性检测：两者都不变才算稳定 ──
+      // ── 统一稳定性检测：答案不变即算稳定 ──
       const thinkingStable = thinkingInfo.text === lastThinkingText;
       const answerStable   = text === lastText;
-      const hasContent     = thinkingInfo.text.length > 5 && text.length > 0;
-
-      if (thinkingStable && answerStable && hasContent) {
-        // 两者都稳定且有内容，检查稳定时间
+      // 如果有思考区域，需要两者都稳定；否则只看答案
+      const hasThinking    = thinkingInfo.exists && thinkingInfo.text.length > 0;
+      const hasContent     = text.length > 0;
+      const stable         = hasThinking
+        ? (thinkingStable && answerStable && hasContent)
+        : (answerStable && hasContent);
+
+      if (stable) {
+        // 稳定且有内容，检查稳定时间
         if (Date.now() - lastStableTime >= stableDelay) {
           stableCount++;
           lastStableTime = Date.now();
-          logger.dim(`Both stable: ${stableCount}/2 (thinking: ${thinkingInfo.text.length} chars, answer: ${text.length} chars)`);
+          logger.dim(`Stable: ${stableCount}/2 (answer: ${text.length} chars${hasThinking ? ', thinking: ' + thinkingInfo.text.length + ' chars' : ''})`);
         }
       } else {
         // 任一变化，重置
@@ -338,15 +374,22 @@ class YiyanBrowser {
         lastText = text;
         stableCount = 0;
         lastStableTime = Date.now();
+        textChangedAt = Date.now();
       }
 
-      // ── 完成标记检测 ──
+      // ── 完成标记检测 (chat.baidu.com) ──
       const detected = await this.page.evaluate(() => {
         const selectors = [
+          '.cos-icon.cos-icon-copy',
+          '.cos-icon-copy',
+          '.feedback-hover-show',
+          '[class*="feedback-wrapper"]',
+          '.cos-icon.cos-icon-share1',
+          '.cos-icon.cos-icon-feedback',
+          // 旧版兼容
           '.dialogCardBottom__qoXjps3z',
           '[class*="dialogCardBottom"]',
           '[class*="dialog-bottom"]',
-          '[class*="response-footer"]',
         ];
         for (const sel of selectors) {
           const el = document.querySelector(sel);
@@ -363,10 +406,12 @@ class YiyanBrowser {
       }
 
       // ── 完成判断 ──
-      // 条件1: 标记出现 + 两者都稳定 2 次
-      // 条件2(备用): 两者都稳定 3 次（即使没有完成标记）
+      // 条件1: 完成标记出现 + 稳定 2 次
+      // 条件2: 稳定 3 次（即使没有完成标记）
+      // 条件3(兜底): 文本长时间稳定不变（≥5秒），强制认为完成
       const condition1 = hasCompletionMarker && stableCount >= 2;
       const condition2 = stableCount >= 3;
+      const longStable = (Date.now() - textChangedAt) >= 5000 && text.length > 0;
 
       if (condition1 || condition2) {
         // 检查 _isGenerating 作为最终确认
@@ -379,6 +424,13 @@ class YiyanBrowser {
         // _isGenerating 说还在生成，重置计数继续等待
         stableCount = 0;
         lastStableTime = Date.now();
+      } else if (longStable) {
+        // 兜底：文本已经 5 秒没变化了，强制完成
+        logger.dim('Long stable fallback — text unchanged for 5s, forcing completion');
+        await this.page.waitForTimeout(300);
+        logger.clearLine();
+        logger.success('Response complete (stable timeout)');
+        break;
       }
 
       // Progress indicator
@@ -400,16 +452,16 @@ class YiyanBrowser {
   async _getMessageCount() {
     return await this.page.evaluate(() => {
       const candidates = [
-        '[class*="answer"]',
-        '[class*="response"]',
-        '[class*="content"]',
-        '[class*="markdown"]',
-        '[class*="assistant"][class*="message"]',
-        '[data-role="assistant"]',
-        '[class*="markdown-content"]',
-        '.ds-markdown',
-        '[class*="chat-message"]',
-        '[class*="message-bubble"]',
+        '.ai-entry-block.ai-markdown',
+        '.answer-box',
+        '.cs-answer-container',
+        '.answer-container',
+        '.chat-search-answer-generate-item',
+        '[class*="answer-container"]',
+        '[class*="answer-box"]',
+        '.ai-markdown',
+        '.cs-question-bubble',
+        '[class*="question-bubble"]',
       ];
       for (const sel of candidates) {
         const els = document.querySelectorAll(sel);
@@ -435,10 +487,15 @@ class YiyanBrowser {
           if (node.nodeType !== Node.ELEMENT_NODE) return;
           const tag = node.tagName.toLowerCase();
 
-          // 排除思考过程区域
-          const cls = node.className || '';
-          if (cls.includes('container__SPpahQHm') || cls.includes('thinking') || cls.includes('Thinking')) {
-            return;  // 跳过思考区域
+          // 排除思考过程区域和 UI 建议区域
+          const cls = (typeof node.className === 'string') ? node.className : '';
+          if (cls.includes('thinking') || cls.includes('Thinking') ||
+              cls.includes('deep-search') || cls.includes('deep_think') ||
+              cls.includes('suggestion') || cls.includes('follow-up') ||
+              cls.includes('question-container') || cls.includes('question-bubble') ||
+              cls.includes('quick-entrance') || cls.includes('feedback-wrapper') ||
+              cls.includes('hover-menu') || cls.includes('action-bar')) {
+            return;  // 跳过思考区域和 UI 元素
           }
 
           if (tag === 'pre') {
@@ -474,27 +531,53 @@ class YiyanBrowser {
         return result.trim();
       }
 
-      // ── 从 answer_text_id 提取内容 ──
+      // ── chat.baidu.com 新选择器 ──
+
+      // 优先: 获取最后一个回答块的内容
+      const answerBlocks = document.querySelectorAll(
+        '.ai-entry-block.ai-markdown, .answer-container.cs-enable-selection, .cs-answer-container'
+      );
+      if (answerBlocks.length > 0) {
+        const lastBlock = answerBlocks[answerBlocks.length - 1];
+        const text = getFullText(lastBlock);
+        if (text.length > 0) return text;
+      }
+
+      // 回退 1: 通过 answer-box 获取
+      const answerBoxes = document.querySelectorAll('.answer-box, .last-answer-box');
+      if (answerBoxes.length > 0) {
+        const lastBox = answerBoxes[answerBoxes.length - 1];
+        const text = getFullText(lastBox);
+        if (text.length > 0) return text;
+      }
+
+      // 回退 2: 旧版 #answer_text_id (兼容)
       const answerEl = document.querySelector('#answer_text_id');
       if (answerEl) {
         return getFullText(answerEl);
       }
 
-      // answer_text_id 不存在，返回空字符串
+      // 回退 3: 通用 markdown 容器
+      const markdowns = document.querySelectorAll('.ai-markdown, [class*="markdown-content"]');
+      if (markdowns.length > 0) {
+        const lastMd = markdowns[markdowns.length - 1];
+        const text = getFullText(lastMd);
+        if (text.length > 0) return text;
+      }
+
       return '';
     });
   }
 
   async _isGenerating() {
     return await this.page.evaluate(() => {
-      // ── 1. 检测停止按钮/生成状态 UI ──
+      // ── 1. 检测停止按钮（最可靠的生成中信号）──
       const stopSelectors = [
         'button[aria-label*="Stop" i]',
         'button[aria-label*="停止"]',
         '[class*="stop-gen"]',
         '[class*="stopGen"]',
-        '[class*="generating"]',
-        '[class*=" Generating"]',
+        '[class*="stop-btn"]',
       ];
       for (const sel of stopSelectors) {
         const el = document.querySelector(sel);
@@ -504,21 +587,15 @@ class YiyanBrowser {
         }
       }
 
-      // ── 2. 检测加载动画/typing指示器 ──
-      const loaderSelectors = [
-        '[class*="typing"]',
-        '[class*="loading"]',
-        '[class*="spinner"]',
-        '[class*="blink"]',
-        '[class*="cursor"]',
-        '[class*="pulsing"]',
-        '[class*="thinking"]',
+      // ── 2. 检测活跃的 CSS 动画（真正的 loading spinner，不是永久类名）──
+      // 只检测 svg 动画元素和明确的 loading 指示器
+      const activeAnimSelectors = [
         'svg[class*="loading"]',
         'svg[class*="spinner"]',
-        '.loading-indicator',
-        '.generating-indicator',
+        '[class*="loading-indicator"]',
+        '[class*="generating-indicator"]',
       ];
-      for (const sel of loaderSelectors) {
+      for (const sel of activeAnimSelectors) {
         const el = document.querySelector(sel);
         if (el) {
           const s = window.getComputedStyle(el);
@@ -526,30 +603,40 @@ class YiyanBrowser {
         }
       }
 
-      // ── 3. 检测是否缺少完成标记元素 ──
+      // ── 3. 如果有完成标记 → 肯定已完成 ──
       const completionMarkers = [
-        '[class*="dialogCardBottom"]',
-        '.dialogCardBottom__qoXjps3z',
+        '.cos-icon.cos-icon-copy',
+        '.cos-icon-copy',
+        '.feedback-hover-show',
+        '.cos-icon.cos-icon-share1',
+        '.cos-icon.cos-icon-feedback',
         '[class*="copy-btn"]',
-        '[class*="copyBtn"]',
         '[aria-label*="Copy" i]',
         '[aria-label*="复制"]',
-        '[class*="regenerate"]',
-        '[class*="retry"]',
-        '[class*="action-btn"]',
       ];
-      let hasCompletionMarker = false;
       for (const sel of completionMarkers) {
-        if (document.querySelector(sel)) {
-          hasCompletionMarker = true;
-          break;
-        }
+        if (document.querySelector(sel)) return false;
       }
 
-      // 如果有响应内容但没有完成标记 → 还在生成
-      const answerArea = document.querySelector('[class*="answer"], [class*="response"], [class*="markdown"]');
-      if (answerArea && answerArea.innerText && answerArea.innerText.length > 5) {
-        if (!hasCompletionMarker) {
+      // ── 4. 检查是否有光标闪烁（生成中的光标）──
+      // 用 getComputedStyle 检测 animation，而不是类名
+      const answerArea = document.querySelector(
+        '.ai-entry-block.ai-markdown, .answer-container, .cs-answer-container'
+      );
+      if (answerArea) {
+        // 查找最后子元素是否有动画光标
+        const lastChild = answerArea.lastElementChild;
+        if (lastChild) {
+          const s = window.getComputedStyle(lastChild);
+          // 如果最后一个元素有活跃的动画 → 还在生成
+          if (s.animationName && s.animationName !== 'none' &&
+              s.display !== 'none' && s.visibility !== 'hidden') {
+            return true;
+          }
+        }
+
+        // 有回答内容但没有完成标记 → 可能还在生成
+        if (answerArea.innerText && answerArea.innerText.length > 5) {
           return true;
         }
       }
@@ -568,29 +655,34 @@ class YiyanBrowser {
       '正在思考中',
       '正在思考',
       '思考过程',
-      '我来',
-      '我需要',
+      '深度思考',
       '根据搜索结果',
       '参考',
-      'picaole需要',
     ];
 
-    // Remove lines that contain thinking markers
-    for (const marker of thinkingMarkers) {
-      // 如果整行包含思考标记，移除该行
-      const lines = text.split('\n');
-      text = lines.filter(line => !line.includes(marker)).join('\n');
-    }
-
-    // Remove everything before "准备输出结果" (Yiyan's thinking process end marker)
+    // Remove lines that are standalone thinking/UI markers
+    const lines = text.split('\n');
+    text = lines.filter(line => {
+      const trimmed = line.trim();
+      // 移除纯 UI 标记行
+      if (thinkingMarkers.some(m => trimmed === m)) return false;
+      // 移除建议追问行（新 UI 的 follow-up 按钮）
+      if (/^(能否|能再|能帮|可以|请用|用一句|用一段)/.test(trimmed) && trimmed.length < 50) return false;
+      return true;
+    }).join('\n');
+
+    // Remove everything before "准备输出结果" (thinking process end marker)
     const outputMarker = '准备输出结果';
     const markerIndex = text.indexOf(outputMarker);
     if (markerIndex !== -1) {
       text = text.slice(markerIndex + outputMarker.length).trim();
     }
 
-    // Remove everything after regenerate/suggestion markers (Yiyan's UI elements)
-    const cutMarkers = ['重新生成', '重新生成的', '换个回答', '输出更详细的', '再多提供'];
+    // Remove everything after regenerate/suggestion markers (UI elements)
+    const cutMarkers = [
+      '重新生成', '重新生成的', '换个回答', '输出更详细的', '再多提供',
+      '内容由AI生成', '查看使用规则',
+    ];
     for (const marker of cutMarkers) {
       const cutIndex = text.indexOf(marker);
       if (cutIndex !== -1) {