@jackwener/opencli 1.7.2 → 1.7.4

package/clis/mubu/recent.js

@@ -0,0 +1,27 @@
+import { cli, Strategy } from '@jackwener/opencli/registry';
+import { formatDate, mubuPost } from './utils.js';
+
+cli({
+  site: 'mubu',
+  name: 'recent',
+  description: '最近编辑的幕布文档',
+  domain: 'mubu.com',
+  strategy: Strategy.COOKIE,
+  args: [
+    { name: 'limit', type: 'int', default: 20, help: '最多显示条数' },
+  ],
+  columns: ['id', 'name', 'updated'],
+  func: async (page, kwargs) => {
+    const limit = kwargs.limit;
+
+    await page.goto('https://mubu.com/app');
+
+    const data = await mubuPost(page, '/list/get', { folderId: 'recent' });
+
+    return (data.documents ?? []).slice(0, limit).map((doc) => ({
+      id: doc.id,
+      name: doc.name,
+      updated: formatDate(doc.updateTime),
+    }));
+  },
+});

package/clis/mubu/search.js

@@ -0,0 +1,62 @@
+import { cli, Strategy } from '@jackwener/opencli/registry';
+import { mubuPost, htmlToText } from './utils.js';
+
+cli({
+  site: 'mubu',
+  name: 'search',
+  description: '全局搜索幕布文档和文件夹（标题+内容，服务端全量匹配）。结果含 type/id/name/path/hits/snippet 字段。',
+  domain: 'mubu.com',
+  strategy: Strategy.COOKIE,
+  args: [
+    { name: 'query', positional: true, required: true, help: '搜索关键词' },
+    { name: 'limit', type: 'int', default: 100, help: '最多显示条数（默认 100，结果被截断时用 --limit N 调大）' },
+  ],
+  columns: ['type', 'id', 'name', 'path', 'hits', 'snippet'],
+  func: async (page, kwargs) => {
+    const query = kwargs.query;
+    const limit = kwargs.limit ?? 100;
+
+    await page.goto('https://mubu.com/app');
+
+    const data = await mubuPost(page, '/list/search', { keywords: query });
+
+    const formatPath = (paths) => paths.map((p) => p.name).join(' > ');
+
+    const folders = (data.folders ?? []).map((f) => ({
+      type: 'folder',
+      id: f.id,
+      name: f.name,
+      path: formatPath(f.paths),
+      hits: '',
+      snippet: '',
+    }));
+
+    const docs = (data.documents ?? []).map((d) => ({
+      type: 'doc',
+      id: d.id,
+      name: d.name,
+      path: formatPath(d.paths),
+      hits: d.total > 0 ? String(d.total) : '',
+      snippet: d.nodes
+        .map((n) => htmlToText(n.text))
+        .filter(Boolean)
+        .join(' | '),
+    }));
+
+    const all = [...folders, ...docs];
+    const result = all.slice(0, limit);
+
+    if (all.length > limit) {
+      result.push({
+        type: '...',
+        id: '',
+        name: `还有 ${all.length - limit} 条未显示，用 --limit ${all.length} 查看全部`,
+        path: '',
+        hits: '',
+        snippet: '',
+      });
+    }
+
+    return result;
+  },
+});

package/clis/mubu/utils.js

