yiyan-browser-agent 1.7.9 → 1.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yiyan-browser-agent",
-  "version": "1.7.9",
+  "version": "1.8.1",
   "description": "AI coding agent powered by Yiyan (文心一言) via browser automation — no API key needed",
   "main": "src/index.js",
   "bin": {

package/src/browser.js

@@ -297,26 +297,49 @@ class YiyanBrowser {
     if (!appeared) logger.warn('Response may have been delayed — continuing to wait...');
 
     // Phase 2: wait for completion
-    // 条件: dialogCardBottom 出现 + 连续两次内容稳定
+    // 条件: dialogCardBottom 出现 + answer稳定 + 思考区域稳定
     let lastText            = '';
+    let lastThinkingText    = '';
     let stableCount         = 0;
-    let lastCheckTime       = Date.now();  // 在 Phase 2 开始时重新设置
+    let thinkingStableCount = 0;
+    let lastCheckTime       = Date.now();
     let dotCount            = 0;
     let hasCompletionMarker = false;
 
     while (Date.now() - start < timeout) {
       const text = await this._extractLastMessage();
 
-      // ── 稳定性检测：内容不变则计数 ──
+      // ── 思考区域内容检测 ──
+      const thinkingInfo = await this.page.evaluate(() => {
+        const thinkingEl = document.querySelector('.container__SPpahQHm, [class*="container__SPpah"]');
+        if (!thinkingEl) return { text: '', exists: false };
+
+        const s = window.getComputedStyle(thinkingEl);
+        const isVisible = s.display !== 'none' && s.visibility !== 'hidden';
+        const text = isVisible ? (thinkingEl.innerText || '') : '';
+
+        return { text, exists: true };
+      });
+
+      // ── 思考区域稳定性检测 ──
+      if (thinkingInfo.text === lastThinkingText && thinkingInfo.text.length > 5) {
+        if (Date.now() - lastCheckTime >= stableDelay) {
+          thinkingStableCount++;
+          logger.dim(`Thinking stable: ${thinkingStableCount}/2 (${thinkingInfo.text.length} chars)`);
+        }
+      } else if (thinkingInfo.text !== lastThinkingText) {
+        lastThinkingText = thinkingInfo.text;
+        thinkingStableCount = 0;
+        lastCheckTime = Date.now();
+      }
+
+      // ── answer 稳定性检测 ──
       if (text === lastText && text.length > 50) {
-        // 内容没变化，检查是否达到稳定时间
         if (Date.now() - lastCheckTime >= stableDelay) {
           stableCount++;
-          lastCheckTime = Date.now();
-          logger.dim(`Stable count: ${stableCount}/2 (${text.length} chars)`);
+          logger.dim(`Answer stable: ${stableCount}/2 (${text.length} chars)`);
         }
-      } else {
-        // 内容变化，重置
+      } else if (text !== lastText) {
         lastText = text;
         stableCount = 0;
         lastCheckTime = Date.now();
@@ -344,30 +367,14 @@ class YiyanBrowser {
         hasCompletionMarker = true;
       }
 
-      // ── 完成判断：标记出现 + 连续两次稳定 + 思考区域已消失 ──
-      if (hasCompletionMarker && stableCount >= 2) {
-        // 检查思考区域是否存在且有内容
-        const thinkingStatus = await this.page.evaluate(() => {
-          const thinkingEl = document.querySelector('.container__SPpahQHm, [class*="container__SPpah"]');
-          if (!thinkingEl) return { exists: false, hasContent: false };
-
-          const s = window.getComputedStyle(thinkingEl);
-          const isVisible = s.display !== 'none' && s.visibility !== 'hidden';
-          const text = thinkingEl.innerText || '';
-          const hasContent = text.length > 5;
-
-          return { exists: true, isVisible, hasContent };
-        });
-
-        // 思考区域存在且可见且有内容 → 还在思考，继续等待
-        if (thinkingStatus.exists && thinkingStatus.isVisible && thinkingStatus.hasContent) {
-          stableCount = 0;
-          lastCheckTime = Date.now();
-          logger.dim('Thinking in progress, continue waiting...');
-          continue;
-        }
+      // ── 完成判断 ──
+      // 条件1: 标记出现 + answer稳定 + 思考区域稳定
+      // 条件2(备用): 两者都稳定达到 4 次（即使没有完成标记）
+      const condition1 = hasCompletionMarker && stableCount >= 2 && thinkingStableCount >= 2;
+      const condition2 = stableCount >= 4 && thinkingStableCount >= 4;
 
-        // 思考区域已消失/不可见/无内容 → 检查 _isGenerating
+      if (condition1 || condition2) {
+        // 检查 _isGenerating 作为最终确认
         if (!await this._isGenerating()) {
           await this.page.waitForTimeout(500);
           logger.clearLine();
@@ -376,6 +383,7 @@ class YiyanBrowser {
         }
         // _isGenerating 说还在生成，重置计数继续等待
         stableCount = 0;
+        thinkingStableCount = 0;
         lastCheckTime = Date.now();
       }
 
@@ -472,19 +480,7 @@ class YiyanBrowser {
         return result.trim();
       }
 
-      // ── 先检查思考区域是否有内容 ──
-      const thinkingEl = document.querySelector('.container__SPpahQHm, [class*="container__SPpah"]');
-      if (thinkingEl) {
-        const s = window.getComputedStyle(thinkingEl);
-        const isVisible = s.display !== 'none' && s.visibility !== 'hidden';
-        const thinkingText = thinkingEl.innerText || '';
-        if (isVisible && thinkingText.length > 5) {
-          // 思考区域有内容，返回空字符串（等待思考完成）
-          return '';
-        }
-      }
-
-      // ── 思考区域无内容，从 answer_text_id 提取 ──
+      // ── 从 answer_text_id 提取内容 ──
       const answerEl = document.querySelector('#answer_text_id');
       if (answerEl) {
         return getFullText(answerEl);
@@ -497,26 +493,7 @@ class YiyanBrowser {
 
   async _isGenerating() {
     return await this.page.evaluate(() => {
-      // ── 1. 检测思考过程区域（最重要）──
-      const thinkingSelectors = [
-        '.container__SPpahQHm',        // Yiyan 思考过程区域
-        '[class*="container__SPpah"]',
-        '[class*="thinking"]',
-        '[class*="Thinking"]',
-        '[class*="thought"]',
-      ];
-      for (const sel of thinkingSelectors) {
-        const el = document.querySelector(sel);
-        if (el) {
-          const s = window.getComputedStyle(el);
-          // 元素可见且有内容
-          if (s.display !== 'none' && s.visibility !== 'hidden' && el.innerText && el.innerText.length > 5) {
-            return true;  // 思考区域有内容，还在生成
-          }
-        }
-      }
-
-      // ── 2. 检测停止按钮/生成状态 UI ──
+      // ── 1. 检测停止按钮/生成状态 UI ──
       const stopSelectors = [
         'button[aria-label*="Stop" i]',
         'button[aria-label*="停止"]',
@@ -533,7 +510,7 @@ class YiyanBrowser {
         }
       }
 
-      // ── 3. 检测加载动画/typing指示器 ──
+      // ── 2. 检测加载动画/typing指示器 ──
       const loaderSelectors = [
         '[class*="typing"]',
         '[class*="loading"]',
@@ -555,7 +532,7 @@ class YiyanBrowser {
         }
       }
 
-      // ── 4. 检测是否缺少完成标记元素 ──
+      // ── 3. 检测是否缺少完成标记元素 ──
       const completionMarkers = [
         '[class*="dialogCardBottom"]',
         '.dialogCardBottom__qoXjps3z',