wukong-gitlog-cli 0.0.7 → 0.0.9

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.
 
+### [0.0.9](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v0.0.8...v0.0.9) (2025-11-28)
+
+### [0.0.8](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v0.0.7...v0.0.8) (2025-11-28)
+
+
+### Features
+
+* 🎸 --overtime ([636633b](https://github.com/tomatobybike/wukong-gitlog-cli/commit/636633b424f8e440f53eeaabee1c9ffdbbbdcd04))
+* 🎸 cn datetime format ([7773b08](https://github.com/tomatobybike/wukong-gitlog-cli/commit/7773b084dadae415edc12a735bc450353ec127bf))
+* 🎸 export excel ([2e87900](https://github.com/tomatobybike/wukong-gitlog-cli/commit/2e87900af98883a1440871b2db6b581b158a3b1f))
+* 🎸 last work ([c31edff](https://github.com/tomatobybike/wukong-gitlog-cli/commit/c31edff080d7e8b1d6b1c2c9bdee2da57abaa3a0))
+* 🎸 last work ([64fcf3f](https://github.com/tomatobybike/wukong-gitlog-cli/commit/64fcf3f9fa0f4c7055b2aa39368f3553b41093b3))
+* 🎸 weekly monthly ([a4f76dd](https://github.com/tomatobybike/wukong-gitlog-cli/commit/a4f76dd31192ee740f73f160729f6e4a8d32542f))
+* **overtime:** add monthly and weekly overtime summary files ([024f3d4](https://github.com/tomatobybike/wukong-gitlog-cli/commit/024f3d497439106fabf8718bfd8076767404f7e8))
+
 ### [0.0.7](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v0.0.6...v0.0.7) (2025-11-27)
 
 ### [0.0.6](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v0.0.5...v0.0.6) (2025-11-27)

package/README.md

@@ -88,6 +88,27 @@ Command-line options:
 >
 > 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
+wukong-gitlog-cli ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab
+```
+
+Want per-period Excel outputs? Use `xlsx` along with `--per-period-excel-mode` for `sheets` or `files`:
+
+```bash
+wukong-gitlog-cli ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab,xlsx --per-period-excel-mode sheets
+wukong-gitlog-cli ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats xlsx --per-period-excel-mode files
+```
+
+If you'd like only per-period outputs and not the combined monthly/weekly summary files, add `--per-period-only`:
+
+```bash
+wukong-gitlog-cli ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab,xlsx --per-period-only
+```
+
+
 ---
 
 ## Gerrit support
@@ -167,124 +188,12 @@ wukong-gitlog-cli --out-dir ../output --format text --limit 5 --out custom1.txt
 
 ---
 
-## Quick demo (npm scripts)
-
-We provided a few convenient npm scripts to quickly run common scenarios. Run them from the project root:
-
-```bash
-# show help
-npm run cli:help
-
-# simple text export (commits.txt in ./output)
-npm run cli:text-demo
-
-# Excel export with stats (commits.xlsx + commits.txt in ./output)
-npm run cli:excel-demo
-
-# JSON export (commits.json in ./output)
-npm run cli:json-demo
-
-# Gerrit text export demo
-npm run cli:gerrit-demo
-# Gerrit Change-Id demo (use commit Change-Id to build Gerrit URLs when present)
-npm run cli:gerrit-changeid-demo
-```
-
-If you prefer to write output outside the project (e.g., a parent `output/` folder), we also provide `npm` scripts that run with `--out-parent`:
-
-```bash
-# text export to parent `output/`
-npm run cli:text-demo-parent
-
-# excel export to parent `output/`
-npm run cli:excel-demo-parent
-```
-
-Example text output (from `npm run cli:text-demo`):
-
-```text
-Hash       | Author             | Date                 | Message
----------------------------------------------------------------------------------------------------------------------
-c5bdf9d4   | tom                | 2025-11-25           | feat: 🎸 增加output目录
 
-ea82531   | tom                | 2025-11-25           | feat: 🎸 init
-
-741de50   | tom                | 2025-11-25           | first commit
-```
-
-You can also analyze overtime culture with the `--overtime` flag to get overall and per-person overtime submission rates (default work window is 09:00-18:00). Example:
 
 ```bash
 wukong-gitlog-cli --overtime --limit 500
 ```
 
-## Overtime demo scripts (npm)
-
-Below are helpful npm scripts added for quickly running the overtime analysis with commonly used configurations. They are already present in `package.json` and can be run from the project root.
-
-```bash
-# Run a US-focused overtime text report using 10:00-19:00 work hours and a 12:00-13:00 lunch break
-npm run cli:overtime-text-us
-
-# Run a US-focused overtime text report and write the outputs into the project parent's output folder
-npm run cli:overtime-text-us-parent
-
-# Run a US-focused overtime text report and write the output into ../output (explicit --out-dir)
-npm run cli:overtime-text-us-outdir
-
-# Run a CN-focused overtime Excel report (default 9:00-18:00 work hours and 12:00-14:00 lunch)
-npm run cli:overtime-excel-cn
-
-# Run a CN-focused overtime Excel report and write outputs to parent output folder
-npm run cli:overtime-excel-cn-parent
-
-# Run a CN-focused overtime Excel report and write outputs to ../output via --out-dir
-npm run cli:overtime-excel-cn-outdir
-```
-
-Notes:
-
-- Output files are written into `output/` by default. Use `--out-dir` or `--out-parent` to change output location.
-- If you prefer different working hours or country codes, either modify the script in `package.json` or run the CLI manually with flags (e.g. `--work-start`, `--work-end`, `--lunch-start`, `--lunch-end`, `--country`).
-
-Formatting note:
-
-- The text report is formatted to align columns correctly even when commit messages or author names contain mixed Chinese and English characters (uses `string-width` for display-aware padding).
-
-Example JSON output (from `npm run cli:json-demo`):
-
-```json
-[
-  {
-    "hash": "c5bdf9d4f52f39bd7d580318bafc8ba4b6c129bc",
-    "author": "tom",
-    "email": "",
-    "date": "2025-11-25 17:24:32 +0800",
-    "message": "feat: 🎸 增加output目录"
-  }
-  /* truncated... */
-]
-```
-
-Example JSON output including `changeId`/`gerrit` when `--gerrit` uses `{{changeId}}` (if present in commit):
-
-```json
-[
-  {
-    "hash": "Iabc...",
-    "author": "tom",
-    "email": "",
-    "date": "2025-11-25 17:24:32 +0800",
-    "message": "feat: add feature",
-    "body": "feat: add feature\n\nChange-Id: Iabcd123456789",
-    "changeId": "Iabcd123456789",
-    "gerrit": "https://gerrit.example.com/c/project/+/Iabcd123456789"
-  }
-]
-```
-
----
-
 ## Notes & Developer Info
 
 - The CLI prints helpful messages after exporting files and writes outputs to the `output/` folder in the repo root.

package/doc/help.md

@@ -0,0 +1,194 @@
+### 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
+node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab
+```
+
+Want per-period Excel outputs? Use `xlsx` along with `--per-period-excel-mode` for `sheets` or `files`:
+
+```bash
+node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab,xlsx --per-period-excel-mode sheets
+node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats xlsx --per-period-excel-mode files
+```
+
+If you'd like only per-period outputs and not the combined monthly/weekly summary files, add `--per-period-only`:
+
+```bash
+node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab,xlsx --per-period-only
+```
+
+---
+
+## Gerrit support
+
+Use the `--gerrit` option to include a Gerrit link for each commit. You can provide a template containing `{{hash}}` to place the full commit hash into the URL, for example:
+
+```bash
+wukong-gitlog-cli --gerrit "https://gerrit.example.com/c/project/+/{{hash}}" --limit 5 --format text
+```
+
+If `{{hash}}` is not present, the CLI will append the commit hash to the prefix with a `/` separator.
+
+You can also use `{{changeId}}` in the template to reference Gerrit change id. The tool will try to extract a `Change-Id: I...` value from the commit body and replace `{{changeId}}` with it. If it can't find a `Change-Id`, the CLI will fall back to using the commit `hash`.
+
+The Gerrit link will show up in:
+
+- The text output if `--format text` (as a new `Gerrit` column)
+- The Excel export as a `Gerrit` column if `--format excel`
+- JSON output will include a `gerrit` field for each record when `--gerrit` is used
+- JSON output will include a `gerrit` field for each record when `--gerrit` is used
+- When `--gerrit` uses `{{changeId}}`, the CLI will try to extract `Change-Id:` from the commit body and include `changeId` and `body` in the JSON record. If no `Change-Id` is present, the CLI falls back to `hash` when forming the Gerrit URL.
+
+Note: `--out <file>` is the filename only and the directory used to store that file depends on:
+
+- The default directory `./output/` in the current working directory
+- `--out-dir <dir>` to override the target folder (relative or absolute)
+- `--out-parent` to write to the parent repository folder `../output/` (same as `--out-dir ../output`)
+
+For example:
+
+```bash
+# using globally installed CLI
+wukong-gitlog-cli --out parent.json --out-parent
+wukong-gitlog-cli --out demo.txt --out-dir ../temp
+```
+
+---
+
+## Examples
+
+Export as text, grouped by month, with Gerrit links:
+
+```bash
+wukong-gitlog-cli --format text --group-by month --gerrit "https://gerrit.example.com/c/project/+/{{hash}}"
+```
+
+---
+
+## Quick demo (npm scripts)
+
+We provided a few convenient npm scripts to quickly run common scenarios. Run them from the project root:
+
+```bash
+# show help
+npm run cli:help
+
+# simple text export (commits.txt in ./output)
+npm run cli:text-demo
+
+# Excel export with stats (commits.xlsx + commits.txt in ./output)
+npm run cli:excel-demo
+
+# JSON export (commits.json in ./output)
+npm run cli:json-demo
+
+# Gerrit text export demo
+npm run cli:gerrit-demo
+# Gerrit Change-Id demo (use commit Change-Id to build Gerrit URLs when present)
+npm run cli:gerrit-changeid-demo
+```
+
+If you prefer to write output outside the project (e.g., a parent `output/` folder), we also provide `npm` scripts that run with `--out-parent`:
+
+```bash
+# text export to parent `output/`
+npm run cli:text-demo-parent
+
+# excel export to parent `output/`
+npm run cli:excel-demo-parent
+```
+
+Example text output (from `npm run cli:text-demo`):
+
+```text
+Hash       | Author             | Date                 | Message
+---------------------------------------------------------------------------------------------------------------------
+c5bdf9d4   | tom                | 2025-11-25           | feat: 🎸 增加output目录
+
+ea82531   | tom                | 2025-11-25           | feat: 🎸 init
+
+741de50   | tom                | 2025-11-25           | first commit
+```
+
+You can also analyze overtime culture with the `--overtime` flag to get overall and per-person overtime submission rates (default work window is 09:00-18:00). Example:
+
+```bash
+wukong-gitlog-cli --overtime --limit 500
+```
+
+## Overtime demo scripts (npm)
+
+Below are helpful npm scripts added for quickly running the overtime analysis with commonly used configurations. They are already present in `package.json` and can be run from the project root.
+
+```bash
+# Run a US-focused overtime text report using 10:00-19:00 work hours and a 12:00-13:00 lunch break
+npm run cli:overtime-text-us
+
+# Run a US-focused overtime text report and write the outputs into the project parent's output folder
+npm run cli:overtime-text-us-parent
+
+# Run a US-focused overtime text report and write the output into ../output (explicit --out-dir)
+npm run cli:overtime-text-us-outdir
+
+# Run a CN-focused overtime Excel report (default 9:00-18:00 work hours and 12:00-14:00 lunch)
+npm run cli:overtime-excel-cn
+
+# Run a CN-focused overtime Excel report and write outputs to parent output folder
+npm run cli:overtime-excel-cn-parent
+
+# Run a CN-focused overtime Excel report and write outputs to ../output via --out-dir
+npm run cli:overtime-excel-cn-outdir
+# Per-period CSV/Tab export: write per-period files to output/month/ and output/week/
+npm run cli:overtime-per-period-csv-tab
+# Per-period Excel export with sheet-per-period workbook
+npm run cli:overtime-per-period-xlsx-sheets
+# Per-period Excel export with one file per period
+npm run cli:overtime-per-period-xlsx-files
+# Per-period only (no consolidated monthly/weekly files)
+npm run cli:overtime-per-period-only
+```
+
+Notes:
+
+- Output files are written into `output/` by default. Use `--out-dir` or `--out-parent` to change output location.
+- If you prefer different working hours or country codes, either modify the script in `package.json` or run the CLI manually with flags (e.g. `--work-start`, `--work-end`, `--lunch-start`, `--lunch-end`, `--country`).
+
+Formatting note:
+
+- The text report is formatted to align columns correctly even when commit messages or author names contain mixed Chinese and English characters (uses `string-width` for display-aware padding).
+
+Example JSON output (from `npm run cli:json-demo`):
+
+```json
+[
+  {
+    "hash": "c5bdf9d4f52f39bd7d580318bafc8ba4b6c129bc",
+    "author": "tom",
+    "email": "",
+    "date": "2025-11-25 17:24:32 +0800",
+    "message": "feat: 🎸 增加output目录"
+  }
+  /* truncated... */
+]
+```
+
+Example JSON output including `changeId`/`gerrit` when `--gerrit` uses `{{changeId}}` (if present in commit):
+
+```json
+[
+  {
+    "hash": "Iabc...",
+    "author": "tom",
+    "email": "",
+    "date": "2025-11-25 17:24:32 +0800",
+    "message": "feat: add feature",
+    "body": "feat: add feature\n\nChange-Id: Iabcd123456789",
+    "changeId": "Iabcd123456789",
+    "gerrit": "https://gerrit.example.com/c/project/+/Iabcd123456789"
+  }
+]
+```
+
+---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wukong-gitlog-cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Advanced Git commit log exporter with Excel/JSON/TXT output, grouping, stats and CLI.",
   "keywords": [
     "git",
@@ -37,7 +37,7 @@
     "wukong-gitlog-cli": "./bin/wukong-gitlog-cli"
   },
   "scripts": {
-    "cli:excel-demo": "node ./src/cli.mjs --format excel --stats --limit 5 --out commits.xlsx",
+    "cli:excel-demo": "node ./src/cli.mjs --overtime --format excel --stats --limit 5 --out commits.xlsx",
     "cli:excel-demo-parent": "node ./src/cli.mjs --out-parent --format excel --stats --limit 5 --out commits-parent.xlsx",
     "cli:gerrit-changeid-demo": "node ./src/cli.mjs --format text --gerrit \"https://gerrit.example.com/c/project/+/{{changeId}}\" --limit 5 --out commits-gerrit-changeid.txt",
     "cli:gerrit-demo": "node ./src/cli.mjs --format text --gerrit \"https://gerrit.example.com/c/project/+/{{hash}}\" --limit 5 --out commits-gerrit.txt",
@@ -54,6 +54,10 @@
     "cli:overtime-excel-cn": "node ./src/cli.mjs --overtime --limit 50 --format excel --out commits.xlsx --country CN",
     "cli:overtime-excel-cn-parent": "node ./src/cli.mjs --out-parent --overtime --limit 50 --format excel --out commits.xlsx --country CN",
     "cli:overtime-excel-cn-outdir": "node ./src/cli.mjs --out-dir ../output --overtime --limit 50 --format excel --out commits.xlsx --country CN",
+    "cli:overtime-per-period-csv-tab": "node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab",
+    "cli:overtime-per-period-xlsx-sheets": "node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab,xlsx --per-period-excel-mode sheets",
+    "cli:overtime-per-period-xlsx-files": "node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats xlsx --per-period-excel-mode files",
+    "cli:overtime-per-period-only": "node ./src/cli.mjs --overtime --limit 200 --format text --out commits.txt --per-period-formats csv,tab,xlsx --per-period-only",
     "format": "prettier --write \"src/**/*.{js,mjs}\"",
     "lint": "eslint src --ext .js,.mjs src",
     "lint:fix": "eslint src --ext .js,.mjs --fix",

package/src/cli.mjs

@@ -4,7 +4,7 @@ import path from 'path';
 import { getGitLogs } from './git.mjs';
 import { renderText } from './text.mjs';
 import { analyzeOvertime, renderOvertimeText, renderOvertimeTab, renderOvertimeCsv } from './overtime.mjs';
-import { exportExcel } from './excel.mjs';
+import { exportExcel, exportExcelPerPeriodSheets } from './excel.mjs';
 import { groupRecords, writeJSON, writeTextFile, outputFilePath } from './utils/index.mjs';
 
 const program = new Command();
@@ -20,7 +20,7 @@ program
   .option('--no-merges', '不包含 merge commit')
   .option('--json', '输出 JSON')
   .option('--format <type>', '输出格式: text | excel | json', 'text')
-  .option('--group-by <type>', '按日期分组: day | month')
+  .option('--group-by <type>', '按日期分组: day | month | week')
   .option('--stats', '输出每日统计数据')
   .option('--gerrit <prefix>', '显示 Gerrit 地址，支持在 prefix 中使用 {{hash}} 占位符')
   .option('--gerrit-api <url>', '可选：Gerrit REST API 基础地址，用于解析 changeNumber，例如 `https://gerrit.example.com`')
@@ -34,6 +34,9 @@ program
   .option('--out <file>', '输出文件名（不含路径）')
   .option('--out-dir <dir>', '自定义输出目录，支持相对路径或绝对路径，例如 `--out-dir ../output`')
   .option('--out-parent', '将输出目录放到当前工程的父目录的 `output/`（等同于 `--out-dir ../output`）')
+  .option('--per-period-formats <formats>', '每个周期单独输出的格式，逗号分隔：text,csv,tab,xlsx。默认为空（不输出 CSV/Tab/XLSX）', '')
+  .option('--per-period-excel-mode <mode>', 'per-period Excel 模式：sheets|files（默认：sheets）', 'sheets')
+  .option('--per-period-only', '仅输出 per-period（month/week）文件，不输出合并的 monthly/weekly 汇总文件')
   .parse();
 
 const opts = program.opts();
@@ -175,6 +178,169 @@ const opts = program.opts();
     console.log(chalk.green(`Overtime text 已导出: ${overtimeFile}`));
     console.log(chalk.green(`Overtime table (tabs) 已导出: ${overtimeTabFile}`));
     console.log(chalk.green(`Overtime CSV 已导出: ${overtimeCsvFile}`));
+    // 按月输出每个月的加班统计（合并文件 + individual files in month/）
+    const perPeriodFormats = String(opts.perPeriodFormats || '').split(',').map(s => String(s || '').trim().toLowerCase()).filter(Boolean);
+    try {
+      const monthGroups = groupRecords(records, 'month');
+      const monthlyFileName = `overtime_${outBase}_monthly.txt`;
+      const monthlyFile = outputFilePath(monthlyFileName, outDir);
+      let monthlyContent = '';
+      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',
+        });
+        monthlyContent += `===== ${k} =====\n`;
+        monthlyContent += `${renderOvertimeText(s)}\n\n`;
+        // Also write a single file per month under 'month/' folder
+        try {
+          const perMonthFileName = `month/overtime_${outBase}_${k}.txt`;
+          const perMonthFile = outputFilePath(perMonthFileName, outDir);
+          writeTextFile(perMonthFile, renderOvertimeText(s));
+          console.log(chalk.green(`Overtime 月度(${k}) 已导出: ${perMonthFile}`));
+        // per-period CSV / Tab format (按需生成)
+        if (perPeriodFormats.includes('csv')) {
+          try {
+            const perMonthCsvName = `month/overtime_${outBase}_${k}.csv`;
+            writeTextFile(outputFilePath(perMonthCsvName, outDir), renderOvertimeCsv(s));
+            console.log(chalk.green(`Overtime 月度(CSV)(${k}) 已导出: ${outputFilePath(perMonthCsvName, outDir)}`));
+          } catch (err) {
+            console.warn(`Write monthly CSV for ${k} failed:`, err && err.message ? err.message : err);
+          }
+        }
+        if (perPeriodFormats.includes('tab')) {
+          try {
+            const perMonthTabName = `month/overtime_${outBase}_${k}.tab.txt`;
+            writeTextFile(outputFilePath(perMonthTabName, outDir), renderOvertimeTab(s));
+            console.log(chalk.green(`Overtime 月度(Tab)(${k}) 已导出: ${outputFilePath(perMonthTabName, outDir)}`));
+          } catch (err) {
+            console.warn(`Write monthly Tab for ${k} failed:`, err && err.message ? err.message : err);
+          }
+        }
+        } catch (err) {
+          console.warn(`Write monthly file for ${k} failed:`, err && err.message ? err.message : err);
+        }
+      });
+      if (!opts.perPeriodOnly) {
+        writeTextFile(monthlyFile, monthlyContent);
+        console.log(chalk.green(`Overtime 月度汇总 已导出: ${monthlyFile}`));
+      }
+      // per-period Excel (sheets or files)
+      if (perPeriodFormats.includes('xlsx')) {
+        const perPeriodExcelMode = String(opts.perPeriodExcelMode || 'sheets');
+        if (perPeriodExcelMode === 'sheets') {
+          try {
+            const monthXlsxName = `month/overtime_${outBase}_monthly.xlsx`;
+            const monthXlsxFile = outputFilePath(monthXlsxName, outDir);
+            await exportExcelPerPeriodSheets(monthGroups, monthXlsxFile, { stats: opts.stats, gerrit: opts.gerrit });
+            console.log(chalk.green(`Overtime 月度(XLSX) 已导出: ${monthXlsxFile}`));
+          } catch (err) {
+            console.warn('Export month XLSX (sheets) failed:', err && err.message ? err.message : err);
+          }
+        } else {
+          try {
+            const monthKeys2 = Object.keys(monthGroups).sort();
+            const tasks = monthKeys2.map(k2 => {
+              const perMonthXlsxName = `month/overtime_${outBase}_${k2}.xlsx`;
+              const perMonthXlsxFile = outputFilePath(perMonthXlsxName, outDir);
+              return exportExcel(monthGroups[k2], null, { file: perMonthXlsxFile, stats: opts.stats, gerrit: opts.gerrit })
+                .then(() => console.log(chalk.green(`Overtime 月度(XLSX)(${k2}) 已导出: ${perMonthXlsxFile}`)));
+            });
+            await Promise.all(tasks);
+          } catch (err) {
+            console.warn('Export monthly XLSX files failed:', err && err.message ? err.message : err);
+          }
+        }
+      }
+    } catch (err) {
+      console.warn('Generate monthly overtime failed:', err && err.message ? err.message : err);
+    }
+    // 按周输出每周的加班统计（合并文件 + individual files in week/）
+    try {
+      const weekGroups = groupRecords(records, 'week');
+      const weeklyFileName = `overtime_${outBase}_weekly.txt`;
+      const weeklyFile = outputFilePath(weeklyFileName, outDir);
+      let weeklyContent = '';
+      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',
+        });
+        weeklyContent += `===== ${k} =====\n`;
+        weeklyContent += `${renderOvertimeText(s)}\n\n`;
+        // Also write a single file per week under 'week/' folder
+        try {
+          const perWeekFileName = `week/overtime_${outBase}_${k}.txt`;
+          const perWeekFile = outputFilePath(perWeekFileName, outDir);
+          writeTextFile(perWeekFile, renderOvertimeText(s));
+          console.log(chalk.green(`Overtime 周度(${k}) 已导出: ${perWeekFile}`));
+        // per-period CSV / Tab format (按需生成)
+        if (perPeriodFormats.includes('csv')) {
+          try {
+            const perWeekCsvName = `week/overtime_${outBase}_${k}.csv`;
+            writeTextFile(outputFilePath(perWeekCsvName, outDir), renderOvertimeCsv(s));
+            console.log(chalk.green(`Overtime 周度(CSV)(${k}) 已导出: ${outputFilePath(perWeekCsvName, outDir)}`));
+          } catch (err) {
+            console.warn(`Write weekly CSV for ${k} failed:`, err && err.message ? err.message : err);
+          }
+        }
+        if (perPeriodFormats.includes('tab')) {
+          try {
+            const perWeekTabName = `week/overtime_${outBase}_${k}.tab.txt`;
+            writeTextFile(outputFilePath(perWeekTabName, outDir), renderOvertimeTab(s));
+            console.log(chalk.green(`Overtime 周度(Tab)(${k}) 已导出: ${outputFilePath(perWeekTabName, outDir)}`));
+          } catch (err) {
+            console.warn(`Write weekly Tab for ${k} failed:`, err && err.message ? err.message : err);
+          }
+        }
+        } catch (err) {
+          console.warn(`Write weekly file for ${k} failed:`, err && err.message ? err.message : err);
+        }
+      });
+      if (!opts.perPeriodOnly) {
+        writeTextFile(weeklyFile, weeklyContent);
+        console.log(chalk.green(`Overtime 周度汇总 已导出: ${weeklyFile}`));
+      }
+      // per-period Excel (sheets or files)
+      if (perPeriodFormats.includes('xlsx')) {
+        const perPeriodExcelMode = String(opts.perPeriodExcelMode || 'sheets');
+        if (perPeriodExcelMode === 'sheets') {
+          try {
+            const weekXlsxName = `week/overtime_${outBase}_weekly.xlsx`;
+            const weekXlsxFile = outputFilePath(weekXlsxName, outDir);
+            await exportExcelPerPeriodSheets(weekGroups, weekXlsxFile, { stats: opts.stats, gerrit: opts.gerrit });
+            console.log(chalk.green(`Overtime 周度(XLSX) 已导出: ${weekXlsxFile}`));
+          } catch (err) {
+            console.warn('Export week XLSX (sheets) failed:', err && err.message ? err.message : err);
+          }
+        } else {
+          try {
+            const weekKeys2 = Object.keys(weekGroups).sort();
+            const tasks2 = weekKeys2.map(k2 => {
+              const perWeekXlsxName = `week/overtime_${outBase}_${k2}.xlsx`;
+              const perWeekXlsxFile = outputFilePath(perWeekXlsxName, outDir);
+              return exportExcel(weekGroups[k2], null, { file: perWeekXlsxFile, stats: opts.stats, gerrit: opts.gerrit })
+                .then(() => console.log(chalk.green(`Overtime 周度(XLSX)(${k2}) 已导出: ${perWeekXlsxFile}`)));
+            });
+            await Promise.all(tasks2);
+          } catch (err) {
+            console.warn('Export weekly XLSX files failed:', err && err.message ? err.message : err);
+          }
+        }
+      }
+    } catch (err) {
+      console.warn('Generate weekly overtime failed:', err && err.message ? err.message : err);
+    }
     // don't return — allow other outputs to proceed
   }
 

package/src/excel.mjs

@@ -50,3 +50,48 @@ export async function exportExcel(records, groups, options = {}) {
 
   await wb.xlsx.writeFile(file);
 }
+
+export async function exportExcelPerPeriodSheets(groups, file, options = {}) {
+  // groups: { periodKey: [records] }
+  const { stats, gerrit } = options;
+
+  const wb = new ExcelJS.Workbook();
+
+  const cols = [
+    { header: 'Hash', key: 'hash', width: 12 },
+    { header: 'Author', key: 'author', width: 20 },
+    { header: 'Email', key: 'email', width: 30 },
+    { header: 'Date', key: 'date', width: 20 },
+    { header: 'Message', key: 'message', width: 80 }
+  ];
+  if (gerrit) cols.push({ header: 'Gerrit', key: 'gerrit', width: 50 });
+
+  const keys = Object.keys(groups).sort();
+  keys.forEach((k) => {
+    const ws = wb.addWorksheet(String(k).slice(0, 31)); // Excel sheet name limit 31
+    ws.columns = cols;
+    groups[k].forEach(r => ws.addRow(r));
+    ws.autoFilter = { from: { row: 1, column: 1 }, to: { row: 1, column: cols.length } };
+  });
+
+  // summary sheet with counts per period
+  const summary = wb.addWorksheet('Summary');
+  summary.columns = [
+    { header: 'Period', key: 'period', width: 20 },
+    { header: 'Commits', key: 'count', width: 12 }
+  ];
+  keys.forEach(k => summary.addRow({ period: k, count: groups[k].length }));
+
+  await wb.xlsx.writeFile(file);
+}
+
+export async function exportExcelPerPeriodFiles(groups, dir, filePrefix, options = {}) {
+  // groups: { periodKey: [records] }
+  // dir: output directory path, filePrefix: base name without extension
+  // For each key, call exportExcel with that key's records
+  const keys = Object.keys(groups).sort();
+  for (const k of keys) {
+    const perFile = `${dir}/overtime_${filePrefix}_${k}.xlsx`;
+    await exportExcel(groups[k], null, { file: perFile, stats: options.stats, gerrit: options.gerrit });
+  }
+}

package/src/overtime.mjs

@@ -14,6 +14,20 @@ export function parseCommitDate(d) {
   return dt;
 }
 
+function formatDateForCountry(dateStr, country) {
+  try {
+    const dt = parseCommitDate(dateStr);
+    if (!dt || !dt.isValid()) return dateStr;
+    if (String(country).toUpperCase() === 'CN') {
+      // Force display in +08:00 timezone
+      return dt.utcOffset(8 * 60).format('YYYY-MM-DD HH:mm:ss ZZ');
+    }
+    return dt.format('YYYY-MM-DD HH:mm:ss ZZ');
+  } catch (err) {
+    return dateStr;
+  }
+}
+
 function isWeekend(dt) {
   const day = dt.day();
   return day === 0 || day === 6; // Sunday=0, Saturday=6
@@ -39,6 +53,7 @@ export function analyzeOvertime(records, opts = {}) {
   let startCommit = null;
   let endCommit = null;
   let latestCommit = null;
+  let latestOutsideCommit = null;
 
   // init holiday checker for country
   const hd = new DateHolidays();
@@ -57,7 +72,13 @@ export function analyzeOvertime(records, opts = {}) {
     const isHoliday = !!hd.isHoliday(dt.toDate());
     const isNonWork = isWeekend(dt) || isHoliday;
 
-    if (outside) outsideWorkCount++;
+    if (outside) {
+      outsideWorkCount++;
+      // 记录最新的加班提交
+      if (!latestOutsideCommit || dt.isAfter(parseCommitDate(latestOutsideCommit.date))) {
+        latestOutsideCommit = r;
+      }
+    }
     if (isNonWork) nonWorkdayCount++;
     if (isHoliday) holidayCount++;
 
@@ -124,6 +145,7 @@ export function analyzeOvertime(records, opts = {}) {
     startCommit: startCommit || null,
     endCommit: endCommit || null,
     latestCommit: latestCommit || null,
+    latestOutsideCommit: latestOutsideCommit || null,
     startHour,
     endHour,
       lunchStart,
@@ -136,7 +158,7 @@ export function analyzeOvertime(records, opts = {}) {
 
 export function renderOvertimeText(stats) {
   const { total, outsideWorkCount, nonWorkdayCount, holidayCount, outsideWorkRate, nonWorkdayRate, holidayRate, perAuthor, startHour, endHour, lunchStart, lunchEnd, country } = stats;
-  const { startCommit, endCommit, latestCommit } = stats;
+  const { startCommit, endCommit, latestCommit, latestOutsideCommit } = stats;
   const lines = [];
 
   const formatPercent = (v) => `${(v * 100).toFixed(1)}%`;
@@ -162,15 +184,22 @@ export function renderOvertimeText(stats) {
   };
   lines.push(`总提交数：${total}`);
   if (startCommit && endCommit) {
-    lines.push(`统计区间：${startCommit.date} — ${endCommit.date}`);
+    lines.push(`统计区间：${formatDateForCountry(startCommit.date, country)} — ${formatDateForCountry(endCommit.date, country)}`);
   }
   if (latestCommit) {
     lines.push('最晚一次提交：');
     lines.push(`  Hash   : ${latestCommit.hash}`);
     lines.push(`  Author : ${latestCommit.author}`);
-    lines.push(`  Date   : ${latestCommit.date}`);
+    lines.push(`  Date   : ${formatDateForCountry(latestCommit.date, country)}`);
     lines.push(`  Message: ${latestCommit.message}`);
   }
+  if (latestOutsideCommit) {
+    lines.push('加班最晚的一次提交：');
+    lines.push(`  Hash   : ${latestOutsideCommit.hash}`);
+    lines.push(`  Author : ${latestOutsideCommit.author}`);
+    lines.push(`  Date   : ${formatDateForCountry(latestOutsideCommit.date, country)}`);
+    lines.push(`  Message: ${latestOutsideCommit.message}`);
+  }
   // 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)}%`);
@@ -196,11 +225,12 @@ export function renderOvertimeText(stats) {
 
 export function renderOvertimeTab(stats) {
   const { total, outsideWorkCount, nonWorkdayCount, holidayCount, outsideWorkRate, nonWorkdayRate, holidayRate, perAuthor, startHour, endHour, lunchStart, lunchEnd, country } = stats;
-  const { startCommit, endCommit, latestCommit } = stats;
+  const { startCommit, endCommit, latestCommit, latestOutsideCommit } = stats;
   const rows = [];
   rows.push(`总提交数:\t${total}`);
-  if (startCommit && endCommit) rows.push(`统计区间:\t${startCommit.date} — ${endCommit.date}`);
-  if (latestCommit) rows.push(`最晚一次提交:\t${latestCommit.hash}\t${latestCommit.author}\t${latestCommit.date}\t${latestCommit.message}`);
+  if (startCommit && endCommit) rows.push(`统计区间:\t${formatDateForCountry(startCommit.date, country)} — ${formatDateForCountry(endCommit.date, country)}`);
+  if (latestCommit) rows.push(`最晚一次提交:\t${latestCommit.hash}\t${latestCommit.author}\t${formatDateForCountry(latestCommit.date, country)}\t${latestCommit.message}`);
+  if (latestOutsideCommit) rows.push(`加班最晚的一次提交:\t${latestOutsideCommit.hash}\t${latestOutsideCommit.author}\t${formatDateForCountry(latestOutsideCommit.date, country)}\t${latestOutsideCommit.message}`);
   rows.push(`下班时间定义:\t${startHour}:00 - ${endHour}:00 (午休 ${lunchStart}:00 - ${lunchEnd}:00)`);
   rows.push(`国家假期参考:\t${String(country).toUpperCase()}\t节假日提交数:\t${holidayCount}\t节假日占比:\t${(holidayRate * 100).toFixed(1)}%`);
   rows.push(`下班时间（工作时间外）提交数:\t${outsideWorkCount}\t占比:\t${(outsideWorkRate * 100).toFixed(1)}%`);
@@ -222,8 +252,12 @@ function escapeCsv(v) {
 }
 
 export function renderOvertimeCsv(stats) {
-  const { perAuthor } = stats;
+  const { perAuthor, latestOutsideCommit, country } = stats;
   const rows = [];
+  if (latestOutsideCommit) {
+    rows.push(`# 加班最晚的一次提交,Hash,Author,Date,Message`);
+    rows.push(`# ,${escapeCsv(latestOutsideCommit.hash)},${escapeCsv(latestOutsideCommit.author)},${escapeCsv(formatDateForCountry(latestOutsideCommit.date, country))},${escapeCsv(latestOutsideCommit.message)}`);
+  }
   rows.push('Name,Total,OutsideCount,OutsideRate,NonWorkdayCount,NonWorkdayRate,HolidayCount,HolidayRate');
   perAuthor.forEach((p) => {
     rows.push(`${escapeCsv(p.name)},${p.total},${p.outsideWorkCount},${(p.outsideWorkRate * 100).toFixed(1)}%,${p.nonWorkdayCount},${(p.nonWorkdayRate * 100).toFixed(1)}%,${p.holidayCount || 0},${((p.holidayCount || 0) / p.total * 100).toFixed(1)}%`);

package/src/utils/file.mjs

@@ -1,28 +1,40 @@
-import fs from 'fs';
-import dayjs from 'dayjs';
+import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek.js'
+import fs from 'fs'
+
+// add ISO week plugin to dayjs once when module loaded
+dayjs.extend(isoWeek)
 
 export function writeJSON(file, data) {
-  fs.writeFileSync(file, JSON.stringify(data, null, 2), 'utf8');
+  fs.writeFileSync(file, JSON.stringify(data, null, 2), 'utf8')
 }
 
 export function writeTextFile(file, text) {
-  fs.writeFileSync(file, text, 'utf8');
+  fs.writeFileSync(file, text, 'utf8')
 }
 
 export function groupRecords(records, mode) {
-  const group = {};
+  const group = {}
 
-  records.forEach(r => {
-    const date = dayjs(r.date);
+  records.forEach((r) => {
+    const date = dayjs(r.date)
+    let key
 
-    const key =
-      mode === 'day'
-        ? date.format('YYYY-MM-DD')
-        : date.format('YYYY-MM');
+    if (mode === 'day') {
+      key = date.format('YYYY-MM-DD')
+    } else if (mode === 'week') {
+      // use dayjs isoWeek / isoWeekYear plugins for accurate ISO week computation (Monday-based)
+      const week = date.isoWeek()
+      const year = date.isoWeekYear()
+      key = `${year}-W${String(week).padStart(2, '0')}`
+    } else {
+      // default to month grouping
+      key = date.format('YYYY-MM')
+    }
 
-    if (!group[key]) group[key] = [];
-    group[key].push(r);
-  });
+    if (!group[key]) group[key] = []
+    group[key].push(r)
+  })
 
-  return group;
+  return group
 }

package/src/utils/index.mjs

@@ -1,2 +1,2 @@
-export { groupRecords, writeJSON, writeTextFile } from './file.mjs';
-export * from './output.mjs';
+export { groupRecords, writeJSON, writeTextFile } from './file.mjs'
+export * from './output.mjs'

package/src/utils/output.mjs

@@ -17,5 +17,10 @@ export function ensureOutputDir(customDir) {
 
 export function outputFilePath(filename, customDir) {
   const dir = ensureOutputDir(customDir);
-  return path.join(dir, filename);
+  const fullpath = path.join(dir, filename);
+  const parent = path.dirname(fullpath);
+  if (!fs.existsSync(parent)) {
+    fs.mkdirSync(parent, { recursive: true });
+  }
+  return fullpath;
 }