@@ -0,0 +1,304 @@
+import { AuthRequiredError, CommandExecutionError } from '@jackwener/opencli/errors';
+
+export const API_BASE = 'https://api2.mubu.com/v3/api';
+const MUBU_DOMAIN = 'mubu.com';
+const AUTH_HINT = 'Mubu requires a logged-in browser session at mubu.com';
+
+function isAuthFailure(code, message) {
+  if (code === 401 || code === 403) return true;
+  if (!message) return false;
+  return /not logged in|login required|unauthorized|未登录|请先登录|需要登录|login expired/i.test(message);
+}
+
+/**
+ * 在浏览器页面上下文里用 XHR 发 POST 请求（参考 zsxq 适配器模式）。
+ * mubu app 自身也是这个机制：从 localStorage 读 Jwt-Token，通过同名 header 发到 api2.mubu.com。
+ * 不经过 Node.js 进程发网络请求，避免 CORS 问题和 extension fetch 拦截。
+ */
+export async function mubuPost(page, path, body) {
+  const url = `${API_BASE}${path}`;
+
+  const result = await page.evaluate(`
+    (async () => {
+      const token = localStorage.getItem('Jwt-Token');
+      if (!token) return { ok: false, status: 0, data: null, error: 'no token' };
+      return await new Promise((resolve) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('POST', ${JSON.stringify(url)}, true);
+        xhr.setRequestHeader('Content-Type', 'application/json');
+        xhr.setRequestHeader('Jwt-Token', token);
+        xhr.onload = () => {
+          let data = null;
+          try { data = JSON.parse(xhr.responseText); } catch {}
+          resolve({ ok: xhr.status >= 200 && xhr.status < 300, status: xhr.status, data });
+        };
+        xhr.onerror = () => resolve({ ok: false, status: 0, data: null, error: 'network error' });
+        xhr.send(${JSON.stringify(JSON.stringify(body))});
+      });
+    })()
+  `);
+
+  if (!result || result.error === 'no token') {
+    throw new AuthRequiredError(MUBU_DOMAIN, AUTH_HINT);
+  }
+  if (!result.ok || !result.data) {
+    throw new CommandExecutionError(`mubu: ${path}: HTTP ${result.status} ${result.error ?? ''}`);
+  }
+
+  const { data } = result;
+  if (data.code !== 0) {
+    if (isAuthFailure(data.code, data.message)) {
+      throw new AuthRequiredError(MUBU_DOMAIN, AUTH_HINT);
+    }
+    throw new CommandExecutionError(`mubu: ${path}: code=${data.code} ${data.message ?? ''}`);
+  }
+
+  return data.data;
+}
+
+export function formatDate(ts) {
+  if (!ts) return '';
+  const d = new Date(ts);
+  const pad = (n) => String(n).padStart(2, '0');
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+
+const NAMED_ENTITIES = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: ' ' };
+
+function decodeHtmlEntities(s) {
+  return s
+    .replace(/&#x([0-9a-f]+);/gi, (_, h) => String.fromCodePoint(parseInt(h, 16)))
+    .replace(/&#(\d+);/g, (_, n) => String.fromCodePoint(parseInt(n, 10)))
+    .replace(/&(amp|lt|gt|quot|apos|nbsp);/g, (_, n) => NAMED_ENTITIES[n]);
+}
+
+/** 解析幕布 HTML 表格为行列二维数组（保留内部 HTML） */
+function parseTableRows(tableHtml) {
+  const rows = [];
+  const rowMatches = tableHtml.match(/<tr[^>]*>[\s\S]*?<\/tr>/gi) ?? [];
+  for (const row of rowMatches) {
+    const cells = [];
+    const cellMatches = row.match(/<(?:td|th)[^>]*>[\s\S]*?<\/(?:td|th)>/gi) ?? [];
+    for (const cell of cellMatches) {
+      // 只剥离最外层的 <td> 或 <th>，保留内部的加粗、链接和 <br>
+      let innerHtml = cell.replace(/^<(?:td|th)[^>]*>|<\/(?:td|th)>$/gi, '');
+      cells.push(innerHtml.trim());
+    }
+    rows.push(cells);
+  }
+  return rows;
+}
+
+/** 将幕布 HTML text 转为纯文本 */
+export function htmlToText(html) {
+  let text = html;
+  // 表格 → 纯文本（tab 分隔）；用 </table>\s*</div> 作结束锚，跳过 th/td 内部嵌套 div
+  text = text.replace(/<div class="table-container">[\s\S]*?<\/table>\s*<\/div>/g, (m) => {
+    return parseTableRows(m).map((r) => r.map(c => {
+      // 纯文本环境：<br> 换空格，清空所有标签
+      let plainCell = c.replace(/<br\s*\/?>/gi, ' ').replace(/<[^>]+>/g, '');
+      return decodeHtmlEntities(plainCell).trim();
+    }).join('\t')).join('\n');
+  });
+  text = text
+    .replace(/<br\s*\/?>/gi, '\n')
+    .replace(/<[^>]+>/g, '');
+  return decodeHtmlEntities(text).trim();
+}
+
+/** 将幕布 HTML 表格转为 Markdown 表格 */
+function tableToMarkdown(tableHtml) {
+  const rows = parseTableRows(tableHtml);
+  if (rows.length === 0) return '';
+  
+  const processRow = (row) => row.map(cellHtml => {
+    // 把表格内的 <br> 换成占位符，防止稍后被全局替换为 \n 导致表格断裂
+    return cellHtml.replace(/<br\s*\/?>/gi, '[[BR]]');
+  }).join(' | ');
+
+  const lines = [`| ${processRow(rows[0])} |`, `| ${rows[0].map(() => '---').join(' | ')} |`];
+  for (let i = 1; i < rows.length; i++) {
+    lines.push(`| ${processRow(rows[i])} |`);
+  }
+  return lines.join('\n');
+}
+
+/** 将幕布 HTML text 转为 Markdown inline 标记 */
+export function htmlToMarkdown(html) {
+  let md = html;
+  
+  // 1. 表格 → Markdown 表格
+  md = md.replace(/<div class="table-container">[\s\S]*?<\/table>\s*<\/div>/g, (m) => tableToMarkdown(m));
+  
+  // 2. <br> → 换行
+  md = md.replace(/<br\s*\/?>/gi, '\n');
+  
+  // 3. 统一处理样式标签，支持多 class 组合
+  md = md.replace(/<span class="([^"]+)"[^>]*>([\s\S]*?)<\/span>/gi, (match, classes, inner) => {
+    // 允许正常处理超链接内部的 bold 和 italic 样式
+    if (classes.includes('node-mention')) {
+      return match;
+    }
+    let res = inner;
+    if (/\bbold\b/.test(classes)) res = `**${res}**`;
+    if (/\bitalic\b/.test(classes)) res = `*${res}*`;
+    if (/\bstrikethrough\b/.test(classes)) res = `~~${res}~~`;
+    if (/\bunderline\b/.test(classes)) res = `\uFFFEU_OPEN\uFFFE${res}\uFFFEU_CLOSE\uFFFE`;
+    return res;
+  });
+
+  // 4. node-mention（主题链接 → Markdown 链接，支持组合 class 并继承自身样式）
+  md = md.replace(
+    /<span([^>]*\bclass="[^"]*\bnode-mention\b[^"]*"[^>]*)>([\s\S]*?)<\/span>/gi,
+    (match, attrs, inner) => {
+      const docMatch = attrs.match(/\bdata-doc="([^"]+)"/i);
+      const docId = docMatch ? docMatch[1] : '';
+      if (!docId) return match;
+      
+      const classMatch = attrs.match(/\bclass="([^"]+)"/i);
+      const classes = classMatch ? classMatch[1] : '';
+      
+      let res = inner.replace(/<[^>]+>/g, '').trim();
+      
+      // 继承标签自身的样式
+      if (/\bbold\b/.test(classes)) res = `**${res}**`;
+      if (/\bitalic\b/.test(classes)) res = `*${res}*`;
+      if (/\bstrikethrough\b/.test(classes)) res = `~~${res}~~`;
+      if (/\bunderline\b/.test(classes)) res = `\uFFFEU_OPEN\uFFFE${res}\uFFFEU_CLOSE\uFFFE`;
+      
+      return `[${res}](https://mubu.com/app/edit/${docId})`;
+    }
+  );
+  
+  // 5. links （外部链接 → Markdown 链接，继承 a 标签自身样式）
+  md = md.replace(/<a([^>]*)>([\s\S]*?)<\/a>/gi, (match, attrs, inner) => {
+    const hrefMatch = attrs.match(/\bhref="([^"]+)"/i);
+    if (!hrefMatch) return match;
+    const href = hrefMatch[1];
+    
+    const classMatch = attrs.match(/\bclass="([^"]+)"/i);
+    const classes = classMatch ? classMatch[1] : '';
+    
+    let res = inner;
+    
+    // 继承 a 标签自身的样式
+    if (/\bbold\b/.test(classes)) res = `**${res}**`;
+    if (/\bitalic\b/.test(classes)) res = `*${res}*`;
+    if (/\bstrikethrough\b/.test(classes)) res = `~~${res}~~`;
+    if (/\bunderline\b/.test(classes)) res = `\uFFFEU_OPEN\uFFFE${res}\uFFFEU_CLOSE\uFFFE`;
+    
+    return `[${res}](${href})`;
+  });
+  
+  // 6. 普通 span
+  md = md.replace(/<span[^>]*>([\s\S]*?)<\/span>/gi, '$1');
+  
+  // 7. 清理其余标签
+  md = md.replace(/<[^>]+>/g, '');
+  
+  // 8. HTML 实体解码
+  md = decodeHtmlEntities(md);
+  
+  // 9. 还原 underline 占位符
+  md = md.replace(/\uFFFEU_OPEN\uFFFE/g, '<u>').replace(/\uFFFEU_CLOSE\uFFFE/g, '</u>');
+  
+  // 10. 还原表格内的换行符
+  md = md.replace(/\[\[BR\]\]/g, '<br>');
+
+  return md.trim();
+}
+
+const IMAGE_BASE = 'https://api2.mubu.com/v3';
+
+function imageUrl(uri) {
+  return uri.startsWith('http') ? uri : `${IMAGE_BASE}/${uri}`;
+}
+
+function taskPrefix(node) {
+  if (!node.taskStatus) return '';
+  return node.taskStatus === 2 ? '[x] ' : '[ ] ';
+}
+
+function taskMeta(node) {
+  const parts = [];
+  if (node.deadline) {
+    const ts = formatDate(node.deadline * 1000);
+    parts.push(`📅 ${node.deadlineType === 'date' ? ts.slice(0, 10) : ts}`);
+  }
+  if (node.remindAt) parts.push(`⏰ ${formatDate(node.remindAt * 1000)}`);
+  return parts.length ? ' ' + parts.join(' ') : '';
+}
+
+/** 递归将节点树渲染为缩进纯文本 */
+export function nodesToText(nodes, depth = 0) {
+  const lines = [];
+  for (const node of nodes) {
+    const indent = '  '.repeat(depth);
+    const emoji = node.emoji ? node.emoji + ' ' : '';
+    const text = htmlToText(node.text);
+    const prefix = taskPrefix(node);
+    const meta = taskMeta(node);
+    if (text || emoji || prefix) {
+      if (text.includes('\n')) {
+        const [first, ...rest] = text.split('\n');
+        lines.push(indent + prefix + emoji + first);
+        for (const line of rest) lines.push(indent + '  ' + line);
+        if (meta) lines.push(indent + '  ' + meta.trim());
+      } else {
+        lines.push(indent + prefix + emoji + text + meta);
+      }
+    }
+    if (node.note) {
+      const noteText = htmlToText(node.note);
+      for (const line of noteText.split('\n')) lines.push(indent + '  ' + line);
+    }
+    if (node.images?.length) {
+      for (const img of node.images) {
+        lines.push(indent + `[图片: ${imageUrl(img.uri)}]`);
+      }
+    }
+    if (node.children?.length) {
+      lines.push(nodesToText(node.children, depth + 1));
+    }
+  }
+  return lines.filter(Boolean).join('\n');
+}
+
+/** 递归将节点树渲染为 Markdown（大纲 = 缩进列表，不映射为标题） */
+export function nodesToMarkdown(nodes, depth = 0) {
+  const lines = [];
+  for (const node of nodes) {
+    const text = htmlToMarkdown(node.text);
+    if (!text && !node.images?.length && !node.note && !node.emoji) continue;
+
+    const indent = '  '.repeat(depth);
+    const emoji = node.emoji ? node.emoji + ' ' : '';
+    const prefix = taskPrefix(node);
+    const meta = taskMeta(node);
+    if (text || emoji || prefix) {
+      if (text.includes('\n')) {
+        const [first, ...rest] = text.split('\n');
+        lines.push(indent + '- ' + prefix + emoji + first);
+        const continuation = indent + '  ';
+        for (const line of rest) lines.push(continuation + line);
+        if (meta) lines.push(continuation + meta.trim());
+      } else {
+        lines.push(indent + '- ' + prefix + emoji + text + meta);
+      }
+    }
+    if (node.note) {
+      const noteLines = htmlToMarkdown(node.note).split('\n');
+      for (const line of noteLines) lines.push(indent + '  > ' + line);
+    }
+    if (node.images?.length) {
+      for (const img of node.images) {
+        lines.push(indent + `  ![image](${imageUrl(img.uri)})`);
+      }
+    }
+
+    if (node.children?.length) {
+      lines.push(nodesToMarkdown(node.children, depth + 1));
+    }
+  }
+  return lines.filter(Boolean).join('\n');
+}

