wukong-gitlog-cli 1.0.35 → 1.0.37

package/src/{cli.mjs → index.mjs}

@@ -7,6 +7,7 @@ import ora from 'ora'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
+import { parseOptions } from './cli/parseOptions.mjs'
 // eslint-disable-next-line no-unused-vars
 import { CLI_NAME } from './constants/index.mjs'
 import {
@@ -15,23 +16,27 @@ import {
   exportExcelPerPeriodSheets
 } from './excel.mjs'
 import { getGitLogsFast } from './git.mjs'
+import { handleServe } from './handlers/handleServe.mjs'
 import { renderAuthorChangesJson } from './json.mjs'
+import { setConfig } from './lib/configStore.mjs'
+import { createOvertimeStats } from './overtime/createOvertimeStats.mjs'
 import {
-  analyzeOvertime,
   renderOvertimeCsv,
   renderOvertimeTab,
   renderOvertimeText
-} from './overtime.mjs'
+} from './overtime/overtime.mjs'
 import { renderAuthorMapText } from './renderAuthorMapText.mjs'
 import { startServer } from './server.mjs'
 import { renderChangedLinesText, renderText } from './text.mjs'
 import { checkUpdateWithPatch } from './utils/checkUpdate.mjs'
+import { handleSuccess } from './utils/handleSuccess.mjs'
 import {
   groupRecords,
   outputFilePath,
   writeJSON,
   writeTextFile
 } from './utils/index.mjs'
