@jackwener/opencli 1.6.0 → 1.6.2

package/src/clis/xiaohongshu/search.test.ts

@@ -20,8 +20,6 @@ function createPageMock(evaluateResults: any[]): IPage {
     getFormState: vi.fn().mockResolvedValue({ forms: [], orphanFields: [] }),
     wait: vi.fn().mockResolvedValue(undefined),
     tabs: vi.fn().mockResolvedValue([]),
-    closeTab: vi.fn().mockResolvedValue(undefined),
-    newTab: vi.fn().mockResolvedValue(undefined),
     selectTab: vi.fn().mockResolvedValue(undefined),
     networkRequests: vi.fn().mockResolvedValue([]),
     consoleMessages: vi.fn().mockResolvedValue([]),
@@ -41,8 +39,8 @@ describe('xiaohongshu search', () => {
     expect(cmd?.func).toBeTypeOf('function');
 
     const page = createPageMock([
-      // First evaluate: early login-wall check (returns true)
-      true,
+      // First evaluate: MutationObserver wait (login wall detected)
+      'login_wall',
     ]);
 
     await expect(cmd!.func!(page, { query: '特斯拉', limit: 5 })).rejects.toThrow(
@@ -63,21 +61,18 @@ describe('xiaohongshu search', () => {
       'https://www.xiaohongshu.com/user/profile/635a9c720000000018028b40?xsec_token=user-token&xsec_source=pc_search';
 
     const page = createPageMock([
-      // First evaluate: early login-wall check (returns false → no wall)
-      false,
-      // Second evaluate: main DOM extraction
-      {
-        loginWall: false,
-        results: [
-          {
-            title: '某鱼买FSD被坑了4万',
-            author: '随风',
-            likes: '261',
-            url: detailUrl,
-            author_url: authorUrl,
-          },
-        ],
-      },
+      // First evaluate: MutationObserver wait (content appeared)
+      'content',
+      // Second evaluate: main DOM extraction (returns array directly)
+      [
+        {
+          title: '某鱼买FSD被坑了4万',
+          author: '随风',
+          likes: '261',
+          url: detailUrl,
+          author_url: authorUrl,
+        },
+      ],
     ]);
 
     const result = await cmd!.func!(page, { query: '特斯拉', limit: 1 });
@@ -103,35 +98,32 @@ describe('xiaohongshu search', () => {
     expect(cmd?.func).toBeTypeOf('function');
 
     const page = createPageMock([
-      // First evaluate: early login-wall check (returns false → no wall)
-      false,
-      // Second evaluate: main DOM extraction
-      {
-        loginWall: false,
-        results: [
-          {
-            title: 'Result A',
-            author: 'UserA',
-            likes: '10',
-            url: 'https://www.xiaohongshu.com/search_result/aaa',
-            author_url: '',
-          },
-          {
-            title: '',
-            author: 'UserB',
-            likes: '5',
-            url: 'https://www.xiaohongshu.com/search_result/bbb',
-            author_url: '',
-          },
-          {
-            title: 'Result C',
-            author: 'UserC',
-            likes: '3',
-            url: 'https://www.xiaohongshu.com/search_result/ccc',
-            author_url: '',
-          },
-        ],
-      },
+      // First evaluate: MutationObserver wait (content appeared)
+      'content',
+      // Second evaluate: main DOM extraction (returns array directly)
+      [
+        {
+          title: 'Result A',
+          author: 'UserA',
+          likes: '10',
+          url: 'https://www.xiaohongshu.com/search_result/aaa',
+          author_url: '',
+        },
+        {
+          title: '',
+          author: 'UserB',
+          likes: '5',
+          url: 'https://www.xiaohongshu.com/search_result/bbb',
+          author_url: '',
+        },
+        {
+          title: 'Result C',
+          author: 'UserC',
+          likes: '3',
+          url: 'https://www.xiaohongshu.com/search_result/ccc',
+          author_url: '',
+        },
+      ],
     ]);
 
     const result = (await cmd!.func!(page, { query: '测试', limit: 1 })) as any[];
@@ -140,6 +132,25 @@ describe('xiaohongshu search', () => {
     expect(result).toHaveLength(1);
     expect(result[0]).toMatchObject({ rank: 1, title: 'Result A' });
   });
+
+  it('waits for content via MutationObserver before extracting', async () => {
+    const cmd = getRegistry().get('xiaohongshu/search');
+    expect(cmd?.func).toBeTypeOf('function');
+
+    const page = createPageMock([
+      // First evaluate: MutationObserver wait (content appeared)
+      'content',
+      // Second evaluate: extraction (returns empty array)
+      [],
+    ]);
+
+    const result = (await cmd!.func!(page, { query: '测试等待', limit: 5 })) as any[];
+    expect(result).toHaveLength(0);
+    // Only one navigation, no retry
+    expect(page.goto).toHaveBeenCalledTimes(1);
+    // Two evaluate calls: wait + extraction
+    expect(page.evaluate).toHaveBeenCalledTimes(2);
+  });
 });
 
 describe('noteIdToDate (ObjectID timestamp parsing)', () => {

package/src/clis/xiaohongshu/search.ts

@@ -9,6 +9,29 @@
 import { cli, Strategy } from '../../registry.js';
 import { AuthRequiredError } from '../../errors.js';
 
+/**
+ * Wait for search results or login wall using MutationObserver (max 5s).
+ * Returns 'content' if note items appeared, 'login_wall' if login gate
+ * detected, or 'timeout' if neither appeared within the deadline.
+ */
+const WAIT_FOR_CONTENT_JS = `
+  new Promise((resolve) => {
+    const detect = () => {
+      if (document.querySelector('section.note-item')) return 'content';
+      if (/登录后查看搜索结果/.test(document.body?.innerText || '')) return 'login_wall';
+      return null;
+    };
+    const found = detect();
+    if (found) return resolve(found);
+    const observer = new MutationObserver(() => {
+      const result = detect();
+      if (result) { observer.disconnect(); resolve(result); }
+    });
+    observer.observe(document.body, { childList: true, subtree: true });
+    setTimeout(() => { observer.disconnect(); resolve('timeout'); }, 5000);
+  })
+`;
+
 /**
  * Extract approximate publish date from a Xiaohongshu note URL.
  * XHS note IDs follow MongoDB ObjectID format where the first 8 hex
@@ -42,15 +65,13 @@ cli({
     await page.goto(
       `https://www.xiaohongshu.com/search_result?keyword=${keyword}&source=web_search_result_notes`
     );
-    await page.wait(3);
 
-    // Early login-wall detection: XHS may show a login gate instead of
-    // results. Check *before* autoScroll to avoid crashing on a page
-    // that has no meaningful content to scroll through.
-    const loginCheck = await page.evaluate(`
-      (() => /登录后查看搜索结果/.test(document.body?.innerText || ''))()
-    `);
-    if (loginCheck) {
+    // Wait for search results to render (or login wall to appear).
+    // Uses MutationObserver to resolve as soon as content appears,
+    // instead of a fixed delay + blind retry.
+    const waitResult = await page.evaluate(WAIT_FOR_CONTENT_JS);
+
+    if (waitResult === 'login_wall') {
       throw new AuthRequiredError(
         'www.xiaohongshu.com',
         'Xiaohongshu search results are blocked behind a login wall',
@@ -62,8 +83,6 @@ cli({
 
     const payload = await page.evaluate(`
       (() => {
-        const loginWall = /登录后查看搜索结果/.test(document.body.innerText || '');
-
         const normalizeUrl = (href) => {
           if (!href) return '';
           if (href.startsWith('http://') || href.startsWith('https://')) return href;
@@ -107,20 +126,11 @@ cli({
           });
         });
 
-        return {
-          loginWall,
-          results,
-        };
+        return results;
       })()
     `);
 
-    if (!payload || typeof payload !== 'object') return [];
-
-    if ((payload as any).loginWall) {
-      throw new AuthRequiredError('www.xiaohongshu.com', 'Xiaohongshu search results are blocked behind a login wall');
-    }
-
-    const data: any[] = Array.isArray((payload as any).results) ? (payload as any).results : [];
+    const data: any[] = Array.isArray(payload) ? (payload as any[]) : [];
     return data
       .filter((item: any) => item.title)
       .slice(0, kwargs.limit)

package/src/clis/yuanbao/ask.test.ts

@@ -0,0 +1,156 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { IPage } from '../../types.js';
+import { AuthRequiredError, CommandExecutionError, TimeoutError } from '../../errors.js';
+import { __test__ } from './ask.js';
+import { askCommand } from './ask.js';
+
+describe('yuanbao ask helpers', () => {
+  describe('isOnYuanbao', () => {
+    const fakePage = (url: string | Error): IPage =>
+      ({ evaluate: () => url instanceof Error ? Promise.reject(url) : Promise.resolve(url) }) as unknown as IPage;
+
+    it('returns true for yuanbao.tencent.com URLs', async () => {
+      expect(await __test__.isOnYuanbao(fakePage('https://yuanbao.tencent.com/'))).toBe(true);
+      expect(await __test__.isOnYuanbao(fakePage('https://yuanbao.tencent.com/chat/abc'))).toBe(true);
+    });
+
+    it('returns false for non-yuanbao domains', async () => {
+      expect(await __test__.isOnYuanbao(fakePage('https://example.com/?next=yuanbao.tencent.com'))).toBe(false);
+      expect(await __test__.isOnYuanbao(fakePage('about:blank'))).toBe(false);
+    });
+
+    it('returns false when evaluate throws', async () => {
+      expect(await __test__.isOnYuanbao(fakePage(new Error('detached')))).toBe(false);
+    });
+  });
+
+  it('removes echoed prompt prefixes from transcript additions', () => {
+    expect(__test__.sanitizeYuanbaoResponseText('你好\n你好，我是元宝。', '你好')).toBe('你好，我是元宝。');
+  });
+
+  it('filters transient in-progress assistant placeholders', () => {
+    expect(__test__.sanitizeYuanbaoResponseText('正在搜索资料', '张雪机车相关的股票有哪些？')).toBe('');
+  });
+
+  it('normalizes boolean flags with explicit defaults', () => {
+    expect(__test__.normalizeBooleanFlag(undefined, true)).toBe(true);
+    expect(__test__.normalizeBooleanFlag(undefined, false)).toBe(false);
+    expect(__test__.normalizeBooleanFlag('true', false)).toBe(true);
+    expect(__test__.normalizeBooleanFlag('1', false)).toBe(true);
+    expect(__test__.normalizeBooleanFlag('yes', false)).toBe(true);
+    expect(__test__.normalizeBooleanFlag('false', true)).toBe(false);
+  });
+
+  it('ignores baseline lines and echoed prompts when collecting additions', () => {
+    const response = __test__.collectYuanbaoTranscriptAdditions(
+      ['旧消息'],
+      ['旧消息', '你好', '你好\n你好，我是元宝。'],
+      '你好',
+    );
+
+    expect(response).toBe('你好，我是元宝。');
+  });
+
+  it('prefers fresh assistant messages over echoed prompts and older messages', () => {
+    const response = __test__.pickLatestYuanbaoAssistantCandidate(
+      ['旧回复', '你好', '你好！我是元宝，由腾讯推出的AI助手。'],
+      1,
+      '你好',
+    );
+
+    expect(response).toBe('你好！我是元宝，由腾讯推出的AI助手。');
+  });
+
+  it('converts assistant html tables to markdown tables via turndown', () => {
+    const markdown = __test__.convertYuanbaoHtmlToMarkdown(`
+      <h3>核心产业链概念股一览</h3>
+      <table>
+        <thead>
+          <tr><th>细分赛道</th><th>核心标的</th></tr>
+        </thead>
+        <tbody>
+          <tr><td>光模块</td><td>中际旭创</td></tr>
+        </tbody>
+      </table>
+    `);
+
+    expect(markdown).toContain('### 核心产业链概念股一览');
+    expect(markdown).toContain('| 细分赛道 | 核心标的 |');
+    expect(markdown).toContain('| --- | --- |');
+    expect(markdown).toContain('| 光模块 | 中际旭创 |');
+  });
+
+  it('tracks stabilization by incrementing repeats and resetting on changes', () => {
+    expect(__test__.updateStableState('', 0, '第一段')).toEqual({
+      previousText: '第一段',
+      stableCount: 0,
+    });
+
+    expect(__test__.updateStableState('第一段', 0, '第一段')).toEqual({
+      previousText: '第一段',
+      stableCount: 1,
+    });
+
+    expect(__test__.updateStableState('第一段', 1, '第二段')).toEqual({
+      previousText: '第二段',
+      stableCount: 0,
+    });
+  });
+});
+
+function createAskPageMock(overrides: {
+  currentUrl?: string;
+  hasLoginGate?: boolean;
+  sendResult?: { ok?: boolean; reason?: string; detail?: string; action?: string };
+} = {}): IPage {
+  const currentUrl = overrides.currentUrl ?? 'https://yuanbao.tencent.com/';
+  const hasLoginGate = overrides.hasLoginGate ?? false;
+  const sendResult = overrides.sendResult;
+
+  return {
+    goto: vi.fn().mockResolvedValue(undefined),
+    wait: vi.fn().mockResolvedValue(undefined),
+    evaluate: vi.fn().mockImplementation(async (script: string) => {
+      if (script === 'window.location.href') return currentUrl;
+      if (script.includes('微信扫码登录')) return hasLoginGate;
+      if (script.includes('[dt-button-id="internet_search"]')) return { found: false, enabled: false };
+      if (script.includes('[dt-button-id="deep_think"]')) return { found: false, enabled: false };
+      if (script.includes('.agent-chat__list__item--ai')) return [];
+      if (script.includes('const stopLines = new Set([')) return [];
+      if (script.includes('Failed to insert the prompt into the Yuanbao composer.')) {
+        return sendResult ?? { ok: true, action: 'click' };
+      }
+      throw new Error(`Unexpected evaluate script in test: ${script.slice(0, 80)}`);
+    }),
+  } as unknown as IPage;
+}
+
+describe('yuanbao ask command', () => {
+  it('throws AuthRequiredError when Yuanbao shows a login gate before sending', async () => {
+    const page = createAskPageMock({ hasLoginGate: true });
+
+    await expect(askCommand.func!(page, { prompt: '你好', timeout: '60', search: true, think: false }))
+      .rejects.toBeInstanceOf(AuthRequiredError);
+  });
+
+  it('throws CommandExecutionError when the prompt cannot be sent', async () => {
+    const page = createAskPageMock({
+      sendResult: {
+        ok: false,
+        reason: 'Yuanbao composer was not found.',
+      },
+    });
+
+    await expect(askCommand.func!(page, { prompt: '你好', timeout: '60', search: true, think: false }))
+      .rejects.toBeInstanceOf(CommandExecutionError);
+  });
+
+  it('throws TimeoutError when no response arrives before timeout', async () => {
+    const page = createAskPageMock({
+      sendResult: { ok: true, action: 'click' },
+    });
+
+    await expect(askCommand.func!(page, { prompt: '你好', timeout: '-1', search: true, think: false }))
+      .rejects.toBeInstanceOf(TimeoutError);
+  });
+});