package/clis/reuters/search.js

@@ -21,7 +21,7 @@ cli({
       (async () => {
         const count = ${count};
         const apiQuery = JSON.stringify({
-          keyword: '${kwargs.query.replace(/'/g, "\\'")}',
+          keyword: ${JSON.stringify(kwargs.query)},
           offset: 0, orderby: 'display_date:desc', size: count, website: 'reuters'
         });
         const apiUrl = 'https://www.reuters.com/pf/api/v3/content/fetch/articles-by-search-v2?query=' + encodeURIComponent(apiQuery);

package/clis/tdx/hot-rank.js

@@ -0,0 +1,47 @@
+import { cli, Strategy } from '@jackwener/opencli/registry';
+
+const TDX_HOT_URL = 'https://pul.tdx.com.cn/site/app/gzhbd/tdx-topsearch/page-main.html?pageName=page_topsearch&tabClickIndex=0&subtabIndex=0';
+
+cli({
+  site: 'tdx',
+  name: 'hot-rank',
+  description: '通达信热搜榜',
+  domain: 'pul.tdx.com.cn',
+  strategy: Strategy.COOKIE,
+  navigateBefore: true,
+  args: [
+    { name: 'limit', type: 'int', default: 20, help: '返回数量' },
+  ],
+  columns: ['rank', 'symbol', 'name', 'changePercent', 'heat', 'tags'],
+  func: async (page, kwargs) => {
+    await page.goto(TDX_HOT_URL);
+    await page.wait({ timeout: 15000 });
+    const data = await page.evaluate(`
+      (() => {
+        const cleanText = (el) => (el?.textContent || '').replace(/\\s+/g, ' ').trim();
+        const cells = document.querySelectorAll('div.top-cell[data-code]');
+        const results = [];
+        const seen = new Set();
+        cells.forEach((cell, idx) => {
+          const symbol = cell.getAttribute('data-code') || '';
+          const name = cell.getAttribute('data-name') || '';
+          if (!symbol || !name || seen.has(symbol)) return;
+          seen.add(symbol);
+          const tagEls = cell.querySelectorAll('div.tips-item.gnbk');
+          const tags = Array.from(tagEls).map(t => cleanText(t)).filter(Boolean).join(',');
+          results.push({
+            rank: idx + 1,
+            symbol,
+            name,
+            changePercent: cleanText(cell.querySelector('div.top-zf')),
+            heat: cleanText(cell.querySelector('div.hotN')),
+            tags,
+          });
+        });
+        return results;
+      })()
+    `);
+    if (!Array.isArray(data)) return [];
+    return data.slice(0, kwargs.limit);
+  },
+});

package/clis/tdx/hot-rank.test.js

@@ -0,0 +1,59 @@
+import { describe, expect, it, vi } from 'vitest';
+import { getRegistry } from '@jackwener/opencli/registry';
+import './hot-rank.js';
+
+describe('tdx hot-rank command', () => {
+  it('registers the command with correct metadata', () => {
+    const command = getRegistry().get('tdx/hot-rank');
+    expect(command).toBeDefined();
+    expect(command).toMatchObject({
+      site: 'tdx',
+      name: 'hot-rank',
+      description: expect.stringContaining('通达信'),
+      domain: 'pul.tdx.com.cn',
+      navigateBefore: true,
+    });
+    expect(command.columns).toEqual(['rank', 'symbol', 'name', 'changePercent', 'heat', 'tags']);
+  });
+
+  it('returns hot stock data from the page', async () => {
+    const command = getRegistry().get('tdx/hot-rank');
+    const mockData = [
+      { rank: 1, symbol: '600519', name: '贵州茅台', changePercent: '+2.35%', heat: '1285', tags: '白酒', },
+      { rank: 2, symbol: '000001', name: '平安银行', changePercent: '-0.80%', heat: '856', tags: '银行', },
+    ];
+    const page = {
+      goto: vi.fn().mockResolvedValue(undefined),
+      wait: vi.fn().mockResolvedValue(undefined),
+      evaluate: vi.fn().mockResolvedValue(mockData),
+    };
+    const result = await command.func(page, { limit: 20 });
+    expect(result).toHaveLength(2);
+    expect(result[0]).toEqual(mockData[0]);
+  });
+
+  it('respects the limit parameter', async () => {
+    const command = getRegistry().get('tdx/hot-rank');
+    const mockData = Array.from({ length: 30 }, (_, i) => ({
+      rank: i + 1, symbol: `${i}`, name: `stock${i}`, changePercent: '0%', heat: '0', tags: '',
+    }));
+    const page = {
+      goto: vi.fn().mockResolvedValue(undefined),
+      wait: vi.fn().mockResolvedValue(undefined),
+      evaluate: vi.fn().mockResolvedValue(mockData),
+    };
+    const result = await command.func(page, { limit: 10 });
+    expect(result).toHaveLength(10);
+  });
+
+  it('returns empty array when evaluate returns non-array', async () => {
+    const command = getRegistry().get('tdx/hot-rank');
+    const page = {
+      goto: vi.fn().mockResolvedValue(undefined),
+      wait: vi.fn().mockResolvedValue(undefined),
+      evaluate: vi.fn().mockResolvedValue(null),
+    };
+    const result = await command.func(page, { limit: 20 });
+    expect(result).toEqual([]);
+  });
+});

package/clis/ths/hot-rank.js

@@ -0,0 +1,49 @@
+import { cli, Strategy } from '@jackwener/opencli/registry';
+
+const THS_HOT_URL = 'https://eq.10jqka.com.cn/webpage/ths-hot-list/index.html?showStatusBar=true';
+
+cli({
+  site: 'ths',
+  name: 'hot-rank',
+  description: '同花顺热股榜',
+  domain: 'eq.10jqka.com.cn',
+  strategy: Strategy.COOKIE,
+  navigateBefore: true,
+  args: [
+    { name: 'limit', type: 'int', default: 20, help: '返回数量' },
+  ],
+  columns: ['rank', 'name', 'changePercent', 'heat', 'tags'],
+  func: async (page, kwargs) => {
+    await page.goto(THS_HOT_URL);
+    await page.wait({ timeout: 15000 });
+    const data = await page.evaluate(`
+      (() => {
+        const cleanText = (el) => (el?.textContent || '').replace(/\\s+/g, ' ').trim();
+        const cards = document.querySelectorAll('div.pt-22.pb-24.bgc-white.border');
+        const results = [];
+        const seen = new Set();
+        cards.forEach((card, idx) => {
+          const row = card.querySelector('div.flex.bgc-white');
+          if (!row) return;
+          const nameEl = row.querySelector('span.ellipsis');
+          const name = cleanText(nameEl);
+          if (!name || seen.has(name)) return;
+          seen.add(name);
+          const tagEls = card.querySelectorAll('div.tag.PFSC-R');
+          const tags = Array.from(tagEls).map(t => cleanText(t)).filter(Boolean).join(',');
+          const rankEl = row.querySelector('div.THSMF-M.bold');
+          results.push({
+            rank: cleanText(rankEl) || String(idx + 1),
+            name,
+            changePercent: cleanText(row.querySelector('div.range')),
+            heat: cleanText(row.querySelector('div.col4 > span')),
+            tags,
+          });
+        });
+        return results;
+      })()
+    `);
+    if (!Array.isArray(data)) return [];
+    return data.slice(0, kwargs.limit);
+  },
+});

package/clis/ths/hot-rank.test.js

@@ -0,0 +1,64 @@
+import { describe, expect, it, vi } from 'vitest';
+import { getRegistry } from '@jackwener/opencli/registry';
+import './hot-rank.js';
+
+describe('ths hot-rank command', () => {
+  it('registers the command with correct metadata', () => {
+    const command = getRegistry().get('ths/hot-rank');
+    expect(command).toBeDefined();
+    expect(command).toMatchObject({
+      site: 'ths',
+      name: 'hot-rank',
+      description: expect.stringContaining('同花顺'),
+      domain: 'eq.10jqka.com.cn',
+      navigateBefore: true,
+    });
+    expect(command.columns).toEqual(['rank', 'name', 'changePercent', 'heat', 'tags']);
+  });
+
+  it('includes tags column', () => {
+    const command = getRegistry().get('ths/hot-rank');
+    expect(command.columns).toContain('tags');
+  });
+
+  it('returns hot stock data with tags field', async () => {
+    const command = getRegistry().get('ths/hot-rank');
+    const mockData = [
+      { rank: 1, name: '圣阳股份', changePercent: '+10.00%', heat: '28.5万', tags: '动力电池回收,钠离子电池' },
+    ];
+    const page = {
+      goto: vi.fn().mockResolvedValue(undefined),
+      wait: vi.fn().mockResolvedValue(undefined),
+      evaluate: vi.fn().mockResolvedValue(mockData),
+    };
+    const result = await command.func(page, { limit: 20 });
+    expect(result).toHaveLength(1);
+    expect(result[0].tags).toBe('动力电池回收,钠离子电池');
+    expect(result[0].name).toBe('圣阳股份');
+  });
+
+  it('respects the limit parameter', async () => {
+    const command = getRegistry().get('ths/hot-rank');
+    const mockData = Array.from({ length: 30 }, (_, i) => ({
+      rank: i + 1, name: `stock${i}`, changePercent: '0%', heat: '0', tags: '',
+    }));
+    const page = {
+      goto: vi.fn().mockResolvedValue(undefined),
+      wait: vi.fn().mockResolvedValue(undefined),
+      evaluate: vi.fn().mockResolvedValue(mockData),
+    };
+    const result = await command.func(page, { limit: 10 });
+    expect(result).toHaveLength(10);
+  });
+
+  it('returns empty array when evaluate returns non-array', async () => {
+    const command = getRegistry().get('ths/hot-rank');
+    const page = {
+      goto: vi.fn().mockResolvedValue(undefined),
+      wait: vi.fn().mockResolvedValue(undefined),
+      evaluate: vi.fn().mockResolvedValue(null),
+    };
+    const result = await command.func(page, { limit: 20 });
+    expect(result).toEqual([]);
+  });
+});

package/clis/twitter/bookmarks.js

@@ -60,6 +60,7 @@ function extractBookmarkTweet(result, seen) {
         text: noteText || legacy.full_text || '',
         likes: legacy.favorite_count || 0,
         retweets: legacy.retweet_count || 0,
+        bookmarks: legacy.bookmark_count || 0,
         created_at: legacy.created_at || '',
         url: `https://x.com/${screenName}/status/${tw.rest_id}`,
     };
@@ -106,7 +107,7 @@ cli({
     args: [
         { name: 'limit', type: 'int', default: 20 },
     ],
-    columns: ['author', 'text', 'likes', 'url'],
+    columns: ['author', 'text', 'likes', 'retweets', 'bookmarks', 'url'],
     func: async (page, kwargs) => {
         const limit = kwargs.limit || 20;
         await page.goto('https://x.com');