+import { logDev } from './utils/logDev.mjs'
 import { showVersionInfo } from './utils/showVersionInfo.mjs'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -78,6 +83,8 @@ export function getWeekRange(periodStr) {
 }
 
 const main = async () => {
+  const startTime = performance.now()
+
   const program = new Command()
 
   program
@@ -90,6 +97,7 @@ const main = async () => {
     .option('--until <date>', '结束日期')
     .option('--limit <n>', '限制数量', parseInt)
     .option('--no-merges', '不包含 merge commit')
+    .option('--export', '导出统计数据')
     .option('--json', '输出 JSON')
     .option('--format <type>', '输出格式: text | excel | json', 'text')
     .option('--group-by <type>', '按日期分组: day | month | week')
@@ -171,6 +179,7 @@ const main = async () => {
       (v) => parseInt(v, 10),
       3000
     )
+    .option('--debug', 'enable debug logs')
     .option(
       '--serve-only',
       '仅启动 web 服务，不导出或分析数据（使用 output-wukong/data 中已有的数据）'
@@ -179,6 +188,14 @@ const main = async () => {
     .parse()
 
   const opts = program.opts()
+
+  const config = parseOptions(opts)
+
+  // ❗只创建一次缓存实例
+  const getOvertimeStats = createOvertimeStats(config)
+
+  setConfig('debug', opts.debug === true)
+
   // compute output directory root early (so serve-only can use it)
   const outDir = opts.outParent
     ? path.resolve(process.cwd(), '..', 'output-wukong')
@@ -308,16 +325,14 @@ const main = async () => {
   // --- 分组 ---
   const groups = opts.groupBy ? groupRecords(records, opts.groupBy) : null
 
+  // If serve mode is enabled, write data modules and launch the web server
+  if (opts.serve) {
+    handleServe({ opts, outDir, records, getOvertimeStats })
+  }
+
   // --- Overtime analysis ---
   if (opts.overtime) {
-    const stats = analyzeOvertime(records, {
-      startHour: opts.workStart || opts.workStart === 0 ? opts.workStart : 9,
-      endHour: opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18,
-      lunchStart:
-        opts.lunchStart || opts.lunchStart === 0 ? opts.lunchStart : 12,
-      lunchEnd: opts.lunchEnd || opts.lunchEnd === 0 ? opts.lunchEnd : 14,
-      country: opts.country || 'CN'
-    })
+    const stats = getOvertimeStats(records)
     // Output to console
     console.log('\n--- Overtime analysis ---\n')
     console.log(renderOvertimeText(stats))
@@ -325,13 +340,13 @@ const main = async () => {
     const authorMapText = renderAuthorMapText(authorMap)
     console.log('\n Developers:\n', authorMapText, '\n')
     writeTextFile(outputFilePath('authors.text', outDir), authorMapText)
-    
+
     // if user requested json format, write stats to file
     if (opts.json || opts.format === 'json') {
       const file = opts.out || 'overtime.json'
       const filepath = outputFilePath(file, outDir)
       writeJSON(filepath, stats)
-      console.log(chalk.green(`overtime JSON 已导出: ${filepath}`))
+      logDev(`overtime JSON 已导出: ${filepath}`)
     }
     // Always write human readable overtime text to file (default: overtime.txt)
     const outBase = opts.out
@@ -348,218 +363,9 @@ const main = async () => {
     const overtimeCsvFileName = `overtime_${outBase}.csv`
     const overtimeCsvFile = outputFilePath(overtimeCsvFileName, outDir)
     writeTextFile(overtimeCsvFile, renderOvertimeCsv(stats))
-    console.log(chalk.green(`Overtime text 已导出: ${overtimeFile}`))
-    console.log(chalk.green(`Overtime table (tabs) 已导出: ${overtimeTabFile}`))
-    console.log(chalk.green(`Overtime CSV 已导出: ${overtimeCsvFile}`))
-
-    // If serve mode is enabled, write data modules and launch the web server
-    if (opts.serve) {
-      try {
-        const dataCommitsFile = outputFilePath('data/commits.mjs', outDir)
-        const commitsModule = `export default ${JSON.stringify(records, null, 2)};\n`
-        writeTextFile(dataCommitsFile, commitsModule)
-
-        const dataCommitsChangedFile = outputFilePath(
-          'data/author-changes.mjs',
-          outDir
-        )
-        const jsonText = renderAuthorChangesJson(records)
-
-        const commitsChangedModule = `export default ${JSON.stringify(jsonText, null, 2)};\n`
-        writeTextFile(dataCommitsChangedFile, commitsChangedModule)
-
-        const dataStatsFile = outputFilePath('data/overtime-stats.mjs', outDir)
-        const statsModule = `export default ${JSON.stringify(stats, null, 2)};\n`
-        writeTextFile(dataStatsFile, statsModule)
-
-        // 新增：每周趋势数据（用于前端图表）
-        const weekGroups = groupRecords(records, 'week')
-        const weekKeys = Object.keys(weekGroups).sort()
-        const weeklySeries = weekKeys.map((k) => {
-          const s = analyzeOvertime(weekGroups[k], {
-            startHour:
-              opts.workStart || opts.workStart === 0 ? opts.workStart : 9,
-            endHour: opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18,
-            lunchStart:
-              opts.lunchStart || opts.lunchStart === 0 ? opts.lunchStart : 12,
-            lunchEnd: opts.lunchEnd || opts.lunchEnd === 0 ? opts.lunchEnd : 14,
-            country: opts.country || 'CN'
-          })
-          return {
-            period: k,
-            range: getWeekRange(k),
-            total: s.total,
-            outsideWorkCount: s.outsideWorkCount,
-            outsideWorkRate: s.outsideWorkRate,
-            nonWorkdayCount: s.nonWorkdayCount,
-            nonWorkdayRate: s.nonWorkdayRate
-          }
-        })
-        const dataWeeklyFile = outputFilePath(
-          'data/overtime-weekly.mjs',
-          outDir
-        )
-        const weeklyModule = `export default ${JSON.stringify(weeklySeries, null, 2)};\n`
-        writeTextFile(dataWeeklyFile, weeklyModule)
-        console.log(chalk.green(`Weekly series 已导出: ${dataWeeklyFile}`))
-
-        // 新增：每月趋势数据（用于前端图表）
-        const monthGroups2 = groupRecords(records, 'month')
-        const monthKeys2 = Object.keys(monthGroups2).sort()
-        const monthlySeries = monthKeys2.map((k) => {
-          const s = analyzeOvertime(monthGroups2[k], {
-            startHour:
-              opts.workStart || opts.workStart === 0 ? opts.workStart : 9,
-            endHour: opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18,
-            lunchStart:
-              opts.lunchStart || opts.lunchStart === 0 ? opts.lunchStart : 12,
-            lunchEnd: opts.lunchEnd || opts.lunchEnd === 0 ? opts.lunchEnd : 14,
-            country: opts.country || 'CN'
-          })
-          return {
-            period: k,
-            total: s.total,
-            outsideWorkCount: s.outsideWorkCount,
-            outsideWorkRate: s.outsideWorkRate,
-            nonWorkdayCount: s.nonWorkdayCount,
-            nonWorkdayRate: s.nonWorkdayRate
-          }
-        })
-        const dataMonthlyFile = outputFilePath(
-          'data/overtime-monthly.mjs',
-          outDir
-        )
-        const monthlyModule = `export default ${JSON.stringify(monthlySeries, null, 2)};\n`
-        writeTextFile(dataMonthlyFile, monthlyModule)
-        console.log(chalk.green(`Monthly series 已导出: ${dataMonthlyFile}`))
-
-        // 新增：每日最晚提交小时（用于显著展示加班严重程度）
-        const dayGroups2 = groupRecords(records, 'day')
-        const dayKeys2 = Object.keys(dayGroups2).sort()
-
-        // 次日凌晨归并窗口（默认 6 点前仍算前一天的加班）
-        const overnightCutoff = Number.isFinite(opts.overnightCutoff)
-          ? opts.overnightCutoff
-          : 6
-        // 次日上班时间（默认按 workStart，若未指定则 9 点）
-        const workStartHour =
-          opts.workStart || opts.workStart === 0 ? opts.workStart : 9
-        const workEndHour =
-          opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18
-
-        // 有些日期「本身没有 commit」，但第二天凌晨有提交要归并到这一天，
-        // 需要补出这些“虚拟日期”，否则 latestByDay 会漏掉这天。
-        const virtualPrevDays = new Set()
-        records.forEach((r) => {
-          const d = new Date(r.date)
-          if (Number.isNaN(d.valueOf())) return
-          const h = d.getHours()
-          if (h < 0 || h >= overnightCutoff || h >= workStartHour) return
-          const curDay = dayjs(d).format('YYYY-MM-DD')
-          const prevDay = dayjs(curDay).subtract(1, 'day').format('YYYY-MM-DD')
-          if (!dayGroups2[prevDay]) {
-            virtualPrevDays.add(prevDay)
-          }
-        })
-
-        const allDayKeys = Array.from(
-          new Set([...dayKeys2, ...virtualPrevDays])
-        ).sort()
-
-        const latestByDay = allDayKeys.map((k) => {
-          const list = dayGroups2[k] || []
-
-          // 1) 当天「下班后」的提交：只统计 >= workEndHour 的小时
-          const sameDayHours = list
-            .map((r) => new Date(r.date))
-            .filter((d) => !Number.isNaN(d.valueOf()))
-            .map((d) => d.getHours())
-            .filter((h) => h >= workEndHour && h < 24)
-
-          // 2) 次日凌晨、但仍算前一日加班的提交
-          const nextKey = dayjs(k).add(1, 'day').format('YYYY-MM-DD')
-          const early = dayGroups2[nextKey] || []
-          const earlyHours = early
-            .map((r) => new Date(r.date))
-            .filter((d) => !Number.isNaN(d.valueOf()))
-            .map((d) => d.getHours())
-            // 只看 [0, overnightCutoff) 之间的小时，
-            // 并且默认认为 < workStartHour 属于「次日上班前」
-            .filter(
-              (h) =>
-                h >= 0 &&
-                h < overnightCutoff &&
-                // 保护性判断：若有人把 overnightCutoff 设得大于上班时间，
-                // 我们仍然只统计到上班时间为止
-                h < workStartHour
-            )
-
-          // 3) 计算「逻辑上的最晚加班时间」
-          //    - 当天晚上的用原始小时（如 22 点）
-          //    - 次日凌晨的用 24 + 小时（如 1 点 → 25）
-          const overtimeValues = [
-            ...sameDayHours.map((h) => h),
-            ...earlyHours.map((h) => 24 + h)
-          ]
-
-          if (overtimeValues.length === 0) {
-            // 这一天没有任何「下班后到次日上班前」的提交
-            return {
-              date: k,
-              latestHour: null,
-              latestHourNormalized: null
-            }
-          }
-
-          const latestHourNormalized = Math.max(...overtimeValues)
-
-          // latestHour 保留「当天自然日内」的最晚提交通常小时数，供前端需要时参考
-          const sameDayMax =
-            sameDayHours.length > 0 ? Math.max(...sameDayHours) : null
-
-          return {
-            date: k,
-            latestHour: sameDayMax,
-            latestHourNormalized
-          }
-        })
-        const dataLatestByDayFile = outputFilePath(
-          'data/overtime-latest-by-day.mjs',
-          outDir
-        )
-        const latestByDayModule = `export default ${JSON.stringify(latestByDay, null, 2)};\n`
-        writeTextFile(dataLatestByDayFile, latestByDayModule)
-        console.log(
-          chalk.green(`Latest-by-day series 已导出: ${dataLatestByDayFile}`)
-        )
-
-        // 导出配置（供前端显示）
-        try {
-          const configFile = outputFilePath('data/config.mjs', outDir)
-          const cfg = {
-            startHour: opts.workStart || 9,
-            endHour: opts.workEnd || 18,
-            lunchStart: opts.lunchStart || 12,
-            lunchEnd: opts.lunchEnd || 14,
-            overnightCutoff
-          }
-          writeTextFile(
-            configFile,
-            `export default ${JSON.stringify(cfg, null, 2)};\n`
-          )
-          console.log(chalk.green(`Config 已导出: ${configFile}`))
-        } catch (e) {
-          console.warn('Export config failed:', e && e.message ? e.message : e)
-        }
-
-        startServer(opts.port || 3000, outDir).catch(() => {})
-      } catch (err) {
-        console.warn(
-          'Export data modules failed:',
-          err && err.message ? err.message : err
-        )
-      }
-    }
+    logDev(`Overtime text 已导出: ${overtimeFile}`)
+    logDev(`Overtime table (tabs) 已导出: ${overtimeTabFile}`)
+    logDev(`Overtime CSV 已导出: ${overtimeCsvFile}`)
 
     // 按月输出 ... 保持原逻辑
     const perPeriodFormats = String(opts.perPeriodFormats || '')
@@ -578,15 +384,7 @@ const main = async () => {
       const monthKeys = Object.keys(monthGroups).sort()
       monthKeys.forEach((k) => {
         const groupRecs = monthGroups[k]
-        const s = analyzeOvertime(groupRecs, {
-          startHour:
-            opts.workStart || opts.workStart === 0 ? opts.workStart : 9,
-          endHour: opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18,
-          lunchStart:
-            opts.lunchStart || opts.lunchStart === 0 ? opts.lunchStart : 12,
-          lunchEnd: opts.lunchEnd || opts.lunchEnd === 0 ? opts.lunchEnd : 14,
-          country: opts.country || 'CN'
-        })
+        const s = getOvertimeStats(groupRecs)
         monthlyContent += `===== ${k} =====\n`
         monthlyContent += `${renderOvertimeText(s)}\n\n`
         // Also write a single file per month under 'month/' folder
@@ -594,9 +392,7 @@ const main = async () => {
           const perMonthFileName = `month/overtime_${outBase}_${k}.txt`
           const perMonthFile = outputFilePath(perMonthFileName, outDir)
           writeTextFile(perMonthFile, renderOvertimeText(s))
-          console.log(
-            chalk.green(`Overtime 月度(${k}) 已导出: ${perMonthFile}`)
-          )
+          logDev(`Overtime 月度(${k}) 已导出: ${perMonthFile}`)
           // per-period CSV / Tab format (按需生成)
           if (perPeriodFormats.includes('csv')) {
             try {
@@ -605,10 +401,8 @@ const main = async () => {
                 outputFilePath(perMonthCsvName, outDir),
                 renderOvertimeCsv(s)
               )
-              console.log(
-                chalk.green(
-                  `Overtime 月度(CSV)(${k}) 已导出: ${outputFilePath(perMonthCsvName, outDir)}`
-                )
+              logDev(
+                `Overtime 月度(CSV)(${k}) 已导出: ${outputFilePath(perMonthCsvName, outDir)}`
               )
             } catch (err) {
               console.warn(
@@ -624,10 +418,8 @@ const main = async () => {
                 outputFilePath(perMonthTabName, outDir),
                 renderOvertimeTab(s)
               )
-              console.log(
-                chalk.green(
-                  `Overtime 月度(Tab)(${k}) 已导出: ${outputFilePath(perMonthTabName, outDir)}`
-                )
+              logDev(
+                `Overtime 月度(Tab)(${k}) 已导出: ${outputFilePath(perMonthTabName, outDir)}`
               )
             } catch (err) {
               console.warn(
@@ -645,7 +437,7 @@ const main = async () => {
       })
       if (!opts.perPeriodOnly) {
         writeTextFile(monthlyFile, monthlyContent)
-        console.log(chalk.green(`Overtime 月度汇总 已导出: ${monthlyFile}`))
+        logDev(`Overtime 月度汇总 已导出: ${monthlyFile}`)
       }
       // per-period Excel (sheets or files)
       if (perPeriodFormats.includes('xlsx')) {
@@ -658,9 +450,7 @@ const main = async () => {
               stats: opts.stats,
               gerrit: opts.gerrit
             })
-            console.log(
-              chalk.green(`Overtime 月度(XLSX) 已导出: ${monthXlsxFile}`)
-            )
+            logDev(`Overtime 月度(XLSX) 已导出: ${monthXlsxFile}`)
           } catch (err) {
             console.warn(
               'Export month XLSX (sheets) failed:',
@@ -710,22 +500,16 @@ const main = async () => {
       const weekKeys = Object.keys(weekGroups).sort()
       weekKeys.forEach((k) => {
         const groupRecs = weekGroups[k]
-        const s = analyzeOvertime(groupRecs, {
-          startHour:
-            opts.workStart || opts.workStart === 0 ? opts.workStart : 9,
-          endHour: opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18,
-          lunchStart:
-            opts.lunchStart || opts.lunchStart === 0 ? opts.lunchStart : 12,
-          lunchEnd: opts.lunchEnd || opts.lunchEnd === 0 ? opts.lunchEnd : 14,
-          country: opts.country || 'CN'
-        })
+        const s = getOvertimeStats(groupRecs)
         weeklyContent += `===== ${k} =====\n`
         weeklyContent += `${renderOvertimeText(s)}\n\n`
         try {
           const perWeekFileName = `week/overtime_${outBase}_${k}.txt`
           const perWeekFile = outputFilePath(perWeekFileName, outDir)
           writeTextFile(perWeekFile, renderOvertimeText(s))
-          console.log(chalk.green(`Overtime 周度(${k}) 已导出: ${perWeekFile}`))
+          // console.log(chalk.green(`Overtime 周度(${k}) 已导出: ${perWeekFile}`))
+          logDev(`Overtime 周度(${k}) 已导出: ${perWeekFile}`)
+
           // eslint-disable-next-line no-shadow
           const perPeriodFormats = String(opts.perPeriodFormats || '')
             .split(',')
@@ -743,10 +527,8 @@ const main = async () => {
                 outputFilePath(perWeekCsvName, outDir),
                 renderOvertimeCsv(s)
               )
-              console.log(
-                chalk.green(
-                  `Overtime 周度(CSV)(${k}) 已导出: ${outputFilePath(perWeekCsvName, outDir)}`
-                )
+              logDev(
+                `Overtime 周度(CSV)(${k}) 已导出: ${outputFilePath(perWeekCsvName, outDir)}`
               )
             } catch (err) {
               console.warn(
@@ -762,10 +544,8 @@ const main = async () => {
                 outputFilePath(perWeekTabName, outDir),
                 renderOvertimeTab(s)
               )
-              console.log(
-                chalk.green(
-                  `Overtime 周度(Tab)(${k}) 已导出: ${outputFilePath(perWeekTabName, outDir)}`
-                )
+              logDev(
+                `Overtime 周度(Tab)(${k}) 已导出: ${outputFilePath(perWeekTabName, outDir)}`
               )
             } catch (err) {
               console.warn(
@@ -782,7 +562,7 @@ const main = async () => {
         }
       })
       writeTextFile(weeklyFile, weeklyContent)
-      console.log(chalk.green(`Overtime 周度汇总 已导出: ${weeklyFile}`))
+      logDev(`Overtime 周度汇总 已导出: ${weeklyFile}`)
     } catch (err) {
       console.warn(
         'Generate weekly overtime failed:',
@@ -798,8 +578,8 @@ const main = async () => {
     writeJSON(filepath, groups || records)
     const jsonText = renderAuthorChangesJson(records)
     writeJSON(outputFilePath('author-changes.json', outDir), jsonText)
-    console.log(chalk.green(`JSON 已导出: ${filepath}`))
-    spinner.succeed('Done')
+    logDev(`JSON 已导出: ${filepath}`)
+    handleSuccess({ startTime, spinner })
     return
   }
 
@@ -809,13 +589,16 @@ const main = async () => {
     const text = renderText(records, groups, { showGerrit: !!opts.gerrit })
     writeTextFile(filepath, text)
     writeTextFile(
-      outputFilePath('author-changes.text', outDir),
+      outputFilePath('author-changes.txt', outDir),
       renderChangedLinesText(records)
     )
 
-    console.log(text)
-    console.log(chalk.green(`文本已导出: ${filepath}`))
-    spinner.succeed('Done')
+    console.log('\n Commits List:\n', text, '\n')
+
+    logDev(`文本已导出: ${filepath}`)
+
+    handleSuccess({ startTime, spinner })
+
     return
   }
 
@@ -835,9 +618,10 @@ const main = async () => {
     )
     const text = renderText(records, groups)
     writeTextFile(txtPath, text)
-    console.log(chalk.green(`Excel 已导出: ${excelPath}`))
-    console.log(chalk.green(`文本已自动导出: ${txtPath}`))
-    spinner.succeed('Done')
+    logDev(`Excel 已导出: ${excelPath}`)
+    logDev(`文本已自动导出: ${txtPath}`)
+
+    handleSuccess({ startTime, spinner })
   }
 
   await autoCheckUpdate()

package/src/lib/configStore.mjs

@@ -0,0 +1,11 @@
+const store = {
+  debug: false,
+}
+
+export function setConfig(key, value) {
+  store[key] = value
+}
+
+export function getConfig(key) {
+  return store[key]
+}

package/src/lib/memoize.mjs

@@ -0,0 +1,14 @@
+// memoize.mjs
+export function memoize(fn) {
+  const cache = new Map()
+
+  return function (...args) {
+    const key = JSON.stringify(args)
+    if (cache.has(key)) {
+      return cache.get(key)
+    }
+    const result = fn(...args)
+    cache.set(key, result)
+    return result
+  }
+}

package/src/overtime/createOvertimeStats.mjs

@@ -0,0 +1,11 @@
+import { analyzeOvertime } from './overtime.mjs';
+
+export function createOvertimeStats(defaultConfig = {}) {
+  return function getOvertimeStats(records, overrides) {
+    const config = overrides
+      ? { ...defaultConfig, ...overrides }
+      : defaultConfig;
+
+    return analyzeOvertime(records, config);
+  };
+}

package/src/utils/analyzeOvertimeCached.mjs

@@ -0,0 +1,7 @@
+// analyzeOvertimeCached.mjs
+import { memoize } from '../lib/memoize.mjs'
+import {
+  analyzeOvertime
+} from './overtime.mjs'
+
+export const analyzeOvertimeCached = memoize(analyzeOvertime)

package/src/utils/authorNormalizer.mjs

@@ -1,26 +1,20 @@
-// authorNormalizer.js
 /**
  * 按邮箱自动归一化作者名字
- * - 优先使用中文姓名
- * - 如果同邮箱出现多个非中文名，保持第一个
- * - 自动清理空格与不可见字符
+ * - 中文名优先覆盖
+ * - 同邮箱多个英文名保持第一个
  * - 保留原始 author 以便 debug
  */
 export function createAuthorNormalizer() {
   const map = {} // email -> canonical name
-  const originalMap = {} // email -> 原始所有 author 名
+  const originalMap = {} // email -> Set of original author names
 
   function isChinese(str) {
     return /[\u4e00-\u9fa5]/.test(str)
   }
 
   function cleanName(str) {
-    if (!str) return ''
-    return str
-      // eslint-disable-next-line no-misleading-character-class
-      .replace(/[\u200B\u200C\u200D\uFEFF]/g, '') // 去零宽空格
-      .replace(/\s+/g, ' ') // 多空格 -> 单空格
-      .trim()
+    // eslint-disable-next-line no-misleading-character-class
+    return (str || '').replace(/[\u200B\u200C\u200D\uFEFF]/g, '').trim()
   }
 
   function cleanEmail(str) {
@@ -28,31 +22,30 @@ export function createAuthorNormalizer() {
   }
 
   function getAuthor(name, email) {
-    const cleanedName = cleanName(name)
-    const cleanedEmail = cleanEmail(email)
+    const n = cleanName(name)
+    const e = cleanEmail(email)
 
-    if (!cleanedEmail) return cleanedName || 'Unknown'
+    if (!e) return n || 'Unknown'
 
-    // 记录原始 author 便于 debug
-    if (!originalMap[cleanedEmail]) originalMap[cleanedEmail] = new Set()
-    if (cleanedName) originalMap[cleanedEmail].add(cleanedName)
+    // 记录原始 author
+    if (!originalMap[e]) originalMap[e] = new Set()
+    if (n) originalMap[e].add(n)
 
-    const canonical = map[cleanedEmail]
+    const prev = map[e]
 
-    // 首次遇到这个邮箱 → 记录当前作者名
-    if (!canonical) {
-      map[cleanedEmail] = cleanedName || cleanedEmail
-      return map[cleanedEmail]
+    // 中文名优先覆盖
+    if (isChinese(n)) {
+      map[e] = n
+      return n
     }
 
-    // 新名是中文 → 覆盖旧的
-    if (isChinese(cleanedName)) {
-      map[cleanedEmail] = cleanedName
-      return map[cleanedEmail]
-    }
+    // 已有中文名 → 返回中文
+    if (prev && isChinese(prev)) return prev
+
+    // 首次出现英文名 → 记录
+    if (!prev) map[e] = n
 
-    // 新名非中文 → 保留已有中文或旧名
-    return canonical
+    return map[e]
   }
 
   return {