wukong-gitlog-cli 1.0.8 → 1.0.11

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.11](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.10...v1.0.11) (2025-12-01)
+
+### [1.0.10](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.9...v1.0.10) (2025-12-01)
+
+### [1.0.9](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.8...v1.0.9) (2025-12-01)
+
+
+### Features
+
+* 🎸 高亮21点 ([1dbd714](https://github.com/tomatobybike/wukong-gitlog-cli/commit/1dbd714d3690e5cfcc232ab96206c553ad3b39b0))
+* 🎸 each day overtime ([f89b935](https://github.com/tomatobybike/wukong-gitlog-cli/commit/f89b9356bc9088370ca7b1741d1fc17efa61c364))
+* 🎸 everyday latest work ([8332341](https://github.com/tomatobybike/wukong-gitlog-cli/commit/83323414618d1e5d89203846c9feed93b32dd20a))
+* 🎸 kpi ([6120bc1](https://github.com/tomatobybike/wukong-gitlog-cli/commit/6120bc1d0d999b5bd012109378a107d47722bbce))
+
 ### [1.0.8](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.7...v1.0.8) (2025-11-30)
 
 

package/README.md

@@ -1,4 +1,4 @@
-## 📦  `wukong-gitlog-cli`
+## 📦 `wukong-gitlog-cli`
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/tomatobybike/wukong-gitlog-cli/main/images/logo.svg" width="200" alt="wukong-dev Logo" />
@@ -14,8 +14,7 @@
 
 Advanced Git commit log exporter with Excel/JSON/TXT output, grouping, stats and CLI.
 
-English | [简体中文](./README.zh-CN.md)
----
+## English | [简体中文](./README.zh-CN.md)
 
 ## Features
 
@@ -38,8 +37,6 @@ English | [简体中文](./README.zh-CN.md)
 
 ## Installation
 
-
-
 Install globally to run with a short command (recommended for CLI consumers):
 
 ```bash
@@ -62,37 +59,38 @@ wukong-gitlog-cli [options]
 
 Command-line options:
 
-- `--author <name>`        Filter commits by author name
-- `--email <email>`        Filter commits by author email
-- `--since <date>`         Start date (e.g., 2025-01-01)
-- `--until <date>`         End date
-- `--limit <n>`            Limit number of commits
-- `--no-merges`            Exclude merge commits
-- `--json`                 Output JSON
-- `--format <type>`        Output format: `text` | `excel` | `json` (default: `text`)
-- `--group-by <type>`      Group commits by date: `day` | `month`
-- `--overtime`              Analyze overtime culture: output counts/percentages for commits outside work hours and on non-workdays (per-person breakdown)
-  - `--country <code>`       Country/region for holidays (CN|US). Default: `CN`.
-  - `--work-start <hour>`    Workday start hour. Default: `9`.
-  - `--work-end <hour>`      Workday end hour. Default: `18`.
-  - `--lunch-start <hour>`   Lunch break start hour. Default: `12`.
-  - `--lunch-end <hour>`     Lunch break end hour. Default: `14`.
-- `--stats`                Include a `Stats` sheet in the Excel export
-- `--gerrit-api <url>`    Optional: Gerrit REST API base URL for resolving `{{changeNumber}}` (e.g. `https://gerrit.example.com/gerrit`)
+- `--author <name>` Filter commits by author name
+- `--email <email>` Filter commits by author email
+- `--since <date>` Start date (e.g., 2025-01-01)
+- `--until <date>` End date
+- `--limit <n>` Limit number of commits
+- `--no-merges` Exclude merge commits
+- `--json` Output JSON
+- `--format <type>` Output format: `text` | `excel` | `json` (default: `text`)
+- `--group-by <type>` Group commits by date: `day` | `month`
+- `--overtime` Analyze overtime culture: output counts/percentages for commits outside work hours and on non-workdays (per-person breakdown)
+  - `--country <code>` Country/region for holidays (CN|US). Default: `CN`.
+  - `--work-start <hour>` Workday start hour. Default: `9`.
+  - `--work-end <hour>` Workday end hour. Default: `18`.
+  - `--lunch-start <hour>` Lunch break start hour. Default: `12`.
+  - `--lunch-end <hour>` Lunch break end hour. Default: `14`.
+- `--stats` Include a `Stats` sheet in the Excel export
+- `--gerrit-api <url>` Optional: Gerrit REST API base URL for resolving `{{changeNumber}}` (e.g. `https://gerrit.example.com/gerrit`)
 - `--gerrit-auth <token>` Optional: Authorization for Gerrit REST API (either `user:pass` for Basic or token string for Bearer)
-- `--gerrit <prefix>`      Show Gerrit URL for each commit (supports templates `{{hash}}`, `{{changeId}}` and `{{changeNumber}}`; `{{changeId}}` falls back to `hash` when absent; `{{changeNumber}}` requires `--gerrit-api` and falls back to `changeId` or `hash`)
-- `--out <file>`           Output file name (without path). Defaults: `commits.json` / `commits.txt` / `commits.xlsx`
-- `--out-dir <dir>`      Output directory path — supports relative or absolute path, e.g., `--out-dir ../output`
-- `--serve`         Start the local web service and view the submission statistics (data files will be generated under output/data)
-- `--port <n>`         Local web service port (default: 3000)
-- `--serve-only`         Only start the web service without exporting or analyzing data (using existing data in output/data)
-- `--version`         show version information
+- `--gerrit <prefix>` Show Gerrit URL for each commit (supports templates `{{hash}}`, `{{changeId}}` and `{{changeNumber}}`; `{{changeId}}` falls back to `hash` when absent; `{{changeNumber}}` requires `--gerrit-api` and falls back to `changeId` or `hash`)
+- `--out <file>` Output file name (without path). Defaults: `commits.json` / `commits.txt` / `commits.xlsx`
+- `--out-dir <dir>` Output directory path — supports relative or absolute path, e.g., `--out-dir ../output`
+- `--serve` Start the local web service and view the submission statistics (data files will be generated under output/data)
+- `--port <n>` Local web service port (default: 3000)
+- `--serve-only` Only start the web service without exporting or analyzing data (using existing data in output/data)
+- `--version` show version information
 
 > Output files are written to an `output/` directory in the current working directory.
 >
 > Tip: Use `--out-parent` or `--out-dir ../output` to write outputs into the parent folder's `output/` to avoid accidentally committing generated files to your repository.
 
 ### Per-period outputs
+
 You can generate per-month and per-week outputs under `output/month/` and `output/week/` using the `--per-period-formats` option. Example:
 
 ```bash
@@ -113,6 +111,7 @@ wukong-gitlog-cli --overtime --limit 200 --format text --out commits.txt --per-p
 ```
 
 ### Serve a local dashboard
+
 You can start a small static web dashboard to visualize commit statistics and charts. It will export raw commits and analyzed stats into `output/data/` as `commits.mjs` and `overtime-stats.mjs`, and start a local web server serving `web/` and `output/data/`:
 
 ```bash
@@ -128,7 +127,9 @@ wukong-gitlog-cli --serve --port 8080 --overtime --limit 200 --out commits.txt
 
 Open `http://localhost:3000` to view the dashboard.
 
-
+<p align="center">
+  <img src="https://raw.githubusercontent.com/tomatobybike/wukong-gitlog-cli/main/images/web/overtime.jpg" width="400" alt="wukong-dev Logo" />
+</p>
 
 ---
 
@@ -209,8 +210,6 @@ wukong-gitlog-cli --out-dir ../output --format text --limit 5 --out custom1.txt
 
 ---
 
-
-
 ```bash
 wukong-gitlog-cli --overtime --limit 500
 ```
@@ -220,7 +219,7 @@ wukong-gitlog-cli --overtime --limit 500
 - The CLI prints helpful messages after exporting files and writes outputs to the `output/` folder in the repo root.
 - Internally `src/utils/index.mjs` acts as a barrel that re-exports helper functions located in `src/utils/`.
 - If you plan to reuse the helpers in other modules, import from `./src/utils/index.mjs` explicitly.
-- The Excel export uses `exceljs` and adds an ``autoFilter`` to the sheet header.
+- The Excel export uses `exceljs` and adds an `autoFilter` to the sheet header.
 
 Suggested `.gitignore` snippet (to avoid accidentally committing generated files):
 
@@ -241,4 +240,3 @@ PRs are welcome — add tests and keep changes modular. If you add new CLI flags
 ## License
 
 MIT
-

package/README.zh-CN.md

@@ -118,7 +118,7 @@ wukong-gitlog-cli --per-period-only
 启动服务器：
 
 ```bash
-wukong-gitlog-cli --serve --overtime --limit 200
+wukong-gitlog-cli --overtime  --serve --port 5555 --limit 200
 ```
 
 浏览器访问：
@@ -127,6 +127,10 @@ wukong-gitlog-cli --serve --overtime --limit 200
 http://localhost:3000
 ```
 
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/tomatobybike/wukong-gitlog-cli/main/images/web/overtime.jpg" width="400" alt="wukong-dev Logo" />
+</p>
 ---
 
 ## 🔗 Gerrit 支持

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wukong-gitlog-cli",
-  "version": "1.0.8",
+  "version": "1.0.11",
   "description": "Advanced Git commit log exporter with Excel/JSON/TXT output, grouping, stats and CLI.",
   "keywords": [
     "git",

package/src/cli.mjs

@@ -1,5 +1,6 @@
 import chalk from 'chalk'
 import { Command } from 'commander'
+import dayjs from 'dayjs'
 import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
@@ -105,6 +106,12 @@ const main = async () => {
       (v) => parseInt(v, 10),
       14
     )
+    .option(
+      '--overnight-cutoff <hour>',
+      '次日凌晨归并窗口（小时），默认 6',
+      (v) => parseInt(v, 10),
+      6
+    )
     .option('--out <file>', '输出文件名（不含路径）')
     .option(
       '--out-dir <dir>',
@@ -351,6 +358,86 @@ const main = async () => {
         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()
+        const overnightCutoff = Number.isFinite(opts.overnightCutoff) ? opts.overnightCutoff : 6
+        const latestByDay = dayKeys2.map((k) => {
+          const list = dayGroups2[k]
+          const vals = list
+            .map((r) => ({ r, _dt: new Date(r.date) }))
+            .filter((x) => x._dt && !Number.isNaN(x._dt.valueOf()))
+            .sort((a, b) => a._dt.valueOf() - b._dt.valueOf())
+          const last = vals.length > 0 ? vals[vals.length - 1] : null
+          const hour = last ? new Date(last.r.date).getHours() : null
+          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())
+            .filter((h) => h >= 0 && h < overnightCutoff)
+          const earlyMax = earlyHours.length > 0 ? Math.max(...earlyHours) : null
+          const normalized = typeof earlyMax === 'number' ? 24 + earlyMax : null
+          const latestHourNormalized = Math.max(
+            typeof hour === 'number' ? hour : -1,
+            typeof normalized === 'number' ? normalized : -1
+          )
+          return { date: k, latestHour: hour, latestHourNormalized: latestHourNormalized >= 0 ? latestHourNormalized : null }
+        })
+        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(

package/src/overtime.mjs

@@ -47,6 +47,8 @@ export function analyzeOvertime(records, opts = {}) {
   let outsideWorkCount = 0;
   let nonWorkdayCount = 0;
   let holidayCount = 0;
+  let nightOutsideCount = 0;
+  let overtimeSeveritySum = 0;
 
   const byAuthor = new Map();
 
@@ -54,6 +56,8 @@ export function analyzeOvertime(records, opts = {}) {
   let endCommit = null;
   let latestCommit = null;
   let latestOutsideCommit = null;
+  let latestCommitHour = null;
+  let latestOutsideCommitHour = null;
 
   // init holiday checker for country
   const hd = new DateHolidays();
@@ -87,9 +91,15 @@ export function analyzeOvertime(records, opts = {}) {
 
     if (outside) {
       outsideWorkCount++;
+      if (hour >= endHour || hour < startHour) {
+        nightOutsideCount++;
+        const sev = hour >= endHour ? (hour - endHour) : (24 - endHour + hour);
+        overtimeSeveritySum += sev;
+      }
       // 记录最新的加班提交
       if (!latestOutsideCommit || dt.isAfter(parseCommitDate(latestOutsideCommit.date))) {
         latestOutsideCommit = r;
+        latestOutsideCommitHour = dt.hour();
       }
     }
     if (isNonWork) nonWorkdayCount++;
@@ -137,6 +147,7 @@ export function analyzeOvertime(records, opts = {}) {
     [startCommit] = validRecords;
     endCommit = validRecords[validRecords.length - 1];
     latestCommit = endCommit;
+    latestCommitHour = parseCommitDate(latestCommit.date).hour();
     // cleanup temp _dt
     for (let i = 0; i < validRecords.length; i++) {
       // copy the object without _dt for safety
@@ -157,12 +168,18 @@ export function analyzeOvertime(records, opts = {}) {
     nonWorkdayCount,
     outsideWorkRate: total ? +(outsideWorkCount / total).toFixed(3) : 0,
     nonWorkdayRate: total ? +(nonWorkdayCount / total).toFixed(3) : 0,
+    nightOutsideCount,
+    nightOutsideRate: total ? +(nightOutsideCount / total).toFixed(3) : 0,
+    overtimeSeveritySum,
+    overtimeSeverityAvg: nightOutsideCount ? +(overtimeSeveritySum / nightOutsideCount).toFixed(2) : 0,
     perAuthor,
     /// 提示：计算 min/max 日期 & latest commit
     startCommit: startCommit || null,
     endCommit: endCommit || null,
     latestCommit: latestCommit || null,
     latestOutsideCommit: latestOutsideCommit || null,
+    latestCommitHour,
+    latestOutsideCommitHour,
     startHour,
     endHour,
     lunchStart,
@@ -178,8 +195,8 @@ export function analyzeOvertime(records, opts = {}) {
 }
 
 export function renderOvertimeText(stats) {
-  const { total, outsideWorkCount, nonWorkdayCount, holidayCount, outsideWorkRate, nonWorkdayRate, holidayRate, perAuthor, startHour, endHour, lunchStart, lunchEnd, country, hourlyOvertimeCommits = [], hourlyOvertimePercent = [] } = stats;
-  const { startCommit, endCommit, latestCommit, latestOutsideCommit } = stats;
+  const { total, outsideWorkCount, nonWorkdayCount, holidayCount, outsideWorkRate, nonWorkdayRate, holidayRate, nightOutsideCount = 0, nightOutsideRate = 0, overtimeSeverityAvg = 0, perAuthor, startHour, endHour, lunchStart, lunchEnd, country, hourlyOvertimeCommits = [], hourlyOvertimePercent = [] } = stats;
+  const { startCommit, endCommit, latestCommit, latestOutsideCommit, latestCommitHour, latestOutsideCommitHour } = stats;
   const lines = [];
 
   const formatPercent = (v) => `${(v * 100).toFixed(1)}%`;
@@ -213,6 +230,7 @@ export function renderOvertimeText(stats) {
     lines.push(`  Author : ${latestCommit.author}`);
     lines.push(`  Date   : ${formatDateForCountry(latestCommit.date, country)}`);
     lines.push(`  Message: ${latestCommit.message}`);
+    if (typeof latestCommitHour === 'number') lines.push(`  Hour   : ${String(latestCommitHour).padStart(2, '0')}:00`);
   }
   if (latestOutsideCommit) {
     lines.push('加班最晚的一次提交：');
@@ -220,12 +238,15 @@ export function renderOvertimeText(stats) {
     lines.push(`  Author : ${latestOutsideCommit.author}`);
     lines.push(`  Date   : ${formatDateForCountry(latestOutsideCommit.date, country)}`);
     lines.push(`  Message: ${latestOutsideCommit.message}`);
+    const h = parseCommitDate(latestOutsideCommit.date).hour();
+    lines.push(`  Hour   : ${String(h).padStart(2, '0')}:00`);
   }
   // country: holiday region, lunchStart/lunchEnd define midday break
   lines.push(`下班时间定义：${startHour}:00 - ${endHour}:00 (午休 ${lunchStart}:00 - ${lunchEnd}:00)`);
   lines.push(`国家假期参考：${String(country).toUpperCase()}，节假日提交数：${holidayCount}，占比：${(holidayRate * 100).toFixed(1)}%`);
   lines.push(`下班时间（工作时间外）提交数：${outsideWorkCount}，占比：${(outsideWorkRate * 100).toFixed(1)}%`);
   lines.push(`非工作日（周末）提交数：${nonWorkdayCount}，占比：${(nonWorkdayRate * 100).toFixed(1)}%`);
+  lines.push(`晚间加班（${endHour}:00–次日${startHour}:00）提交数：${nightOutsideCount}，占比：${(nightOutsideRate * 100).toFixed(1)}%，平均超过下班：${overtimeSeverityAvg} 小时`);
   lines.push('');
   lines.push('每小时加班分布（工作时间外提交数/占比）：');
   const hourLine = '  Hour | OvertimeCount | Percent';
@@ -317,4 +338,3 @@ export function renderOvertimeCsv(stats) {
   });
   return rows.join('\n');
 }
-

package/web/app.js

@@ -3,18 +3,24 @@ const formatDate = (d) => new Date(d).toLocaleString();
 
 async function loadData() {
   try {
-    const [commitsModule, statsModule, weeklyModule] = await Promise.all([
+    const [commitsModule, statsModule, weeklyModule, monthlyModule, latestByDayModule, configModule] = await Promise.all([
       import("/data/commits.mjs"),
       import("/data/overtime-stats.mjs"),
       import("/data/overtime-weekly.mjs"),
+      import("/data/overtime-monthly.mjs").catch(() => ({ default: [] })),
+      import("/data/overtime-latest-by-day.mjs").catch(() => ({ default: [] })),
+      import("/data/config.mjs").catch(() => ({ default: {} })),
     ]);
     const commits = commitsModule.default || [];
     const stats = statsModule.default || {};
     const weekly = weeklyModule.default || [];
-    return { commits, stats, weekly };
+    const monthly = monthlyModule.default || [];
+    const latestByDay = latestByDayModule.default || [];
+    const config = configModule.default || {};
+    return { commits, stats, weekly, monthly, latestByDay, config };
   } catch (err) {
     console.error('Load data failed', err);
-    return { commits: [], stats: {}, weekly: [] };
+    return { commits: [], stats: {}, weekly: [], monthly: [], latestByDay: [] };
   }
 }
 
@@ -157,10 +163,108 @@ function drawWeeklyTrend(weekly) {
   return chart;
 }
 
+function drawMonthlyTrend(monthly) {
+  if (!Array.isArray(monthly) || monthly.length === 0) return null;
+  const labels = monthly.map(m => m.period);
+  const dataRate = monthly.map(m => +(m.outsideWorkRate * 100).toFixed(1));
+  const el = document.getElementById('monthlyTrendChart');
+  const chart = echarts.init(el);
+  chart.setOption({
+    tooltip: {},
+    xAxis: { type: 'category', data: labels },
+    yAxis: { type: 'value', min: 0, max: 100 },
+    series: [{ type: 'line', name: '加班占比(%)', data: dataRate }]
+  });
+  return chart;
+}
+
+function drawLatestHourDaily(latestByDay) {
+  if (!Array.isArray(latestByDay) || latestByDay.length === 0) return null;
+  const labels = latestByDay.map(d => d.date);
+  const raw = latestByDay.map(d => (typeof d.latestHourNormalized === 'number' ? d.latestHourNormalized : d.latestHour ?? null));
+  const data = raw.map(v => ({ value: v, itemStyle: { color: (v >= 24) ? '#d32f2f' : (v >= 21 ? '#fb8c00' : '#1976d2') } }));
+  const el = document.getElementById('latestHourDailyChart');
+  const chart = echarts.init(el);
+  chart.setOption({
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => {
+        const p = Array.isArray(params) ? params[0] : params;
+        const v = p && p.value != null ? Number(p.value) : null;
+        const endH = (window.__overtimeEndHour || 18);
+        const sev = v != null ? Math.max(0, (v >= 24 ? v : v) - endH) : 0;
+        return `${p.axisValue}<br/>最晚小时: ${v != null ? v : '-'}<br/>超过下班: ${sev} 小时`;
+      }
+    },
+    xAxis: { type: 'category', data: labels },
+    yAxis: { type: 'value', min: 0, max: Math.max(26, Math.ceil(Math.max(...raw.filter(v => typeof v === 'number')) + 1)) },
+    series: [{
+      type: 'line',
+      name: '每日最晚提交小时',
+      data,
+      markLine: {
+        data: [
+          { yAxis: 21 },
+          { yAxis: 24 }
+        ],
+        lineStyle: { color: '#fb8c00' }
+      }
+    }]
+  });
+  return chart;
+}
+
+function drawDailySeverity(latestByDay) {
+  if (!Array.isArray(latestByDay) || latestByDay.length === 0) return null;
+  const labels = latestByDay.map(d => d.date);
+  const endH = (window.__overtimeEndHour || 18);
+  const raw = latestByDay.map(d => (typeof d.latestHourNormalized === 'number' ? d.latestHourNormalized : d.latestHour ?? null));
+  const sev = raw.map(v => (v == null ? null : Math.max(0, Number(v) - endH)));
+  const el = document.getElementById('dailySeverityChart');
+  const chart = echarts.init(el);
+  chart.setOption({
+    tooltip: {},
+    xAxis: { type: 'category', data: labels },
+    yAxis: { type: 'value', min: 0 },
+    series: [{
+      type: 'line',
+      name: '超过下班小时数',
+      data: sev,
+      markLine: {
+        symbol: 'none',
+        data: [
+          { yAxis: 1 },
+          { yAxis: 2 }
+        ],
+        lineStyle: { color: '#9e9e9e', type: 'dashed' }
+      }
+    }]
+  });
+  return chart;
+}
+
+function renderKpi(stats) {
+  const el = document.getElementById('kpiContent');
+  if (!el || !stats) return;
+  const latest = stats.latestCommit;
+  const latestHour = stats.latestCommitHour;
+  const latestOut = stats.latestOutsideCommit;
+  const latestOutHour = stats.latestOutsideCommitHour ?? (latestOut ? new Date(latestOut.date).getHours() : null);
+  const cutoff = window.__overnightCutoff ?? 6;
+  const html = [
+    `<div>最晚一次提交时间：${latest ? formatDate(latest.date) : '-'}${typeof latestHour === 'number' ? `（${String(latestHour).padStart(2,'0')}:00）` : ''}</div>`,
+    `<div>加班最晚一次提交时间：${latestOut ? formatDate(latestOut.date) : '-'}${typeof latestOutHour === 'number' ? `（${String(latestOutHour).padStart(2,'0')}:00）` : ''}</div>`,
+    `<div>次日归并窗口：凌晨 <b>${cutoff}</b> 点内归前一日</div>`
+  ].join('');
+  el.innerHTML = html;
+}
+
 (async function main() {
-  const { commits, stats, weekly } = await loadData();
+  const { commits, stats, weekly, monthly, latestByDay, config } = await loadData();
   commitsAll = commits;
   filtered = commitsAll.slice();
+  window.__overtimeEndHour = stats && typeof stats.endHour === 'number' ? stats.endHour : (config.endHour ?? 18);
+  window.__overnightCutoff = typeof config.overnightCutoff === 'number' ? config.overnightCutoff : 6;
   initTableControls();
   updatePager();
   renderCommitsTablePage();
@@ -168,4 +272,8 @@ function drawWeeklyTrend(weekly) {
   drawOutsideVsInside(stats);
   drawDailyTrend(commits);
   drawWeeklyTrend(weekly);
+  drawMonthlyTrend(monthly);
+  drawLatestHourDaily(latestByDay);
+  drawDailySeverity(latestByDay);
+  renderKpi(stats);
 })();

package/web/index.html

@@ -17,7 +17,10 @@
           <h2>下班时间 vs 工作时间提交占比</h2>
           <div id="outsideVsInsideChart" class="echart"></div>
         </div>
-        <div class="chart-card"></div>
+        <div class="chart-card" id="kpiCard">
+          <h2>关键指标</h2>
+          <div id="kpiContent"></div>
+        </div>
       </section>
       <section id="charts">
         <div class="chart-card">
@@ -33,6 +36,18 @@
           <h2>每周趋势（加班占比）</h2>
           <div id="weeklyTrendChart" class="echart"></div>
         </div>
+        <div class="chart-card">
+          <h2>每月趋势（加班占比）</h2>
+          <div id="monthlyTrendChart" class="echart"></div>
+        </div>
+        <div class="chart-card">
+          <h2>每日最晚提交时间（小时）</h2>
+          <div id="latestHourDailyChart" class="echart"></div>
+        </div>
+        <div class="chart-card">
+          <h2>每日超过下班的小时数</h2>
+          <div id="dailySeverityChart" class="echart"></div>
+        </div>
       </section>
 
       <section class="table-card">