@cloud411716/fancy-webnovel 0.2.28 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud411716/fancy-webnovel",
-  "version": "0.2.28",
+  "version": "0.3.1",
   "type": "module",
   "main": "index.js",
   "exports": {

package/plugins/fancy-scan/index.js

@@ -5,122 +5,133 @@ import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
 import { notify, llmFollowup, spawnScript, startActivity } from '../../infra.js';
-import { scan, PLATFORM_TABLE, platformLabel } from './templates.js';
+import { scan, PLATFORM_TABLE, rankOptions } from './templates.js';
 
 export const inject = ['commands', 'userQuestions'];
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const SCAN_SCRIPTS_DIR = join(__dirname, 'scripts');
+const SCRAPER_TIMEOUT = 30 * 60 * 1000; // 30 分钟
 
 export async function apply(ctx) {
   ctx.commands.register({
     name: 'fancy-scan',
-    description: '📊 扫榜分析 ( usage: /fancy-scan [平台] [篇幅] )',
+    description: '📊 扫榜分析 ( usage: /fancy-scan )',
     handler: async (invocation) => {
       const session = invocation.agent.session;
-      const rawInput = invocation.rawInput ? invocation.rawInput.trim() : '';
 
       // 获取项目根
-      let projectRoot = rawInput ? rawInput.split(/\s+/)[0] : '';
-      if (!projectRoot) projectRoot = process.cwd();
-
+      const projectRoot = process.cwd();
       if (!existsSync(join(projectRoot, '.fancy-deployed'))) {
         notify(session, scan.notify({ type: 'not_initialized' }));
         return { kind: 'success', text: '' };
       }
 
-      // 解析参数
-      let platform = '', length = '';
-      if (rawInput) {
-        const parts = rawInput.split(/\s+/);
-        platform = parts[0] || '';
-        length = parts[1] || '';
-        const numMatch = platform.match(/^(\d+)$/);
-        if (numMatch) {
-          const row = PLATFORM_TABLE.find(r => r[0] === numMatch[1]);
-          if (row) {
-            platform = row[1];
-            if (platform === 'zhihu' || platform === 'qimao') {
-              length = parts[1] || 'long';
-            } else {
-              length = row[2] === '长篇' ? 'long' : (row[2] === '短篇' ? 'short' : 'long');
-            }
-          }
-        }
+      // ---------- 第一轮：选择平台 ----------
+      notify(session, scan.platformList());
+
+      const platformResult = await ctx.userQuestions.ask({
+        questions: [scan.askPlatform()],
+      });
+      const answer = platformResult.answers[0]?.custom?.trim();
+      if (!answer) {
+        notify(session, scan.notify({ type: 'cancelled' }));
+        return { kind: 'success', text: '' };
+      }
+      const numMatch = answer.match(/^(\d+)$/);
+      const row = numMatch ? PLATFORM_TABLE.find(r => r[0] === numMatch[1]) : null;
+      if (!row) {
+        notify(session, scan.notify({ type: 'invalid_choice' }));
+        return { kind: 'success', text: '' };
       }
+      const platform = row[1];
 
-      // 参数不全 → 弹窗选择
-      if (!platform || !length || !PLATFORM_TABLE.find(r => r[1] === platform)) {
-        notify(session, scan.platformList());
-
-        const choice = await ctx.userQuestions.ask({
-          questions: [scan.askPlatform()],
-        });
-        const answer = choice.answers[0]?.custom?.trim();
-        if (!answer) {
-          notify(session, scan.notify({ type: 'cancelled_with_hint' }));
-          return { kind: 'success', text: '' };
-        }
-        const numMatch = answer.match(/^(\d+)$/);
-        const row = numMatch ? PLATFORM_TABLE.find(r => r[0] === numMatch[1]) : null;
-        if (!row) {
-          notify(session, scan.notify({ type: 'invalid_choice' }));
-          return { kind: 'success', text: '' };
-        }
-        platform = row[1];
-        length = (platform === 'zhihu' || platform === 'qimao')
-          ? null
-          : (row[2] === '长篇' ? 'long' : 'short');
+      // ---------- 第二轮：选择榜单（多选） ----------
+      const rankResult = await ctx.userQuestions.ask({
+        questions: [scan.askRankList(platform)],
+      });
+      const selected = rankResult.answers[0]?.selected ?? [];
+      const custom = rankResult.answers[0]?.custom?.trim();
+
+      // 用户可能直接输入自定义值
+      const rawChoices = selected.length > 0 ? selected : (custom ? [custom] : []);
+      if (rawChoices.length === 0) {
+        notify(session, scan.notify({ type: 'cancelled' }));
+        return { kind: 'success', text: '' };
       }
 
-      // 知乎二次选择篇幅（保持原逻辑）
-      if (platform === 'zhihu') {
-        if (!length || !['long', 'short'].includes(length)) {
-          const lenResult = await ctx.userQuestions.ask({
-            questions: [scan.askLength(platform)],
-          });
-          const lenAnswer = lenResult.answers[0]?.selected?.[0] ?? lenResult.answers[0]?.custom;
-          if (!lenAnswer || lenAnswer === '取消') {
-            notify(session, scan.notify({ type: 'cancelled' }));
+      // 构建每个榜单的 channel+type 参数
+      const platformRanks = rankOptions(platform);
+      const isAll = rawChoices.includes('全选') || rawChoices.includes('__all__');
+      const rankIds = isAll
+        ? platformRanks.filter(r => r.id !== '__all__').map(r => r.id)
+        : rawChoices;
+
+      // 把 rankId 转换成 { channel, type } 并去重
+      const rankEntries = rankIds.map(id => parseRankId(platform, id));
+      const unique = [];
+      const seen = new Set();
+      for (const e of rankEntries) {
+        const key = `${e.channel}__${e.type}`;
+        if (!seen.has(key)) { seen.add(key); unique.push(e); }
+      }
+
+      // ---------- 串行采集 ----------
+      let allFiles = [];
+      let failed = 0;
+
+      for (const rank of unique) {
+        const stop = startActivity(session);
+        const r = await spawnScript(
+          'node',
+          [
+            join(SCAN_SCRIPTS_DIR, 'run-scan.js'),
+            '--project-root', projectRoot,
+            '--platform', platform,
+            '--channel', rank.channel,
+            '--type',     rank.type,
+          ],
+          { timeout: SCRAPER_TIMEOUT, stop }
+        );
+
+        if (!r.ok) {
+          const rawErr = (typeof r.error === 'object' && r.error !== null)
+            ? (r.error.message || JSON.stringify(r.error))
+            : String(r.error || '');
+          if (rawErr.includes("Executable doesn't exist") || rawErr.includes("doesn't exist")) {
+            notify(session,
+              '⚠️ 未找到 Chromium 浏览器。\n\n安装命令：\n' +
+              '  npm install -g playwright@1.48.0 --registry=https://registry.npmmirror.com\n' +
+              '  PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps\n\n' +
+              '安装完成后重新运行 /fancy-scan 即可。'
+            );
             return { kind: 'success', text: '' };
           }
-          length = (lenAnswer === '长篇') ? 'long' : 'short';
+          notify(session, scan.notify({ type: 'failed', err: rawErr }));
+          failed++;
+          continue;
         }
-      } else if (!length) {
-        length = 'long';
-      }
 
-      // 七猫二次选择（男/女频 × 大热/新书榜）
-      if (platform === 'qimao') {
-        const lenResult = await ctx.userQuestions.ask({
-          questions: [scan.askLength(platform)],
-        });
-        const lenAnswer = lenResult.answers[0]?.selected?.[0] ?? lenResult.answers[0]?.custom;
-        if (!lenAnswer || lenAnswer === '取消') {
-          notify(session, scan.notify({ type: 'cancelled' }));
-          return { kind: 'success', text: '' };
+        // 解析采集结果
+        let receipt;
+        try { receipt = JSON.parse(r.output); } catch (_) {
+          notify(session, scan.notify({ type: 'parse_error' }));
+          failed++;
+          continue;
+        }
+        const files = receipt.scan_files || [];
+        allFiles = allFiles.concat(files);
+
+        // 逐个文件追加到 topic_decision
+        const topicFile = receipt.topic_decision || '';
+        if (topicFile) {
+          notify(session, scan.notify({ type: 'handover', platform, files, topicFile, projectRoot }));
+          const prompt = scan.llmAnalysisPrompt({ platform, date: receipt.date || '', files, topicFile, projectRoot });
+          llmFollowup(invocation, prompt);
         }
-        // 把选项标签映射成 channel + type，存入 ctx.options 供 runScanWithChromiumFix 传递
-        const qimaoMap = {
-          '采集全部（男/女 × 大热/新书，4个榜单）': { channel: 'all', type: 'all' },
-          '男生大热榜': { channel: 'male', type: 'hot' },
-          '男生新书榜': { channel: 'male', type: 'new' },
-          '女生大热榜': { channel: 'female', type: 'hot' },
-          '女生新书榜': { channel: 'female', type: 'new' },
-        };
-        ctx._qimaoOverride = qimaoMap[lenAnswer] || { channel: 'all', type: 'all' };
       }
 
-      // 执行采集，包含 Chromium 缺失处理
-      const scanResult = await runScanWithChromiumFix(ctx, session, invocation, {
-        platform, length, projectRoot, qimaoOverride: ctx._qimaoOverride || null,
-      });
-
-      if (scanResult === 'retry') {
-        // Chromium 安装后重试已完成，runScanWithChromiumFix 已处理所有输出
-        return { kind: 'success', text: '' };
-      }
-      if (!scanResult) {
+      if (failed > 0 && allFiles.length === 0) {
         return { kind: 'success', text: '' };
       }
 
@@ -129,64 +140,31 @@ export async function apply(ctx) {
   });
 }
 
-/**
- * 执行采集，检测 Chromium 缺失则提示用户手动安装。
- * 返回 undefined 表示已处理完毕（取消/失败），返回 'retry' 表示重试完成。
- */
-async function runScanWithChromiumFix(ctx, session, invocation, { platform, length, projectRoot, qimaoOverride = null }) {
-  const runOnce = async (isRetry = false) => {
-    const stop = startActivity(session);
-    if (isRetry) notify(session, '⏳ 重新采集...\n');
-    const extraArgs = [];
-    if (platform === 'qimao' && qimaoOverride) {
-      extraArgs.push('--channel', qimaoOverride.channel, '--type', qimaoOverride.type);
+// ---------------------------------------------------------------------------
+// 将 rankId 转换成 { channel, type } 参数
+// ---------------------------------------------------------------------------
+
+function parseRankId(platform, id) {
+  switch (platform) {
+    case 'qimao': {
+      // id 格式: male_hot / female_new
+      const [ch, rt] = id.split('_');
+      return { channel: ch, type: rt };
     }
-    const r = await spawnScript(
-      'node',
-      [join(SCAN_SCRIPTS_DIR, 'run-scan.js'),
-       '--project-root', projectRoot, '--platform', platform, '--length', length,
-       ...extraArgs],
-      { timeout: 900000, stop }
-    );
-    return r;
-  };
-
-  const handleSuccess = (stdout) => {
-    let receipt;
-    try { receipt = JSON.parse(stdout); } catch (_) {
-      notify(session, scan.notify({ type: 'parse_error' }));
-      return;
+    case 'fanqie': {
+      // id 格式: 0_1 / 1_2 / __all__
+      const [ch, ty] = id.split('_');
+      return { channel: ch, type: ty };
     }
-    const files = receipt.scan_files || [];
-    const topicFile = receipt.topic_decision || '';
-    notify(session, scan.notify({ type: 'handover', platform, length, files, topicFile, projectRoot }));
-    const prompt = scan.llmAnalysisPrompt({ platform, length, date: receipt.date || '', files, topicFile, projectRoot });
-    llmFollowup(invocation, prompt);
-  };
-
-  const scriptResult = await runOnce();
-
-  if (!scriptResult.ok) {
-    const rawErr = (typeof scriptResult.error === 'object' && scriptResult.error !== null)
-      ? (scriptResult.error.message || JSON.stringify(scriptResult.error))
-      : String(scriptResult.error || '未知错误');
-
-    // Chromium 未找到 → 提示用户手动安装
-    if (rawErr.includes("Executable doesn't exist") || rawErr.includes('Executable doesn')) {
-      notify(session,
-        '⚠️ 未找到 Chromium 浏览器，请手动安装后再次运行 /fancy-scan。\n\n' +
-        '安装命令：\n' +
-        '  npm install -g playwright@1.48.0 --registry=https://registry.npmmirror.com\n' +
-        '  PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps\n\n' +
-        '安装完成后重新运行 /fancy-scan 即可。'
-      );
-      return undefined;
+    case 'jinjiang': {
+      // id 格式: 5 / 7 / 12 等（orderstr）
+      return { channel: 'all', type: id };
     }
-
-    notify(session, scan.notify({ type: 'failed', err: rawErr }));
-    return undefined;
+    case 'qidian': {
+      // 起点只有主站一个榜单
+      return { channel: 'main', type: 'main' };
+    }
+    default:
+      return { channel: 'all', type: 'all' };
   }
-
-  handleSuccess(scriptResult.output);
-  return 'retry';
 }

package/plugins/fancy-scan/scripts/run-scan.js

@@ -4,12 +4,14 @@
  *
  * 职责：
  * 1. 检查 .fancy-deployed
- * 2. 调用平台采集脚本
- * 3. 生成扫榜报告
- * 4. 生成/追加 topic_decision
+ * 2. 调用平台采集脚本（一次一个榜单）
+ * 3. 输出 JSON 摘要（供 index.js 解析）
  *
  * 调用方式：
- *   node run-scan.js --project-root <abs> --platform qidian --length long
+ *   node run-scan.js --project-root <abs> --platform qidian  --channel main --type main
+ *   node run-scan.js --project-root <abs> --platform fanqie  --channel 1 --type 2
+ *   node run-scan.js --project-root <abs> --platform jinjiang --channel all --type 5
+ *   node run-scan.js --project-root <abs> --platform qimao   --channel male --type hot
  */
 
 import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'fs';
@@ -17,25 +19,13 @@ import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 // ---------------------------------------------------------------------------
-// 平台配置
+// 平台中文名
 // ---------------------------------------------------------------------------
 
-const VALID_LENGTHS = ['long', 'short'];
-const VALID_PLATFORMS = ['qidian', 'fanqie', 'jinjiang', 'zhihu', 'qimao'];
-
-const PLATFORM_SUPPORTED_LENGTHS = {
-  qidian:   ['long'],
-  fanqie:   ['long'],
-  jinjiang: ['long'],
-  zhihu:    ['long', 'short'],
-  qimao:    ['long'],
-};
-
 const PLATFORM_CN = {
   qidian:   '起点',
   fanqie:   '番茄',
   jinjiang: '晋江',
-  zhihu:    '知乎',
   qimao:    '七猫',
 };
 
@@ -57,17 +47,17 @@ function ensureDir(dir) {
 }
 
 // ---------------------------------------------------------------------------
-// HTTP 采集 — 起点 mobile SSR
+// 起点：HTTP mobile SSR（自包含，无需 playwright）
 // ---------------------------------------------------------------------------
 
 async function scrapeQidian(outDir) {
   const MOBILE_BASE = 'https://m.qidian.com';
   const RANK_TYPES = [
-    { id: 'hotsales',  label: '畅销榜',   path: '/rank/hotsales/' },
-    { id: 'yuepiao',   label: '月票榜',   path: '/rank/yuepiao/' },
-    { id: 'signnewbook',label: '签约作者新书榜', path: '/rank/sign/' },
-    { id: 'pubnewbook', label: '公众作者新书榜', path: '/rank/newbook/' },
-    { id: 'newauthor', label: '新人作者新书榜', path: '/rank/newauthor/' },
+    { id: 'hotsales',     label: '畅销榜',           path: '/rank/hotsales/' },
+    { id: 'yuepiao',      label: '月票榜',           path: '/rank/yuepiao/' },
+    { id: 'signnewbook',  label: '签约作者新书榜',   path: '/rank/sign/' },
+    { id: 'pubnewbook',   label: '公众作者新书榜',   path: '/rank/newbook/' },
+    { id: 'newauthor',    label: '新人作者新书榜',   path: '/rank/newauthor/' },
   ];
 
   const MOBILE_HEADERS = {
@@ -89,7 +79,6 @@ async function scrapeQidian(outDir) {
       continue;
     }
 
-    // 提取 pageContext JSON
     const m = html.match(/<script[^>]+id=["']vite-plugin-ssr_pageContext["'][^>]*>([\s\S]*?)<\/script>/i);
     if (!m) {
       console.error(`  ⚠ ${rt.label} 未找到 pageContext`);
@@ -99,7 +88,7 @@ async function scrapeQidian(outDir) {
     let pageContext;
     try {
       pageContext = JSON.parse(m[1]);
-    } catch (e) {
+    } catch (_) {
       console.error(`  ⚠ ${rt.label} JSON 解析失败`);
       continue;
     }
@@ -111,202 +100,105 @@ async function scrapeQidian(outDir) {
     }
 
     const books = records.map((r, i) => ({
-      rank:    r.rankNum || i + 1,
-      title:   r.bName || r.bookName || '',
-      url:     r.bid ? `${MOBILE_BASE}/book/${r.bid}/` : '',
-      author:  r.bAuth || r.author || '',
-      genre:   [r.cat, r.subCat].filter(Boolean).join('·'),
-      status:  r.status || '',
-      words:   r.cnt || r.wordCount || '',
-      rankValue: r.rankCnt || '',
-      totalRecommend: r.totalRecommend || '',
-      signStatus: r.signStatus || '',
-      vipStatus: r.vipStatus || '',
+      rank:  r.rankNum || i + 1,
+      title: r.bName || r.bookName || '',
+      url:   r.bid ? `${MOBILE_BASE}/book/${r.bid}/` : '',
+      author: r.bAuth || r.author || '',
+      genre: [r.cat, r.subCat].filter(Boolean).join('·'),
+      status: r.status || '',
+      words: r.cnt || r.wordCount || '',
     }));
 
-    const today = todayStr();
-    const outFile = join(outDir, `${PLATFORM_CN.qidian}${rt.label}_${today}.md`);
-    const md = renderQidianMarkdown(rt.label, url, books);
-    writeFileSync(outFile, md, 'utf-8');
-    console.error(`  ✅ ${rt.label}: ${books.length} 本 → ${outFile}`);
+    const outFile = join(outDir, `${PLATFORM_CN.qidian}${rt.label}_${todayStr()}.md`);
+    writeFileSync(outFile, renderMarkdown(rt.label, url, books), 'utf-8');
+    console.error(`  ✅ ${rt.label}: ${books.length} 本`);
     results.push({ label: rt.label, count: books.length, file: outFile });
   }
 
   return results;
 }
 
-function renderQidianMarkdown(rankLabel, url, books) {
+function renderMarkdown(rankLabel, url, books) {
   const now = nowIso();
   const lines = [
     `# 起点 · ${rankLabel}`,
-    '',
+    ``,
     `- 来源：${url}`,
     `- 抓取方式：mobile-ssr`,
     `- 抓取时间：${now}`,
-    '',
+    ``,
     '---',
     '',
   ];
-
   for (const b of books) {
-    lines.push(`书名：${b.title || ''}`);
-    lines.push(`题材：${b.genre || ''}`);
-    lines.push(`作者：${b.author || ''}`);
+    lines.push(`书名：${b.title}`);
+    lines.push(`题材：${b.genre}`);
+    lines.push(`作者：${b.author}`);
     if (b.url) lines.push(`作品页：${b.url}`);
     lines.push('');
   }
-
   return lines.join('\n');
 }
 
 // ---------------------------------------------------------------------------
-// Browser scraper spawner（调用 scripts/scrapers/ 下的 CJS 脚本）
+// Browser scraper spawner（30 分钟超时）
 // ---------------------------------------------------------------------------
 
-function spawnScraper(platform, length, outDir, channel, type) {
+function spawnScraper(script, extraArgs, outDir) {
   return new Promise(async (resolve) => {
     const { spawn } = await import('child_process');
-    const args = scraperArgs(platform, length, outDir, channel, type);
-    const scraperScript = join(dirname(fileURLToPath(import.meta.url)), 'scrapers', args.script);
-    const fullArgs = [...args.extra];
-
-    process.stderr.write(`\n→ 启动采集脚本...`);
-    const p = spawn('node', [scraperScript, ...fullArgs], {
-      timeout: 900000,
+    const scriptPath = join(dirname(fileURLToPath(import.meta.url)), 'scrapers', script);
+    process.stderr.write(`\n→ 启动 ${script}...\n`);
+    const p = spawn('node', [scriptPath, ...extraArgs], {
+      timeout: 30 * 60 * 1000,
       stdio: ['ignore', 'pipe', 'inherit'],
     });
     let out = '';
     p.stdout.on('data', d => { out += d.toString(); });
     p.on('close', (code) => {
       if (code === 0 && out.trim()) {
-        resolve({ ok: true, output: out, stderr: '' });
+        resolve({ ok: true, output: out });
       } else {
-        const errTail = out.trimEnd().slice(-500);
-        resolve({ ok: false, output: out, error: errTail || `exit ${code}` });
+        resolve({ ok: false, output: out, error: out.trimEnd().slice(-500) || `exit ${code}` });
       }
     });
-    p.on('error', (e) => {
-      resolve({ ok: false, output: '', error: e.message });
-    });
+    p.on('error', e => resolve({ ok: false, output: '', error: e.message }));
   });
 }
 
-function scraperArgs(platform, length, outDir, channel, type) {
-  switch (platform) {
-    case 'fanqie':
-      return {
-        script: 'fanqie-rank-scraper.cjs',
-        extra: ['--channel', 'all', '--top', '20', '--outdir', outDir],
-      };
-    case 'jinjiang':
-      // 月榜(orderstr=5) + 新手金榜(orderstr=17)，--type all 扫全部
-      return {
-        script: 'jjwxc-rank-scraper.cjs',
-        extra: ['--type', '5,17', '--outdir', outDir],
-      };
-    case 'zhihu':
-      return {
-        script: 'zhihu-rank-scraper.cjs',
-        extra: ['--length', length === 'short' ? 'short' : 'long', '--login-wait', '60', '--outdir', outDir],
-      };
-    case 'qimao':
-      return {
-        script: 'qimao-rank-scraper.cjs',
-        extra: ['--channel', channel || 'all', '--type', type || 'all', '--outdir', outDir],
-      };
-    default:
-      return { script: null, extra: [] };
-  }
-}
-
 // ---------------------------------------------------------------------------
-// 扫榜报告生成
+// 构建 scraper 参数
 // ---------------------------------------------------------------------------
 
-function generateReport(platform, length, scanFiles, outDir) {
-  const today = todayStr();
-  const pcn = PLATFORM_CN[platform] || platform;
-  const lenStr = length === 'long' ? '长篇' : '短篇';
-
-  // 读取原始数据文件
-  const books = [];
-  for (const f of scanFiles) {
-    if (!existsSync(f)) continue;
-    const content = readFileSync(f, 'utf-8');
-    // 简单解析 Markdown 中的 ## #N 书名 格式
-    const matches = [...content.matchAll(/^## #(\d+) (.+)$/gm)];
-    for (const m of matches) {
-      books.push({ rank: parseInt(m[1]), title: m[2].trim() });
+function scraperArgs(platform, channel, type, outDir) {
+  switch (platform) {
+    case 'fanqie': {
+      // channel=1/0, type=2/1, __all__ 展开
+      const ch = channel === 'all' ? 'all' : channel;
+      const ty = type === 'all' ? 'all' : type;
+      const extra = ['--outdir', outDir];
+      if (ch !== 'all') extra.push('--channel', ch);
+      if (ty !== 'all') extra.push('--type', ty);
+      return { script: 'fanqie-rank-scraper.cjs', extra };
     }
-  }
-
-  const report = [
-    `# ${pcn}${lenStr}扫榜报告：${today}`,
-    '',
-    '## 市场概况',
-    `- 扫榜时间：${today}`,
-    `- 核心发现：${books.length > 0 ? `共采集 ${books.length} 本上榜作品` : '（数据采集中）'}`,
-    '',
-    '## 题材热度排行',
-    '- （从原始数据分析提取）',
-    '',
-    '## 新题材信号',
-    '- （从原始数据分析提取）',
-    '',
-    '## 关键数据洞察',
-    `- 字数区间：（待分析）`,
-    `- 书名特征：（待分析）`,
-    '',
-    '## 值得关注的方向',
-    '1. （待从榜单提取后填入）',
-    '',
-    '## 一句话',
-    '（待分析后填入）',
-  ].join('\n');
-
-  const reportFile = join(outDir, `${pcn}${lenStr}扫榜报告_${today}.md`);
-  writeFileSync(reportFile, report, 'utf-8');
-  console.error(`  ✅ 扫榜报告 → ${reportFile}`);
-  return reportFile;
-}
 
-// ---------------------------------------------------------------------------
-// topic_decision 追加
-// ---------------------------------------------------------------------------
+    case 'jinjiang': {
+      // type 是 orderstr id
+      const extra = ['--outdir', outDir];
+      if (type !== 'all') extra.push('--type', type);
+      return { script: 'jjwxc-rank-scraper.cjs', extra };
+    }
 
-function appendTopicDecision(platform, length, reportFile, outDir) {
-  const today = todayStr();
-  const pcn = PLATFORM_CN[platform] || platform;
-  const lenStr = length === 'long' ? '长篇' : '短篇';
+    case 'qimao': {
+      const extra = ['--outdir', outDir];
+      if (channel !== 'all') extra.push('--channel', channel);
+      if (type !== 'all') extra.push('--type', type);
+      return { script: 'qimao-rank-scraper.cjs', extra };
+    }
 
-  const section = [
-    `## ${pcn}（${lenStr}）推荐选题`,
-    `- 扫榜日期：${today}`,
-    `- 数据来源：${reportFile}`,
-    '',
-    '### 选题 1：（待从报告提取）',
-    '- 题材组合：（待填入）',
-    '- 目标读者：（待填入）',
-    '- 核心卖点：（待填入）',
-    '- 能爆的原因：（待填入）',
-    '- 差异化定位：（待填入）',
-    '- 可行性：高/中/低 — （待评估）',
-    '- 失败风险：（待评估）',
-    '- 验证动作：（待填入）',
-    '- 篇幅/平台：（待填入）',
-  ].join('\n');
-
-  const decisionFile = join(outDir, `topic_decision_${today}.md`);
-  const sep = existsSync(decisionFile) ? '\n\n---\n\n' : '';
-
-  if (existsSync(decisionFile)) {
-    writeFileSync(decisionFile, readFileSync(decisionFile, 'utf-8') + sep + section + '\n', 'utf-8');
-  } else {
-    const header = `# 选题决策：${today}\n\n---\n\n`;
-    writeFileSync(decisionFile, header + section + '\n', 'utf-8');
+    default:
+      return { script: null, extra: [] };
   }
-  console.error(`  ✅ topic_decision 追加 → ${decisionFile}`);
-  return decisionFile;
 }
 
 // ---------------------------------------------------------------------------
@@ -315,111 +207,65 @@ function appendTopicDecision(platform, length, reportFile, outDir) {
 
 async function main() {
   const args = process.argv.slice(2);
-  let projectRoot = '', platform = '', length = '', channel = '', type = '';
+  let projectRoot = '', platform = '', channel = 'all', type = 'all';
 
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--project-root') projectRoot = args[i + 1] || '';
-    if (args[i] === '--platform') platform = args[i + 1] || '';
-    if (args[i] === '--length') length = args[i + 1] || '';
-    if (args[i] === '--channel') channel = args[i + 1] || 'all';
-    if (args[i] === '--type') type = args[i + 1] || 'all';
+    if (args[i] === '--platform')     platform   = args[i + 1] || '';
+    if (args[i] === '--channel')      channel    = args[i + 1] || 'all';
+    if (args[i] === '--type')         type       = args[i + 1] || 'all';
   }
 
-  if (!projectRoot || !platform || !length) {
-    console.error('缺少必要参数: --project-root --platform --length');
+  if (!projectRoot || !platform) {
+    console.error('缺少必要参数: --project-root --platform');
     process.exit(1);
   }
 
-  // 检查 .fancy-deployed
   if (!existsSync(join(projectRoot, '.fancy-deployed'))) {
     console.error('项目未初始化：.fancy-deployed 不存在');
     process.exit(1);
   }
 
-  // 验证平台×篇幅
-  if (!VALID_PLATFORMS.includes(platform)) {
+  const VALID = ['qidian', 'fanqie', 'jinjiang', 'qimao'];
+  if (!VALID.includes(platform)) {
     console.error(`不支持的平台: ${platform}`);
     process.exit(1);
   }
-  if (!VALID_LENGTHS.includes(length)) {
-    console.error(`不支持的篇幅: ${length}`);
-    process.exit(1);
-  }
-  if (!PLATFORM_SUPPORTED_LENGTHS[platform].includes(length)) {
-    console.error(`${platform} 不支持 ${length}`);
-    process.exit(1);
-  }
 
   const today = todayStr();
   const scanDir = join(projectRoot, '扫榜结果');
   ensureDir(scanDir);
 
   let scanFiles = [];
-  let scrapeFiles = [];
 
   if (platform === 'qidian') {
-    // 起点：HTTP mobile SSR
-    console.error('→ 采集 起点（mobile SSR）...');
-    scrapeFiles = await scrapeQidian(scanDir);
-    if (!scrapeFiles.length) {
-      console.error('  ❌ 起点采集失败');
-      process.exit(1);
-    }
-    scanFiles = scrapeFiles.map(f => f.file);
+    console.error(`→ 采集 起点（mobile SSR）...`);
+    const results = await scrapeQidian(scanDir);
+    if (!results.length) { console.error('❌ 起点采集失败'); process.exit(1); }
+    scanFiles = results.map(r => r.file);
   } else {
-    // 其他平台：spawn scraper 进程
-    const cfg = scraperArgs(platform, length, scanDir);
-    if (!cfg.script) {
-      console.error(`  ❌ 平台 ${platform} 暂不支持采集`);
-      process.exit(1);
-    }
-    console.error(`→ 采集 ${PLATFORM_CN[platform]}...`);
-    const result = await spawnScraper(platform, length, scanDir, channel, type);
-    if (!result.ok) {
-      console.error(`  ❌ ${PLATFORM_CN[platform]} 采集失败：${result.error}`);
-      process.exit(1);
-    }
-    // scraper 输出落在 stdout（JSON 摘要），找到它
-    const lines = result.output.split('\n');
-    const writtenFiles = [];
-    for (const line of lines) {
-      const m = line.match(/已保存:\s*(.+)/);
-      if (m) writtenFiles.push(m[1].trim());
-    }
-    if (!writtenFiles.length) {
-      console.error('  ❌ 未找到任何输出文件');
-      process.exit(1);
-    }
-    scanFiles.push(...writtenFiles);
-  }
-
-  // Step 6: 收集原始数据
-  const rawData = {};
-  for (const f of scanFiles) {
-    try {
-      const name = f.replace(/^.*\//, '').replace(/\.md$/, '');
-      rawData[name] = { path: f, content: '' };
-      const { readFileSync } = await import('fs');
-      rawData[name].content = readFileSync(f, 'utf-8');
-    } catch (_) {}
+    const cfg = scraperArgs(platform, channel, type, scanDir);
+    if (!cfg.script) { console.error(`❌ 平台 ${platform} 暂不支持`); process.exit(1); }
+    console.error(`→ 采集 ${PLATFORM_CN[platform]}（${channel}/${type}）...`);
+    const r = await spawnScraper(cfg.script, cfg.extra, scanDir);
+    if (!r.ok) { console.error(`❌ 采集失败：${r.error}`); process.exit(1); }
+
+    // 从 stdout 提取 "已保存: xxx.md"
+    const writtenFiles = [...r.output.matchAll(/已保存:\s*(.+)/g)].map(m => m[1].trim());
+    if (!writtenFiles.length) { console.error('❌ 未找到输出文件'); process.exit(1); }
+    scanFiles = writtenFiles;
   }
 
   const receipt = {
     ok: true,
     operation: 'scan',
     platform,
-    length,
     date: today,
     scan_files: scanFiles,
     topic_decision: join(scanDir, `topic_decision_${today}.md`),
-    raw_data: rawData,
-    summary: `${PLATFORM_CN[platform]}（${length === 'long' ? '长篇' : '短篇'}）采集完成，共 ${scanFiles.length} 个文件`,
   };
 
   console.log(JSON.stringify(receipt));
 }
 
-main().catch(e => {
-  console.error('Fatal:', e);
-  process.exit(1);
-});
+main().catch(e => { console.error('Fatal:', e); process.exit(1); });

package/plugins/fancy-scan/templates.js

@@ -7,16 +7,59 @@
 // ---------------------------------------------------------------------------
 
 export const PLATFORM_TABLE = [
-  ['1', 'qidian',   '长篇', '起点'],
-  ['2', 'fanqie',   '长篇', '番茄'],
-  ['3', 'jinjiang', '长篇', '晋江'],
-  ['4', 'zhihu',    '需选择', '知乎'],
-  ['5', 'qimao',    '需选择', '七猫'],
+  ['1', 'qidian',   '起点'],
+  ['2', 'fanqie',   '番茄'],
+  ['3', 'jinjiang', '晋江'],
+  ['4', 'qimao',    '七猫'],
 ];
 
 export function platformLabel(platform) {
   const row = PLATFORM_TABLE.find(r => r[1] === platform);
-  return row ? row[3] : platform;
+  return row ? row[2] : platform;
+}
+
+// ---------------------------------------------------------------------------
+// 各平台榜单选项（{ id, label }[]），供弹窗多选用
+// ---------------------------------------------------------------------------
+
+export function rankOptions(platform) {
+  switch (platform) {
+    case 'qidian':
+      // 起点男频大热榜（唯一榜单，无细分）
+      return [{ id: 'main', label: '起点中文网主站榜单' }];
+
+    case 'fanqie':
+      return [
+        { id: '1_2', label: '男频阅读榜' },
+        { id: '1_1', label: '男频新书榜' },
+        { id: '0_2', label: '女频阅读榜' },
+        { id: '0_1', label: '女频新书榜' },
+        { id: '__all__', label: '全选' },
+      ];
+
+    case 'jinjiang':
+      return [
+        { id: '5',  label: '月榜' },
+        { id: '7',  label: '总分榜' },
+        { id: '4',  label: '季度榜' },
+        { id: '12', label: '收入金榜' },
+        { id: '16', label: '完结金榜' },
+        { id: '17', label: '新手金榜' },
+        { id: '__all__', label: '全选' },
+      ];
+
+    case 'qimao':
+      return [
+        { id: 'male_hot',    label: '男生大热榜' },
+        { id: 'male_new',    label: '男生新书榜' },
+        { id: 'female_hot',  label: '女生大热榜' },
+        { id: 'female_new',  label: '女生新书榜' },
+        { id: '__all__',     label: '全选' },
+      ];
+
+    default:
+      return [];
+  }
 }
 
 // ---------------------------------------------------------------------------
@@ -27,41 +70,24 @@ export const scan = {
   platformList() {
     return (
       '📋 支持的平台：\n' +
-      PLATFORM_TABLE.map(r => `  ${r[0]}. ${r[3]}（${r[2]}）`).join('\n') +
-      '\n- 知乎和七猫同时支持长篇和短篇'
+      PLATFORM_TABLE.map(r => `  ${r[0]}. ${r[2]}`).join('\n')
     );
   },
 
   askPlatform() {
-    return { question: '📊 请选择要扫的平台（输入编号 1-5）：' };
+    return { question: '📊 请选择要扫的平台（输入编号 1-4）：' };
   },
 
-  askLength(platform) {
-    if (platform === 'qimao') {
-      return {
-        question: `七猫同时支持男频/女频、大热榜/新书榜，请选择采集范围：`,
-        hideCustomInput: true,
-        options: [
-          { label: '采集全部（男/女 × 大热/新书，4个榜单）' },
-          { label: '男生大热榜' },
-          { label: '男生新书榜' },
-          { label: '女生大热榜' },
-          { label: '女生新书榜' },
-        ],
-      };
-    }
+  askRankList(platform) {
+    const opts = rankOptions(platform);
     return {
-      question: `${platformLabel(platform)} 同时支持长篇和短篇，请选择：`,
+      question: `${platformLabel(platform)} 有多个榜单，支持多选。请选择要采集的榜单：`,
       hideCustomInput: true,
-      options: [
-        { label: '长篇' },
-        { label: '短篇' },
-      ],
+      options: opts.map(o => ({ label: o.label })),
     };
   },
 
-  notify({ type, platform, length, files, topicFile, projectRoot, err }) {
-    const lenStr = length === 'long' ? '长篇' : '短篇';
+  notify({ type, platform, files, topicFile, projectRoot, err }) {
     const pLabel = platformLabel(platform);
 
     switch (type) {
@@ -69,19 +95,16 @@ export const scan = {
         return '⚠️ 当前目录尚未初始化。请先运行 /fancy-bootstrap 进行初始化。';
 
       case 'invalid_choice':
-        return '❌ 无效选择，请输入 1-5 的编号。';
+        return '❌ 无效选择，请输入 1-4 的编号。';
 
       case 'cancelled':
-        return '🚫 已取消';
-
-      case 'cancelled_with_hint':
-        return '⚠️ 已取消。请再次调用 /fancy-scan 继续。';
+        return '🚫 已取消。';
 
       case 'failed':
-        return '❌ 采集失败：' + err;
+        return '❌ 采集失败：' + (err || '');
 
       case 'parse_error':
-        return '❌ 采集结果解析失败';
+        return '❌ 采集结果解析失败。';
 
       case 'handover':
         return (
@@ -95,9 +118,8 @@ export const scan = {
     }
   },
 
-  llmAnalysisPrompt({ platform, length, date, files, topicFile, projectRoot }) {
+  llmAnalysisPrompt({ platform, date, files, topicFile, projectRoot }) {
     const pLabel = platformLabel(platform);
-    const lenStr = length === 'long' ? '长篇' : '短篇';
     const fileList = (files || [])
       .map(f => '- ' + f.replace(projectRoot + '/', ''))
       .join('\n');
@@ -105,7 +127,7 @@ export const scan = {
     return [
       `## 扫榜数据分析任务`,
       ``,
-      `平台：${pLabel}（${lenStr}）`,
+      `平台：${pLabel}`,
       `时间：${date || ''}`,
       ``,
       `已生成的文件：`,

package/plugins/fancy-scan/scripts/scrapers/zhihu-rank-scraper.cjs

@@ -1,186 +0,0 @@
-#!/usr/bin/env node
-/**
- * 知乎短篇/长篇采集脚本
- *
- * 使用 playwright-core 自己管理浏览器。
- * 入口：https://www.zhihu.com/fiore/h5/vip-web
- * 短篇（4 个榜单）：推荐榜 / 热搜榜 / 热度榜 / 口碑榜
- * 长篇（1 个榜单）：长篇榜
- *
- * 用法：
- *   node zhihu-rank-scraper.js --length short                 # 短篇 4 个榜单
- *   node zhihu-rank-scraper.js --length long                  # 长篇 1 个榜单
- *   node zhihu-rank-scraper.js --length short --boards rec,hot # 指定短篇子榜
- *   node zhihu-rank-scraper.js --login-wait 60               # 等待手动登录
- *
- * 注意：知乎需要登录态才能看完整榜单。
- */
-
-const fs = require("fs");
-const path = require("path");
-const { chromium } = require("playwright-core");
-const { getArg, localDateStamp, runCli } = require("./cdp-utils.cjs");
-
-const OUTDIR = getArg(process.argv, "--outdir") || "扫榜结果";
-const ENTRY_URL = "https://www.zhihu.com/fiore/h5/vip-web";
-const LENGTH = getArg(process.argv, "--length") || "short";
-const LOGIN_WAIT = parseInt(getArg(process.argv, "--login-wait") || "0", 10);
-
-// 短篇 4 个榜单
-const SHORT_BOARDS = [
-  { id: "rec",       label: "推荐榜", tabText: "推荐榜" },
-  { id: "hot",       label: "热搜榜", tabText: "热搜榜" },
-  { id: "trending",  label: "热度榜", tabText: "热度榜" },
-  { id: "reputation",label: "口碑榜", tabText: "口碑榜" },
-];
-
-// 长篇 1 个榜单
-const LONG_BOARDS = [
-  { id: "long", label: "长篇榜", tabText: "长篇榜" },
-];
-
-const BOARDS = LENGTH === "long" ? LONG_BOARDS : SHORT_BOARDS;
-
-const customBoards = getArg(process.argv, "--boards");
-const targetBoards = customBoards
-  ? BOARDS.filter(b => customBoards.split(",").map(s => s.trim()).includes(b.id))
-  : BOARDS;
-
-// ---------------------------------------------------------------------------
-// 工具函数
-// ---------------------------------------------------------------------------
-
-function sleep(ms) {
-  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
-}
-
-// ---------------------------------------------------------------------------
-// 采集
-// ---------------------------------------------------------------------------
-
-async function scrapeBoard(board) {
-  console.log(`  [${board.label}] 正在抓取...`);
-
-  const browser = await chromium.launch({ headless: false, args: ["--no-sandbox", "--disable-dev-shm-usage", "--start-maximized"] });
-  const context = await browser.newContext();
-  const page = await context.newPage();
-
-  // CDP 强制窗口最大化
-  try {
-    const cdp = await context.newCDPSession(page);
-    const { windowId } = await cdp.send('Browser.getWindowForTarget', { target: page.target() });
-    await cdp.send('Browser.setWindowBounds', { windowId, bounds: { state: 'maximized' } });
-  } catch (_) {}
-
-  try {
-    await page.goto(ENTRY_URL, { waitUntil: "networkidle" });
-
-    if (LOGIN_WAIT > 0) {
-      console.log(`  ⏳ 等待 ${LOGIN_WAIT}s 供用户登录...`);
-      await page.waitForTimeout(LOGIN_WAIT * 1000);
-    }
-
-    const host = page.url();
-    if (host.indexOf("zhihu") === -1) {
-      console.error(`  ✗ 当前页面非知乎（url=${host}），可能被重定向，已跳过。`);
-      return null;
-    }
-
-    // 点击 tab
-    const clicked = await page.evaluate((target) => {
-      const candidates = Array.from(document.querySelectorAll("a, button, div, span, li"))
-        .filter(el => {
-          const t = (el.innerText || "").trim();
-          return t === target || t.startsWith(target);
-        });
-      if (!candidates.length) return false;
-      candidates[0].click();
-      return true;
-    }, board.tabText);
-
-    if (!clicked) {
-      console.error(`  [${board.label}] 点击 tab 失败`);
-      return null;
-    }
-
-    await page.waitForTimeout(2500);
-
-    // 提取故事列表
-    const stories = await page.evaluate(() => {
-      const items = [];
-      const seen = new Set();
-      const anchors = document.querySelectorAll('a[href*="/p/"], a[href*="/question/"], a[href*="/xen/"]');
-      anchors.forEach((a, i) => {
-        const href = a.href || "";
-        if (!href || seen.has(href)) return;
-        const text = (a.innerText || "").trim();
-        if (!text || text.length < 4 || text.length > 200) return;
-        if (/^(首页|发现|等你来答|登录|注册|更多|查看全部)$/.test(text)) return;
-        seen.add(href);
-        items.push({ rank: i + 1, title: text.split("\n")[0].trim(), url: href });
-      });
-      return items.slice(0, 100);
-    });
-
-    if (!stories || stories.length === 0) {
-      console.warn(`  [${board.label}] 未提取到故事`);
-      return [];
-    }
-    return stories;
-  } finally {
-    await browser.close();
-  }
-}
-
-function buildBoardMarkdown(board, stories, date) {
-  const lines = [
-    `# 知乎 · ${board.label}`,
-    "",
-    `- 来源：${ENTRY_URL}`,
-    `- 抓取时间：${date}`,
-    "",
-    "---",
-    "",
-  ];
-  if (!stories.length) {
-    lines.push("（未提取到数据，可能页面结构变化或需要登录）", "", "---", "");
-  } else {
-    stories.forEach(s => {
-      lines.push(`书名：${s.title || ""}`);
-      lines.push(`题材：${LENGTH === "long" ? "长篇" : "短篇"}`);
-      lines.push(`作者：${s.author || ""}`);
-      if (s.url) lines.push(`作品页：${s.url}`);
-      lines.push("");
-    });
-  }
-  return lines.join("\n");
-}
-
-// ---------------------------------------------------------------------------
-// 入口
-// ---------------------------------------------------------------------------
-
-async function main() {
-  const date = localDateStamp();
-  fs.mkdirSync(OUTDIR, { recursive: true });
-
-  let written = 0;
-  for (const board of targetBoards) {
-    const stories = await scrapeBoard(board);
-    if (stories === null) continue;
-
-    const md = buildBoardMarkdown(board, stories, date);
-    const filename = `知乎${LENGTH === "long" ? "长篇" : "短篇"}${board.label}_${date}.md`;
-    const filepath = path.join(OUTDIR, filename);
-    fs.writeFileSync(filepath, md, "utf-8");
-    console.log(`  ✓ ${filename} (${stories.length} 条)`);
-    written++;
-  }
-  return written;
-}
-
-if (require.main === module) {
-  runCli(main, "知乎采集");
-}
-
-module.exports = { scrapeBoard, buildBoardMarkdown };