ccus-cli 0.2.19 → 0.2.22

package/README.md

@@ -55,6 +55,8 @@ ccus --version     # 查看当前安装的版本
 
 ```bash
 ccus install
+ccus config                           # 查看统计日配置，默认 07:00
+ccus config --day-start 07:30          # 修改每天开始时间，支持整点或 HH:mm
 ```
 
 然后照常使用 Claude Code，statusline 会显示 5 小时额度使用率（`5h`）、7 天额度使用率（`7d`）、context window 占用百分比（`ctx`）、模型名、工作区名，以及当前 git 分支（`⎇ <branch>`，实时读取，非 git 仓库或处于 detached HEAD 时省略该段）；原始 payload 也会落到本地日志，供后续 dashboard / export 使用。
@@ -149,12 +151,16 @@ ccus aggregate serve --input-dir ./team-exports
 
 `dashboard build/open` 会在看板同目录生成独立 `pricing.html`。两种 `serve` 都通过 `/pricing.html` 提供当前价格页；看板的合计成本卡下可直接进入。`serve` 默认监听 `127.0.0.1` 上的随机端口，并在每次请求时实时读取最新日志生成页面。`dashboard serve` 默认查看 `this-week`（整周）使用量曲线（`build` / `open` 仍默认 `today`），可用 `--range` 覆盖。
 
+统计日默认从本地时间 **07:00** 开始，到次日 07:00 前结束。例如 6 月 2 日 06:59 的使用量归到 6 月 1 日，07:00 起归到 6 月 2 日。凌晨查看 `today` 时显示尚未结束的前一统计日；周一开始时间之前仍属于上一周。
+
+用 `ccus config --day-start 07:30` 持久配置，`--day-start 0` 恢复零点切日。配置保存到数据目录的 `config.json`，使用自定义目录时加 `--data-dir PATH`。`export`、`dashboard build/open/serve` 和 `sessions` 支持 `--day-start HH:mm` 临时覆盖，自动同步使用持久配置。消息数、token、成本、额度和日/周汇总使用同一边界；`5h`、`24h` 等滚动窗口长度保持不变。日志仍按自然日保存，修改配置后历史数据会在读取时重新归天。
+
 其中：
 
 - `5 小时使用量百分比` 是 **展示指标**，来自 Claude 自身字段 `rate_limits.five_hour.used_percentage`
 - 使用率趋势图会在同一张图上叠加三条线：实线为 5 小时使用率（`rate_limits.five_hour`）、虚线为 7 天使用率（`rate_limits.seven_day`），两者各自独立按时间桶聚合、共用固定 0–100% 的左侧 Y 轴；紫色「7d 分区叠加累计」是把 7 天额度锯齿波还原成的累计真实使用量（口径同团队看板的 `sevenDayCumulativeUsagePct`），量纲可超 100%、单独走**右侧自适应 Y 轴**，按分段峰谷和单调非递减地累积上升，终点即顶部卡片的累计值
 - **折线与纵向柱状图均由 [uPlot](https://github.com/leeoniya/uPlot) 渲染**：鼠标在绘图区**任意位置**悬停即可通过十字线 + **跟随鼠标的 tooltip** 看到该处各条线的当前读数（不必精确落在采样点上；遇到几乎垂直的窄尖峰，把鼠标移到竖线顶端即可读到峰值）；纵向柱还会在每根柱顶标注数值。底部为**自绘图例**（实时读数集中在 tooltip 里）。uPlot 库与样式已**内联进生成的 HTML**，`dashboard build` 产物用 `file://` 离线打开也能完整渲染与交互，不依赖任何 CDN
-- 页面新增 **每日用户消息数** 纵向柱状图：按自然日统计的真实用户请求数，口径与导出契约的 `userMessageCount` 一致（来自 `~/.claude/projects/**/*.jsonl`），不是 statusline 采样数，也仅用于页面展示、不进任何导出/聚合契约
+- 页面新增 **每日用户消息数** 纵向柱状图：按配置的统计日统计真实用户请求数，口径与导出契约的 `userMessageCount` 一致（来自 `~/.claude/projects/**/*.jsonl`），不是 statusline 采样数，也仅用于页面展示、不进任何导出/聚合契约
 - 跨多天的窗口（如 `this-week` / `last-week`）使用率曲线会自动改用小时桶聚合，避免一周生成上千个点；x 轴刻度由 uPlot 按时间跨度自适应（短窗口显示 `HH:mm` **24 小时制**、跨天的刻度再补一行日期），不用 am/pm
 - 顶部统计卡展示 `Latest 5h usage`、`Peak 5h usage`、`7d 分区叠加累计`（主数值为 7 天额度分区叠加累计真实使用量，小字补充峰值与最新值）、`用户消息数`（窗口内每日真实用户请求数合计）
 - `--range today / this-week / last-week / 24h` 是 **你要查看的采样历史时间窗口**（`last-week` 指上一个完整周一到周日）
@@ -167,11 +173,13 @@ ccus aggregate serve --input-dir ./team-exports
 - 默认输出一个 `json` 数据包，里面同时包含 `rawEvents`、`weeklySummary`、`dailySummaries`
 - 导出文件内容为**紧凑 JSON**（无缩进），并默认 **gzip 压缩**后写成 `.json.gz`；gzip 与紧凑化都只是存储/展示层变化，解压后的字段集合与 `schemaVersion` 不变
 - 默认写 `.json.gz`；若用 `--out` 指定一个非 `.gz` 结尾的路径，则按明文 JSON 写出（不压缩）
-- 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `11`。顶层 `pricing` 记录本地价格目录版本、USD 币种和 `event-time-standard-api` 基准；`weeklySummary.apiEquivalentCost` 与 `dailySummaries[].apiEquivalentCost` 分别包含 `claude`、`codex`、`total` 的金额及定价覆盖度。v10 延续 v9 的 Codex token 口径：`inputTokens = max(0, input_tokens - cached_input_tokens)`，缓存输入由 `cacheReadInputTokens` 单列
+- 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `12`。两处 `range.dayStart` 记录统计日开始时间（如 `07:00`），供聚合沿用导出口径。顶层 `pricing` 记录本地价格目录版本、USD 币种和 `event-time-standard-api` 基准；`weeklySummary.apiEquivalentCost` 与 `dailySummaries[].apiEquivalentCost` 分别包含 `claude`、`codex`、`total` 的金额及定价覆盖度。v10 延续 v9 的 Codex token 口径：`inputTokens = max(0, input_tokens - cached_input_tokens)`，缓存输入由 `cacheReadInputTokens` 单列
 - v11 在有未定价请求的成本结果中增加 `unpricedModels: [{ model, requestCount }]`，按原始模型名累计请求数，模型缺失记为 `null`，无未定价请求时省略。该明细仅写入 JSON，不增加页面或 CSV 字段；v10 导出仍可读取，但没有模型明细。
 - 等效 API 成本按每次请求的模型、发生时间和 token 分类套用内置标准同步 API 价格。Claude 区分输入、输出、缓存读取及 5 分钟/1 小时缓存写入；Codex 区分净输入、缓存输入和输出。它不是 Claude/Codex 订阅账单，也不含税费、折扣、批处理、工具附加费或区域溢价
 - 未知模型不会丢弃：有部分请求可定价时金额是已知小计，页面显示“至少为”；全部请求均无法定价时金额为不可用。个人 dashboard 在顶部第五张卡显示 Claude 与 Codex 的合计成本，不显示来源分项。全部模型价格集中维护在 `src/lib/api-pricing-catalog.json`，价格目录随 ccus 发布，统计过程不联网；个人与多人 dashboard 的合计成本卡下链接独立 `pricing.html` 并在新页面打开，价格页只保留一套标题，Codex 排在 Claude 前并按模型版本从新到旧排列。当前 Claude 目录包含 Opus 4.7、Opus 4.8、Opus 5、Sonnet 5 和 Fable 5；Sonnet 5 按事件时间区分活动价与标准价
-- GPT-6 使用 `gpt-6-astra` 定价，兼容 `gpt-6` 别名及推理强度后缀。自 2026-09-03 起，每百万 token 输入 / 缓存读取 / 输出为 $10 / $1 / $50；输入与缓存读取合计超过 272K 时为 $20 / $2 / $75。来源：[OpenAI 模型定价](https://developers.openai.com/api/docs/models/gpt-6-astra)。价格目录版本为 `2026-09-14`
+- GPT-6 使用 `gpt-6-astra` 定价，兼容 `gpt-6` 别名及推理强度后缀。自 2026-09-03 起，每百万 token 输入 / 缓存读取 / 输出为 $10 / $1 / $50；输入与缓存读取合计超过 272K 时为 $20 / $2 / $75。来源：[OpenAI 模型定价](https://developers.openai.com/api/docs/models/gpt-6-astra)。价格目录版本为 `2026-09-23`
+- 自 2026-09-22 起，`gpt-6-sol` 每百万 token 输入 / 缓存读取 / 输出为 $2 / $0.20 / $10，`gpt-6-luna` 为 $0.10 / $0.01 / $0.50；输入与缓存读取合计超过 272K 时，分别为 $4 / $0.40 / $15 和 $0.20 / $0.02 / $0.75。均兼容推理强度后缀。来源：[OpenAI 价格表](https://developers.openai.com/api/docs/pricing)。
+- 自 2026-09-22 起，`claude-opus-5-5`（目录名 `claude-opus-5.5`）每百万 token 输入 / 输出 / 缓存读取 / 5 分钟缓存写入 / 1 小时缓存写入为 $4 / $20 / $0.20 / $5 / $8。来源：[官方发布公告](https://www.anthropic.com/claude-opus-5-5)、[缓存计价说明](https://claude.com/blog/what-a-task-costs-on-opus-5-5)。
 - `gpt-5.3-codex-spark` 自 2026-02-12 起按 `gpt-5.3-codex` 价格估算：每百万 token 输入 $1.75、输出 $14、缓存读取 $0.175。这是本项目采用的估算单价，并非 Spark 官方公开 API 定价。
 - 默认文件名会带 git email 的帐号名前缀和起止日期，例如：`alice_export_2026-05-26_to_2026-06-01.json.gz`
 - `userMessageCount` 来自 `~/.claude/projects/**/*.jsonl` 的非 meta `type:user` 事件
@@ -189,7 +197,8 @@ ccus aggregate serve --input-dir ./team-exports
 ## 多人汇总
 
 - 输入目录放很多通过 `ccus export` 导出的 bundle 文件，`.json.gz`（gzip 压缩）与明文 `.json` 都能识别，gzip 文件读取时自动解压
-- `aggregate` 接受 `schemaVersion: 6/7/8/9/10/11`。v6–v9 继续聚合原统计；存在 API 请求时成本为空并全部计入未定价，没有请求时成本为 0。旧版与 v10 或不同价格目录混用时，`pricingCatalogVersion` 按规则标记为 `mixed`
+- `aggregate` 和 `aggregate serve` 自动跳过不支持的导出版本，在 stderr 提示版本号和文件路径，其余有效文件继续统计；支持版本的数据结构校验失败仍报错。
+- `aggregate` 接受 `schemaVersion: 6/7/8/9/10/11/12`。v6–v11 按零点切日，v12 按 `range.dayStart` 切日；同一人同一周的 bundle 必须使用相同开始时间，否则提示统一配置后重新导出。CSV 列集合不变。v6–v9 继续聚合原统计；存在 API 请求时成本为空并全部计入未定价，没有请求时成本为 0。旧版与 v10 或不同价格目录混用时，`pricingCatalogVersion` 按规则标记为 `mixed`
 - 同一个人在多台电脑上各自导出 bundle 时会自动合并去重：去重以**天**为粒度，对每个「同人同天」取 `generatedAt` 最新的那份导出，避免同一台机器重复导出或周与周重叠造成翻倍；**周汇总不取整周单份，而是把按天去重后的各天数据上卷累加**，所以多台电脑在不同天产生的用量会正确合进同一周。usage（5h / 7d）从选中事件按真实时间戳重算，Claude+Codex 合并：peak 取两源 max、latest 两源相加
 - `ccus aggregate --input-dir DIR --out-dir DIR`
 - 输出三个文件：

package/dist/cli.js

@@ -42,6 +42,7 @@ exports.handleCodexHook = handleCodexHook;
 exports.main = main;
 const node_http_1 = __importDefault(require("node:http"));
 const node_path_1 = __importDefault(require("node:path"));
+const config_1 = require("./lib/config");
 const dashboard_1 = require("./lib/dashboard");
 const dashboard_2 = require("./lib/dashboard");
 const aggregate_dashboard_1 = require("./lib/aggregate-dashboard");
@@ -70,6 +71,7 @@ const api_equivalent_cost_1 = require("./lib/api-equivalent-cost");
 const version_1 = require("./lib/version");
 /** CLI 帮助信息保持简洁，方便直接挂到 README 或终端里查看。 */
 function printHelp() {
+    process.stdout.write("统计日配置：ccus config [--day-start 07:00] [--data-dir PATH]\n统计命令可用 --day-start HH:mm 临时覆盖，默认 07:00（本地时区）。\n\n");
     process.stdout.write(`ccus\n\nCommands:\n  ccus install [--settings PATH] [--command CMD] [--data-dir PATH]   (默认装 Claude statusLine；--codex 改写 Codex 的 ~/.codex/config.toml notify，配 --uninstall 移除)\n  ccus statusline emit [--data-dir PATH] [--input FILE] [--no-store]\n  ccus dashboard build [--range today|this-week|last-week|5h] [--out FILE] [--data-dir PATH]\n  ccus dashboard open [--range today|this-week|last-week|5h] [--out FILE] [--data-dir PATH]\n  ccus dashboard serve [--range today|this-week|last-week|5h] [--port 0] [--host 127.0.0.1] [--open] [--data-dir PATH]\n  ccus export [RANGE] [--out FILE] [--data-dir PATH]   (RANGE: this-week|tw, last-week|lw, today, 5h; e.g. ccus export lw)\n  ccus sessions [RANGE] [--out FILE] [--data-dir PATH]   (把 Claude 与 Codex 的活跃 session 打包成 zip，默认本周)\n  ccus sessions repair [codex|claude] [--min-gap 3h] [--dry-run]   (按末条记录时间修复 session 修改时间，默认仅跨天)\n  ccus aggregate --input-dir DIR [--out-dir DIR]\n  ccus aggregate serve --input-dir DIR [--port 0] [--host 127.0.0.1]\n  ccus sync [--data-dir PATH]\n  ccus sync config [--target DIR] [--interval 3h|daily|<N>h|<N>m] [--range this-week] [--suffix NAME | --no-suffix] [--data-dir PATH]\n  ccus sync install [--print] [--data-dir PATH]   (注册每周五 18:00 的系统调度器)\n  ccus sync uninstall [--print]   (卸载系统调度器)\n  ccus sync status [--data-dir PATH]\n  ccus api config [--enable|--disable] [--provider zhipu|custom] [--token-env NAME] [--token VAL] [--url URL] [--project P] [--organization O] [--ttl 5m] [--extractor-file FILE] [--data-dir PATH]\n  ccus api test [--data-dir PATH]   (立即拉取第三方额度并打印，验证配置是否生效)\n  ccus api status [--data-dir PATH]\n  ccus open [--data-dir PATH] [--print]\n  ccus update [--data-dir PATH]\n  ccus --version\n\nGlobal flags:\n  --verbose | --debug | -v   输出详细调试日志到 stderr（等价于设置 CCUS_DEBUG=1），方便排查问题\n`);
 }
 /** 一个轻量的参数解析器，当前命令面不复杂，没必要引入额外依赖。 */
@@ -104,6 +106,19 @@ function getBooleanOption(options, key) {
 function getDataDir(options) {
     return node_path_1.default.resolve(getStringOption(options, "data-dir") ?? (0, paths_1.getDefaultDataDir)());
 }
+async function getDayStartMinutes(options) {
+    if (options["day-start"] === true)
+        throw new Error("--day-start 缺少时间，例如 07:00。");
+    const override = getStringOption(options, "day-start");
+    return (0, time_1.parseDayStart)(override ?? (await (0, config_1.readConfig)(getDataDir(options))).dayStart);
+}
+async function handleConfig(options) {
+    await getDayStartMinutes(options);
+    const dataDir = getDataDir(options);
+    const value = getStringOption(options, "day-start");
+    const dayStart = value === undefined ? (await (0, config_1.readConfig)(dataDir)).dayStart : await (0, config_1.writeDayStart)(dataDir, value);
+    process.stdout.write(`每天开始时间：${dayStart}（本地时区）\n`);
+}
 /**
  * statusline 可以从 stdin 输入，也支持测试时通过 `--input` 指向 fixture 文件。
  */
@@ -248,7 +263,7 @@ async function handleStatuslineEmit(options) {
     }
 }
 /** 统计前静默同步会话修改时间，修复失败时仍尝试原有统计流程。 */
-async function loadSessionUsage(start, end) {
+async function loadSessionUsage(start, end, dayStartMinutes) {
     try {
         const { repairSessionMtimes } = await Promise.resolve().then(() => __importStar(require("./lib/session-mtime")));
         const results = await repairSessionMtimes(false);
@@ -262,8 +277,8 @@ async function loadSessionUsage(start, end) {
         (0, debug_1.debugLog)("sessions", "统计前同步修改时间失败", error);
     }
     return Promise.all([
-        (0, claude_1.summarizeClaudeProjectUsageCombined)(start, end),
-        (0, codex_sessions_1.summarizeCodexSessionUsageCombined)(start, end),
+        (0, claude_1.summarizeClaudeProjectUsageCombined)(start, end, dayStartMinutes),
+        (0, codex_sessions_1.summarizeCodexSessionUsageCombined)(start, end, dayStartMinutes),
     ]);
 }
 /**
@@ -275,18 +290,19 @@ async function loadSessionUsage(start, end) {
 async function loadDashboardData(options, defaultRange) {
     const dataDir = getDataDir(options);
     const range = getStringOption(options, "range") ?? defaultRange;
+    const dayStartMinutes = await getDayStartMinutes(options);
     const now = new Date();
     // this-week 固定补齐到完整一周（周一到周日），即使本周还没过完，曲线 x 轴也按 7 天逐日展示；
     // 其它范围（today / last-week / 5h）不受影响。
-    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now));
+    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now, dayStartMinutes));
     // events 含 Claude 与 Codex：个人看板额度叠加 Codex（peak max、latest 相加、7d 累计合并），与 aggregate 同口径。
     // codex 消息柱图走 dailyUserMessages，不受影响。
-    const events = (await (0, storage_1.readEventsForRange)(dataDir, range, now))
+    const events = (await (0, storage_1.readEventsForRange)(dataDir, range, now, dayStartMinutes))
         .map((record) => (0, payload_1.computeStatuslineEvent)(record));
-    const [claudeUsage, codexUsage] = await loadSessionUsage(window.start, window.end);
+    const [claudeUsage, codexUsage] = await loadSessionUsage(window.start, window.end, dayStartMinutes);
     const claudeDailyUsage = claudeUsage.daily;
     const codexDailyUsage = codexUsage.daily;
-    const dailyUserMessages = (0, time_1.enumerateDateKeys)(window.start, window.end).map((date) => ({
+    const dailyUserMessages = (0, time_1.enumerateReportingDateKeys)(window.start, window.end, dayStartMinutes).map((date) => ({
         date,
         userMessageCount: claudeDailyUsage.get(date)?.userMessageCount ?? 0,
         codexUserMessageCount: codexDailyUsage.get(date)?.userMessageCount ?? 0,
@@ -298,7 +314,7 @@ async function loadDashboardData(options, defaultRange) {
         claude: claudeCost,
         codex: codexCost,
         total: (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([claudeCost, codexCost]),
-    }, api_equivalent_cost_1.API_PRICING_METADATA.catalogVersion);
+    }, api_equivalent_cost_1.API_PRICING_METADATA.catalogVersion, (0, time_1.formatDayStart)(dayStartMinutes));
     return { html, window };
 }
 /** 构建 dashboard 的公共逻辑，build/open 复用同一套生成流程。 */
@@ -396,6 +412,7 @@ async function handleDashboardServe(options) {
  */
 async function runExport(options) {
     const dataDir = getDataDir(options);
+    const dayStartMinutes = await getDayStartMinutes(options);
     const range = getStringOption(options, "range") ?? "this-week";
     const output = getStringOption(options, "out");
     if (options.mode !== undefined) {
@@ -406,18 +423,18 @@ async function runExport(options) {
     }
     const now = new Date();
     // 周度导出固定覆盖完整一周：this-week 即使本周还没过完，文件名与 dailySummaries 也补齐到周日。
-    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now));
+    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now, dayStartMinutes));
     (0, debug_1.debugLog)("export", "range resolved", { range, label: window.label, start: window.start.toISOString(), end: window.end.toISOString() });
-    const records = await (0, storage_1.readEventsForRange)(dataDir, range, now);
+    const records = await (0, storage_1.readEventsForRange)(dataDir, range, now, dayStartMinutes);
     const events = records.map((record) => (0, payload_1.computeStatuslineEvent)(record));
     // 按 source 分流：Claude usage 只算 claude 事件，Codex 额度单列（避免 codex 额度污染 claude usage）。
     const claudeEvents = events.filter((event) => !(0, payload_1.isCodexSourceEvent)(event));
     const codexEvents = events.filter(payload_1.isCodexSourceEvent);
     const statuslineSummary = (0, dashboard_2.summarizeEvents)(claudeEvents);
-    const statuslineDailyRows = (0, export_1.buildSummaryRows)(claudeEvents);
+    const statuslineDailyRows = (0, export_1.buildSummaryRows)(claudeEvents, dayStartMinutes);
     const codexStatuslineSummary = (0, dashboard_2.summarizeEvents)(codexEvents);
-    const codexStatuslineDailyRows = (0, export_1.buildSummaryRows)(codexEvents);
-    const [claudeScan, codexScan] = await loadSessionUsage(window.start, window.end);
+    const codexStatuslineDailyRows = (0, export_1.buildSummaryRows)(codexEvents, dayStartMinutes);
+    const [claudeScan, codexScan] = await loadSessionUsage(window.start, window.end, dayStartMinutes);
     const claudeUsage = claudeScan.weekly;
     const claudeDailyUsage = claudeScan.daily;
     const codexUsage = codexScan.weekly;
@@ -441,12 +458,13 @@ async function runExport(options) {
         exportUserName = gitIdentity.userName;
     }
     const weeklySummary = {
-        schemaVersion: 11,
+        schemaVersion: 12,
         generatedAt: new Date().toISOString(),
         range: {
             label: window.label,
             start: window.start.toISOString(),
             end: window.end.toISOString(),
+            dayStart: (0, time_1.formatDayStart)(dayStartMinutes),
         },
         identity: {
             gitUserName: exportUserName,
@@ -497,7 +515,7 @@ async function runExport(options) {
     };
     const statuslineDailyMap = new Map(statuslineDailyRows.map((row) => [row.date, row]));
     const codexStatuslineDailyMap = new Map(codexStatuslineDailyRows.map((row) => [row.date, row]));
-    const dailySummaries = (0, time_1.enumerateDateKeys)(window.start, window.end).map((date) => {
+    const dailySummaries = (0, time_1.enumerateReportingDateKeys)(window.start, window.end, dayStartMinutes).map((date) => {
         const row = statuslineDailyMap.get(date);
         const claudeDay = claudeDailyUsage.get(date);
         const codexDay = codexDailyUsage.get(date);
@@ -537,12 +555,13 @@ async function runExport(options) {
         };
     });
     const bundle = {
-        schemaVersion: 11,
+        schemaVersion: 12,
         generatedAt: new Date().toISOString(),
         range: {
             label: window.label,
             start: window.start.toISOString(),
             end: window.end.toISOString(),
+            dayStart: (0, time_1.formatDayStart)(dayStartMinutes),
         },
         identity: {
             gitUserName: exportUserName,
@@ -554,7 +573,7 @@ async function runExport(options) {
         dailySummaries,
     };
     const content = (0, export_1.buildWeeklyExportBundleJson)(bundle);
-    const fileLabel = (0, time_1.formatRangeFileLabel)(window.start, window.end);
+    const fileLabel = (0, time_1.formatRangeFileLabel)(window.start, window.end, dayStartMinutes);
     const gitEmailPrefix = (0, time_1.formatGitEmailFilePrefix)(exportUserEmail);
     // 默认导出 gzip 压缩的 bundle（.json.gz）以缩减体积；用户用 --out 指定非 .gz 路径时仍写明文 JSON。
     const defaultFileName = gitEmailPrefix ? `${gitEmailPrefix}_export_${fileLabel}.json.gz` : `export_${fileLabel}.json.gz`;
@@ -724,10 +743,11 @@ function resolveExportOptions(action, args, rest) {
  */
 async function handleSessions(options) {
     const dataDir = getDataDir(options);
+    const dayStartMinutes = await getDayStartMinutes(options);
     const range = getStringOption(options, "range") ?? "this-week";
     const out = getStringOption(options, "out");
     const now = new Date();
-    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now));
+    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now, dayStartMinutes));
     (0, debug_1.debugLog)("sessions", "range resolved", { range, label: window.label, start: window.start.toISOString(), end: window.end.toISOString() });
     const [claudeSessions, codexSessions] = await Promise.all([
         (0, claude_1.findActiveSessionFiles)(window.start, window.end),
@@ -748,7 +768,7 @@ async function handleSessions(options) {
     const zipBuffer = await buildZipBuffer(entries);
     const gitIdentity = await (0, git_1.readGitIdentity)();
     const userName = (0, time_1.formatGitEmailFilePrefix)(gitIdentity.userEmail) ?? "unknown";
-    const fileLabel = (0, time_1.formatRangeFileLabel)(window.start, window.end);
+    const fileLabel = (0, time_1.formatRangeFileLabel)(window.start, window.end, dayStartMinutes);
     const defaultFileName = `projects_${fileLabel}_${userName}.zip`;
     const outputPath = node_path_1.default.resolve(out ?? node_path_1.default.join(dataDir, "sessions", defaultFileName));
     const fsNode = await Promise.resolve().then(() => __importStar(require("node:fs/promises")));
@@ -1388,6 +1408,10 @@ async function main(args = process.argv.slice(2)) {
         await handleOpenDataDir(parseOptions(args.slice(1)));
         return;
     }
+    if (group === "config") {
+        await handleConfig(parseOptions(args.slice(1)));
+        return;
+    }
     if (group === "update") {
         await handleUpdate(parseOptions(args.slice(1)));
         return;

package/dist/lib/aggregate.js

@@ -21,6 +21,7 @@ const api_equivalent_cost_1 = require("./api-equivalent-cost");
 const payload_1 = require("./payload");
 const time_1 = require("./time");
 const gunzipAsync = (0, node_util_1.promisify)(node_zlib_1.gunzip);
+const SUPPORTED_BUNDLE_SCHEMA_VERSIONS = [6, 7, 8, 9, 10, 11, 12];
 function maxOrNull(values) {
     const numbers = values.filter((v) => v !== null);
     return numbers.length > 0 ? Math.max(...numbers) : null;
@@ -79,7 +80,7 @@ function isWeeklyExportBundle(value) {
     if (!isRecord(value)) {
         return false;
     }
-    if (typeof value.schemaVersion !== "number" || ![6, 7, 8, 9, 10, 11].includes(value.schemaVersion)) {
+    if (typeof value.schemaVersion !== "number" || !SUPPORTED_BUNDLE_SCHEMA_VERSIONS.includes(value.schemaVersion)) {
         return false;
     }
     if (!Array.isArray(value.rawEvents) || !Array.isArray(value.dailySummaries) || !isRecord(value.weeklySummary) || !isRecord(value.identity) || !isRecord(value.range)) {
@@ -88,6 +89,10 @@ function isWeeklyExportBundle(value) {
     if (!hasWeeklyStatuslineShape(value.weeklySummary.statusline)) {
         return false;
     }
+    if (value.schemaVersion >= 12 &&
+        (typeof value.range.dayStart !== "string" || !/^([01]\d|2[0-3]):[0-5]\d$/.test(value.range.dayStart))) {
+        return false;
+    }
     if (value.schemaVersion < 10) {
         return true;
     }
@@ -95,12 +100,6 @@ function isWeeklyExportBundle(value) {
         hasApiEquivalentCostBreakdownShape(value.weeklySummary.apiEquivalentCost) &&
         value.dailySummaries.every((day) => isRecord(day) && hasApiEquivalentCostBreakdownShape(day.apiEquivalentCost)));
 }
-function localDateKey(date) {
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    return `${year}-${month}-${day}`;
-}
 function startOfLocalWeek(date) {
     const day = date.getDay();
     const diff = day === 0 ? -6 : 1 - day;
@@ -109,8 +108,11 @@ function startOfLocalWeek(date) {
     start.setHours(0, 0, 0, 0);
     return start;
 }
-function weekKey(date) {
-    return localDateKey(startOfLocalWeek(date));
+function weekKey(date, dayStartMinutes = 0) {
+    return (0, time_1.localDateKey)(startOfLocalWeek((0, time_1.startOfReportingDay)(date, dayStartMinutes)));
+}
+function bundleDayStartMinutes(bundle) {
+    return bundle.schemaVersion >= 12 ? (0, time_1.parseDayStart)(bundle.range.dayStart ?? "") : 0;
 }
 function toPersonKey(gitUserEmail, gitUserName) {
     return (0, time_1.extractGitEmailAccount)(gitUserEmail) ?? gitUserName ?? "unknown";
@@ -147,6 +149,9 @@ async function loadWeeklyExportBundles(inputDir) {
         try {
             const content = await readBundleFileContent(filePath);
             const parsed = JSON.parse(content);
+            if (isRecord(parsed) && typeof parsed.schemaVersion === "number" && !SUPPORTED_BUNDLE_SCHEMA_VERSIONS.includes(parsed.schemaVersion)) {
+                return { filePath, bundle: null, unsupportedVersion: parsed.schemaVersion };
+            }
             if (isWeeklyExportBundle(parsed)) {
                 return { filePath, bundle: parsed };
             }
@@ -160,6 +165,10 @@ async function loadWeeklyExportBundles(inputDir) {
     for (const result of results) {
         if (result === null)
             continue;
+        if ("unsupportedVersion" in result) {
+            process.stderr.write(`已忽略不支持的导出版本 schemaVersion=${result.unsupportedVersion}：${result.filePath}\n`);
+            continue;
+        }
         if (result.bundle === null) {
             invalidFiles.push(result.filePath);
         }
@@ -168,7 +177,7 @@ async function loadWeeklyExportBundles(inputDir) {
         }
     }
     if (invalidFiles.length > 0) {
-        throw new Error(`Unsupported export bundle schema in files: ${invalidFiles.join(", ")}. Re-export with current ccus so aggregate receives schemaVersion 6/7/8/9/10/11 bundles.`);
+        throw new Error(`Unsupported export bundle schema in files: ${invalidFiles.join(", ")}. Re-export with current ccus so aggregate receives schemaVersion 6/7/8/9/10/11/12 bundles.`);
     }
     return bundles;
 }
@@ -228,11 +237,20 @@ function isBetterCandidate(nextTier, nextMsgCount, nextApiCount, nextGeneratedAt
 function selectDailyRepresentatives(bundles) {
     // 收集每个 (personKey, date) 的所有候选
     const candidatesByKey = new Map();
+    const weekDayStarts = new Map();
     for (const { filePath, bundle } of bundles) {
         const personKey = bundlePersonKey(bundle);
         const generatedAt = bundle.generatedAt ?? "";
         const eventsByDate = bundleEventsByDate(bundle);
+        const dayStartMinutes = bundleDayStartMinutes(bundle);
         for (const day of bundle.dailySummaries) {
+            const week = weekKey(new Date(`${day.date}T12:00:00`));
+            const weekKeyForPerson = `${personKey}|${week}`;
+            const previous = weekDayStarts.get(weekKeyForPerson);
+            if (previous !== undefined && previous !== dayStartMinutes) {
+                throw new Error(`${personKey} 在 ${week} 这一周的每天开始时间不一致，请使用相同配置重新导出该周数据。`);
+            }
+            weekDayStarts.set(weekKeyForPerson, dayStartMinutes);
             const key = `${personKey}|${day.date}`;
             const events = eventsByDate.get(day.date) ?? [];
             const sessionIds = new Set(events.map((e) => e.sessionId).filter((s) => s !== null));
@@ -292,7 +310,7 @@ function selectDailyRepresentatives(bundles) {
     }
     return result;
 }
-/** 把 bundle 的 rawEvents 计算成 StatuslineEvent 并按本地自然日分组，结果做缓存复用。 */
+/** 按 bundle 的统计日边界分组，旧版沿用自然日。 */
 const bundleEventsCache = new WeakMap();
 function bundleEventsByDate(bundle) {
     const cached = bundleEventsCache.get(bundle);
@@ -300,9 +318,10 @@ function bundleEventsByDate(bundle) {
         return cached;
     }
     const byDate = new Map();
+    const dayStartMinutes = bundleDayStartMinutes(bundle);
     for (const record of bundle.rawEvents.filter(isPersistedStatuslineEvent)) {
         const event = (0, payload_1.computeStatuslineEvent)(record);
-        const dateKey = localDateKey(new Date(event.timestamp));
+        const dateKey = (0, time_1.reportingDateKey)(new Date(event.timestamp), dayStartMinutes);
         const list = byDate.get(dateKey);
         if (list) {
             list.push(event);
@@ -502,25 +521,25 @@ function buildPersonSevenDayCurve(bundles) {
     personSevenDayCurveCache.set(bundles, curves);
     return curves;
 }
-/** 从合并曲线里切出某自然日的子序列。 */
-function sliceCurveByDate(curve, date) {
-    return curve.filter((event) => localDateKey(new Date(event.timestamp)) === date);
+/** 从合并曲线里切出某统计日的子序列。 */
+function sliceCurveByDate(curve, date, dayStartMinutes) {
+    return curve.filter((event) => (0, time_1.reportingDateKey)(new Date(event.timestamp), dayStartMinutes) === date);
 }
 /** 从合并曲线里切出某周（周起始日 key）的子序列。 */
-function sliceCurveByWeek(curve, week) {
-    return curve.filter((event) => weekKey(new Date(event.timestamp)) === week);
+function sliceCurveByWeek(curve, week, dayStartMinutes) {
+    return curve.filter((event) => weekKey(new Date(event.timestamp), dayStartMinutes) === week);
 }
 /**
  * 分源 7d 累计：Claude 与 Codex 各自按区间切片做分段峰谷和，再用 `addNullable` 相加。
  * 两源是不同额度池的独立曲线，混算会互相触发假 reset 而虚高；分源算后相加，与 CSV 里 token /
  * 消息数「Claude+Codex 合计」口径一致。该 personKey 无任何曲线、或两源都无有效样本时返回 null。
  */
-function computeCumulativeSevenDayBySource(curves, personKey, slicer, rangeKey) {
+function computeCumulativeSevenDayBySource(curves, personKey, slicer, rangeKey, dayStartMinutes) {
     const bySource = curves.get(personKey);
     if (!bySource) {
         return null;
     }
-    return addNullable(computeCumulativeSevenDay(slicer(bySource.claude, rangeKey)), computeCumulativeSevenDay(slicer(bySource.codex, rangeKey)));
+    return addNullable(computeCumulativeSevenDay(slicer(bySource.claude, rangeKey, dayStartMinutes)), computeCumulativeSevenDay(slicer(bySource.codex, rangeKey, dayStartMinutes)));
 }
 /** 从一组事件按真实时间戳重算 5h / 7d 的 peak（max）与 latest（时间戳最新非空）。 */
 function recomputeUsage(events) {
@@ -546,7 +565,7 @@ function buildAggregatedDetailRows(bundles) {
                 rows.push({
                     ...event,
                     personKey: rep.personKey,
-                    weekKey: weekKey(new Date(event.timestamp)),
+                    weekKey: weekKey(new Date(`${rep.date}T12:00:00`)),
                     dateKey: rep.date,
                     source: isCodex ? "codex" : "claude",
                     // codex 事件无单事件 token 语义（token 在 daySummary.codex 按天聚合），不附 claude 的日总量。
@@ -630,7 +649,7 @@ function buildAggregatedDailyRows(bundles) {
         // 额度回退：rawEvents 缺时从 daySummary 取（Claude+Codex 合并，见 fallbackWeeklyUsage）
         const fallback = fallbackWeeklyUsage(reps.map((r) => r.day));
         // 累计指标走全样本分源曲线（Claude + Codex 各自切片累计后相加），不走单机的 recomputeUsage，避免漏掉另一台机器的样本。
-        const sevenDayCumulativeUsagePct = computeCumulativeSevenDayBySource(curves, personKey, sliceCurveByDate, date);
+        const sevenDayCumulativeUsagePct = computeCumulativeSevenDayBySource(curves, personKey, sliceCurveByDate, date, bundleDayStartMinutes(reps[0].bundle));
         rows.push({
             personKey,
             date,
@@ -685,13 +704,14 @@ function buildAggregatedWeeklyRows(bundles) {
     const groups = new Map();
     for (const reps of repsMap.values()) {
         for (const rep of reps) {
-            const week = weekKey(new Date(rep.bundle.range.start));
+            const week = weekKey(new Date(`${rep.date}T12:00:00`));
             const key = `${rep.personKey}|${week}`;
             let acc = groups.get(key);
             if (!acc) {
                 acc = {
                     personKey: rep.personKey,
                     week,
+                    dayStartMinutes: bundleDayStartMinutes(rep.bundle),
                     userMessageCount: 0,
                     apiRequestCount: 0,
                     inputTokens: 0,
@@ -732,7 +752,7 @@ function buildAggregatedWeeklyRows(bundles) {
         const fallback = fallbackWeeklyUsage(acc.days);
         const apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)(acc.costContributions.map((contribution) => contribution.result));
         // 整周累计：Claude + Codex 各自在整周子曲线上做分段峰谷和后相加，跨天边界增量被计入，故 weekly ≥ Σ daily。
-        const sevenDayCumulativeUsagePct = computeCumulativeSevenDayBySource(curves, acc.personKey, sliceCurveByWeek, acc.week);
+        const sevenDayCumulativeUsagePct = computeCumulativeSevenDayBySource(curves, acc.personKey, sliceCurveByWeek, acc.week, acc.dayStartMinutes);
         rows.push({
             personKey: acc.personKey,
             week: acc.week,

package/dist/lib/api-pricing-catalog.json

@@ -1,5 +1,5 @@
 {
-    "catalogVersion": "2026-09-14",
+    "catalogVersion": "2026-09-23",
     "currency": "USD",
     "basis": "event-time-standard-api",
     "entries": [
@@ -148,6 +148,13 @@
             "effectiveTo": null,
             "prices": { "inputUsdPerMillion": 5, "outputUsdPerMillion": 25, "cacheReadInputUsdPerMillion": 0.5, "cacheWrite5mInputUsdPerMillion": 6.25, "cacheWrite1hInputUsdPerMillion": 10 }
         },
+        {
+            "provider": "claude",
+            "model": "claude-opus-5.5",
+            "effectiveFrom": "2026-09-22T00:00:00.000Z",
+            "effectiveTo": null,
+            "prices": { "inputUsdPerMillion": 4, "outputUsdPerMillion": 20, "cacheReadInputUsdPerMillion": 0.2, "cacheWrite5mInputUsdPerMillion": 5, "cacheWrite1hInputUsdPerMillion": 8 }
+        },
         {
             "provider": "codex",
             "model": "gpt-5",
@@ -283,6 +290,28 @@
                 "thresholdInputTokens": 272000,
                 "prices": { "inputUsdPerMillion": 20, "outputUsdPerMillion": 75, "cacheReadInputUsdPerMillion": 2 }
             }
+        },
+        {
+            "provider": "codex",
+            "model": "gpt-6-sol",
+            "effectiveFrom": "2026-09-22T00:00:00.000Z",
+            "effectiveTo": null,
+            "prices": { "inputUsdPerMillion": 2, "outputUsdPerMillion": 10, "cacheReadInputUsdPerMillion": 0.2 },
+            "longContext": {
+                "thresholdInputTokens": 272000,
+                "prices": { "inputUsdPerMillion": 4, "outputUsdPerMillion": 15, "cacheReadInputUsdPerMillion": 0.4 }
+            }
+        },
+        {
+            "provider": "codex",
+            "model": "gpt-6-luna",
+            "effectiveFrom": "2026-09-22T00:00:00.000Z",
+            "effectiveTo": null,
+            "prices": { "inputUsdPerMillion": 0.1, "outputUsdPerMillion": 0.5, "cacheReadInputUsdPerMillion": 0.01 },
+            "longContext": {
+                "thresholdInputTokens": 272000,
+                "prices": { "inputUsdPerMillion": 0.2, "outputUsdPerMillion": 0.75, "cacheReadInputUsdPerMillion": 0.02 }
+            }
         }
     ]
 }

package/dist/lib/claude.js

@@ -12,6 +12,7 @@ const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const api_equivalent_cost_1 = require("./api-equivalent-cost");
 const paths_1 = require("./paths");
+const time_1 = require("./time");
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -80,12 +81,6 @@ function timestampInRange(timestamp, start, end) {
     const value = new Date(timestamp).getTime();
     return Number.isFinite(value) && value >= start.getTime() && value <= end.getTime();
 }
-function localDateKey(date) {
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    return `${year}-${month}-${day}`;
-}
 async function fileMayContainRange(filePath, start) {
     try {
         return (await promises_1.default.stat(filePath)).mtimeMs >= start.getTime();
@@ -130,7 +125,7 @@ async function summarizeClaudeProjectUsage(start, end) {
     return (await summarizeClaudeProjectUsageCombined(start, end)).weekly;
 }
 /** 单次扫描同时生成周汇总与按天汇总。 */
-async function summarizeClaudeProjectUsageCombined(start, end) {
+async function summarizeClaudeProjectUsageCombined(start, end, dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
     const claudeDataDir = (0, paths_1.getClaudeDataDir)();
     const projectDir = node_path_1.default.join(claudeDataDir, "projects");
     const files = await collectProjectJsonlFiles(projectDir);
@@ -172,7 +167,7 @@ async function summarizeClaudeProjectUsageCombined(start, end) {
                 if (!isRecord(record) || !timestampInRange(timestamp, start, end)) {
                     continue;
                 }
-                const date = localDateKey(new Date(timestamp));
+                const date = (0, time_1.reportingDateKey)(new Date(timestamp), dayStartMinutes);
                 const day = daily.get(date) ?? {
                     date,
                     userMessageCount: 0,
@@ -260,7 +255,7 @@ async function findActiveSessionFiles(start, end) {
 /**
  * 按天汇总 Claude project transcript 中的消息数、请求数、token 用量和标准 API 等效成本。
  */
-async function summarizeClaudeProjectUsageByDay(start, end) {
-    return (await summarizeClaudeProjectUsageCombined(start, end)).daily;
+async function summarizeClaudeProjectUsageByDay(start, end, dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
+    return (await summarizeClaudeProjectUsageCombined(start, end, dayStartMinutes)).daily;
 }
 //# sourceMappingURL=claude.js.map

package/dist/lib/codex-sessions.js

@@ -262,7 +262,7 @@ function ensureCodexDay(daily, date) {
     }
     return current;
 }
-function summarizeRollout(content, start, end, daily) {
+function summarizeRollout(content, start, end, daily, dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
     const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
     const result = {
         turns: [],
@@ -315,7 +315,7 @@ function summarizeRollout(content, start, end, daily) {
                     result.cacheReadInputTokens += cacheReadInputTokens;
                     result.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([result.apiEquivalentCost, cost]);
                     if (daily) {
-                        const day = ensureCodexDay(daily, (0, time_1.localDateKey)(new Date(timestamp)));
+                        const day = ensureCodexDay(daily, (0, time_1.reportingDateKey)(new Date(timestamp), dayStartMinutes));
                         day.apiRequestCount += 1;
                         day.inputTokens += inputTokens;
                         day.outputTokens += outputTokens;
@@ -338,7 +338,7 @@ function summarizeRollout(content, start, end, daily) {
  * 消息数 = task_started 的 distinct turn_id（跨文件去重）。重放副本会让同一 turn_id 出现在多个文件，
  * 故用全局 Map<turn_id, minMs> 收集（取最早 timestamp = 真实发生时刻，早于任何重放副本），最后取 size。
  */
-async function summarizeCodexSessionUsageCombined(start, end) {
+async function summarizeCodexSessionUsageCombined(start, end, dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
     const codexDataDir = (0, paths_1.getCodexHome)();
     const groups = await collectRolloutFileGroups();
     const turnMinMs = new Map();
@@ -354,7 +354,7 @@ async function summarizeCodexSessionUsageCombined(start, end) {
             if (content === null || isGuardianRollout(content)) {
                 continue;
             }
-            const parsed = summarizeRollout(content, start, end, daily);
+            const parsed = summarizeRollout(content, start, end, daily, dayStartMinutes);
             for (const turn of parsed.turns) {
                 const previous = turnMinMs.get(turn.turnId);
                 if (previous === undefined || turn.ms < previous) {
@@ -372,7 +372,7 @@ async function summarizeCodexSessionUsageCombined(start, end) {
         }
     }
     for (const ms of turnMinMs.values()) {
-        ensureCodexDay(daily, (0, time_1.localDateKey)(new Date(ms))).userMessageCount += 1;
+        ensureCodexDay(daily, (0, time_1.reportingDateKey)(new Date(ms), dayStartMinutes)).userMessageCount += 1;
     }
     return {
         weekly: {
@@ -395,10 +395,10 @@ async function summarizeCodexSessionUsage(start, end) {
  * 按天汇总 Codex session rollout 中的消息数、请求数、token 用量和标准 API 等效成本。
  * 与周汇总一致，排除 Codex Desktop 的 guardian 安全审查 rollout。
  *
- * 消息数同 weekly：先全局 Map<turn_id, minMs> 去重，再按 minMs 的本地日归桶（保证 weekly = Σ daily、
- * 且重放副本跨天不重复）。token 维度按 token_count 事件 timestamp 的本地日累加。
+ * 消息数同 weekly：先全局 Map<turn_id, minMs> 去重，再按 minMs 的统计日归桶（保证 weekly = Σ daily、
+ * 且重放副本跨天不重复）。token 按 token_count 事件 timestamp 的统计日累加。
  */
-async function summarizeCodexSessionUsageByDay(start, end) {
-    return (await summarizeCodexSessionUsageCombined(start, end)).daily;
+async function summarizeCodexSessionUsageByDay(start, end, dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
+    return (await summarizeCodexSessionUsageCombined(start, end, dayStartMinutes)).daily;
 }
 //# sourceMappingURL=codex-sessions.js.map

package/dist/lib/config.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readConfig = readConfig;
+exports.writeDayStart = writeDayStart;
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const time_1 = require("./time");
+/** 配置缺失时使用 07:00；损坏配置报错，避免悄悄改变统计口径。 */
+async function readConfig(dataDir) {
+    let config = {};
+    try {
+        const parsed = JSON.parse(await promises_1.default.readFile(node_path_1.default.join(dataDir, "config.json"), "utf8"));
+        if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+            throw new Error("ccus config.json 必须是 JSON 对象。");
+        }
+        config = parsed;
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+    }
+    if (config.dayStart !== undefined && typeof config.dayStart !== "string") {
+        throw new Error("config.json 的 dayStart 必须是时间字符串，例如 07:00。");
+    }
+    return { ...config, dayStart: (0, time_1.formatDayStart)((0, time_1.parseDayStart)(config.dayStart ?? "07:00")) };
+}
+async function writeDayStart(dataDir, value) {
+    const dayStart = (0, time_1.formatDayStart)((0, time_1.parseDayStart)(value));
+    const config = await readConfig(dataDir);
+    await promises_1.default.mkdir(dataDir, { recursive: true });
+    await promises_1.default.writeFile(node_path_1.default.join(dataDir, "config.json"), `${JSON.stringify({ ...config, dayStart }, null, 2)}\n`, "utf8");
+    return dayStart;
+}
+//# sourceMappingURL=config.js.map

package/dist/lib/dashboard.js

@@ -206,7 +206,7 @@ function renderDailyMessages(points) {
           <p class="eyebrow">Daily Messages</p>
           <h2>每日用户消息数</h2>
         </div>
-        <p class="muted">按自然日统计的真实用户请求数（口径同导出 userMessageCount），共 ${total} 条 Claude · ${codexTotal} 条 Codex</p>
+        <p class="muted">按配置的统计日统计真实用户请求数，共 ${total} 条 Claude · ${codexTotal} 条 Codex</p>
       </div>
       ${noData}
       ${chart}
@@ -294,7 +294,7 @@ function renderRecentEvents(events) {
  *
  * 整个 dashboard 保持“单文件可打开”，方便导出和直接分享本地结果。
  */
-function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages = [], apiEquivalentCost = null, pricingCatalogVersion = null) {
+function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages = [], apiEquivalentCost = null, pricingCatalogVersion = null, dayStart = "07:00") {
     const summary = summarizeEvents(events);
     const buckets = bucketizeEvents(events, start, end, pickBucketMinutes(start, end));
     const totalUserMessages = dailyUserMessages.reduce((sum, point) => sum + point.userMessageCount, 0);
@@ -470,6 +470,7 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
         <p class="subtitle">围绕 Claude Code statusline 的本地采样面板。每次刷新记录一条事件，再把 Claude 自带的 5 小时使用率百分比随时间的变化绘制成静态 Web 页面，适合快速回看与导出周报。</p>
         <div class="hero-meta">
           <span class="hero-chip">时间范围：${escapeHtml(rangeLabel)}</span>
+          <span class="hero-chip">每天开始：${escapeHtml(dayStart)}（本地时区）</span>
           <span class="hero-chip">开始：${escapeHtml((0, time_1.formatLocalTimestamp)(start))}</span>
           <span class="hero-chip">结束：${escapeHtml((0, time_1.formatLocalTimestamp)(end))}</span>
           <span class="hero-chip">事件：${summary.sampleCount}</span>

package/dist/lib/export.js

@@ -143,10 +143,10 @@ function buildWeeklyExportBundleJson(bundle) {
     return `${JSON.stringify(bundle)}\n`;
 }
 /** 按天汇总 usage 数据，生成 summary 模式的中间结果。 */
-function buildSummaryRows(events) {
+function buildSummaryRows(events, dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
     const grouped = new Map();
     for (const event of events) {
-        const key = event.timestamp.slice(0, 10);
+        const key = (0, time_1.reportingDateKey)(new Date(event.timestamp), dayStartMinutes);
         const items = grouped.get(key);
         if (items) {
             items.push(event);

package/dist/lib/storage.js

@@ -195,8 +195,8 @@ async function readEventsFromDayDirectory(directoryPath) {
  *
  * 同时兼容“按天目录 JSON 文件”和“旧版 JSONL 文件”两种存储布局。
  */
-async function readEventsForRange(dataDir, range, now = new Date()) {
-    const window = (0, time_1.resolveRange)(range, now);
+async function readEventsForRange(dataDir, range, now = new Date(), dayStartMinutes = time_1.DEFAULT_DAY_START_MINUTES) {
+    const window = (0, time_1.resolveRange)(range, now, dayStartMinutes);
     const keys = (0, time_1.enumerateDateKeys)(window.start, window.end);
     const eventsDir = (0, paths_1.getEventsDir)(dataDir);
     const lists = await Promise.all(keys.map(async (key) => {

package/dist/lib/sync.js

@@ -18,6 +18,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const debug_1 = require("./debug");
+const config_1 = require("./config");
 const paths_1 = require("./paths");
 const time_1 = require("./time");
 /** 默认同步周期标签：每 3 小时最多同步一次（滚动 TTL）。 */
@@ -171,7 +172,7 @@ function formatSyncElapsed(elapsedMs) {
  */
 async function exportAndCopy(dataDir, runExport, targetDir, range, suffix) {
     const { outputPath, window } = await runExport({ "data-dir": dataDir, range });
-    const weekDir = (0, time_1.formatWeekDirName)(window.start, window.end);
+    const weekDir = (0, time_1.formatWeekDirName)(window.start, window.end, window.dayStartMinutes ?? 0);
     const targetWeekDir = node_path_1.default.join(targetDir, weekDir);
     await promises_1.default.mkdir(targetWeekDir, { recursive: true });
     // 后缀只加在目标目录的副本上，本地 exports 原文件名保持不变。
@@ -196,12 +197,13 @@ async function performSync(dataDir, runExport, now = new Date()) {
     const state = readSyncStateSync(dataDir);
     let lastArchivedWeek = state?.lastArchivedWeek;
     try {
+        const dayStartMinutes = (0, time_1.parseDayStart)((await (0, config_1.readConfig)(dataDir)).dayStart);
         const primary = await exportAndCopy(dataDir, runExport, config.targetDir, config.range, config.suffix);
-        // 周一（getDay() === 1）是上一周结束后第一个能拿到完整数据的日子：顺带归档 last-week。
+        // 统计日进入周一后才归档，避免周一凌晨提前归档尚未结束的一周。
         let archivedLastWeekDest = null;
-        if (now.getDay() === 1) {
-            const lastWeek = (0, time_1.resolveRange)("last-week", now);
-            const lastWeekDir = (0, time_1.formatWeekDirName)(lastWeek.start, lastWeek.end);
+        if ((0, time_1.startOfReportingDay)(now, dayStartMinutes).getDay() === 1) {
+            const lastWeek = (0, time_1.resolveRange)("last-week", now, dayStartMinutes);
+            const lastWeekDir = (0, time_1.formatWeekDirName)(lastWeek.start, lastWeek.end, dayStartMinutes);
             if (lastArchivedWeek !== lastWeekDir) {
                 const archived = await exportAndCopy(dataDir, runExport, config.targetDir, "last-week", config.suffix);
                 lastArchivedWeek = archived.weekDir;

package/dist/lib/time.js

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_DAY_START_MINUTES = void 0;
+exports.parseDayStart = parseDayStart;
+exports.formatDayStart = formatDayStart;
+exports.startOfReportingDay = startOfReportingDay;
+exports.reportingDateKey = reportingDateKey;
 exports.resolveRange = resolveRange;
 exports.expandToFullWeekWindow = expandToFullWeekWindow;
 exports.localDateKey = localDateKey;
@@ -8,11 +13,33 @@ exports.formatWeekDirName = formatWeekDirName;
 exports.extractGitEmailAccount = extractGitEmailAccount;
 exports.formatGitEmailFilePrefix = formatGitEmailFilePrefix;
 exports.enumerateDateKeys = enumerateDateKeys;
+exports.enumerateReportingDateKeys = enumerateReportingDateKeys;
 exports.formatLocalTimestamp = formatLocalTimestamp;
 exports.formatClock = formatClock;
 exports.roundNumber = roundNumber;
 const HOUR_MS = 60 * 60 * 1000;
-const DAY_MS = 24 * HOUR_MS;
+exports.DEFAULT_DAY_START_MINUTES = 7 * 60;
+/** 支持整点或 HH:mm，拒绝越界时间。 */
+function parseDayStart(value) {
+    const match = /^(\d{1,2})(?::([0-5]\d))?$/.exec(value.trim());
+    if (!match || Number(match[1]) > 23) {
+        throw new Error("每天开始时间必须是 0–23 的整点或 HH:mm，例如 7、07:00、07:30。");
+    }
+    return Number(match[1]) * 60 + Number(match[2] ?? 0);
+}
+function formatDayStart(minutes) {
+    return `${String(Math.floor(minutes / 60)).padStart(2, "0")}:${String(minutes % 60).padStart(2, "0")}`;
+}
+/** 返回时间所在统计日的起点；边界前归到前一天。 */
+function startOfReportingDay(date, dayStartMinutes = exports.DEFAULT_DAY_START_MINUTES) {
+    const start = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, dayStartMinutes);
+    return date.getTime() < start.getTime()
+        ? new Date(date.getFullYear(), date.getMonth(), date.getDate() - 1, 0, dayStartMinutes)
+        : start;
+}
+function reportingDateKey(date, dayStartMinutes = exports.DEFAULT_DAY_START_MINUTES) {
+    return localDateKey(startOfReportingDay(date, dayStartMinutes));
+}
 /**
  * 统一按本地时区切日，避免“今天 / 本周”与用户直觉不一致。
  */
@@ -22,21 +49,21 @@ function startOfLocalDay(date) {
 /**
  * 以周一作为一周开始，便于输出 `this-week` 统计。
  */
-function startOfLocalWeek(date) {
-    const day = date.getDay();
+function startOfLocalWeek(date, dayStartMinutes) {
+    const start = startOfReportingDay(date, dayStartMinutes);
+    const day = start.getDay();
     const diff = day === 0 ? -6 : 1 - day;
-    const start = new Date(date);
-    start.setDate(date.getDate() + diff);
-    return startOfLocalDay(start);
+    return new Date(start.getFullYear(), start.getMonth(), start.getDate() + diff, 0, dayStartMinutes);
 }
 /**
- * 以周日 23:59:59.999 作为一周结束（周一为起始）。
+ * 以下周一统计日开始前 1 毫秒作为一周结束。
  *
  * 和 `startOfLocalWeek` 对称，用来把 `this-week` 补齐成完整一周。
  */
-function endOfLocalWeek(date) {
-    const start = startOfLocalWeek(date);
-    return new Date(start.getFullYear(), start.getMonth(), start.getDate() + 6, 23, 59, 59, 999);
+function endOfLocalWeek(date, dayStartMinutes) {
+    const start = startOfLocalWeek(date, dayStartMinutes);
+    const next = new Date(start.getFullYear(), start.getMonth(), start.getDate() + 7, 0, dayStartMinutes);
+    return new Date(next.getTime() - 1);
 }
 /** range 短别名：保持解析后的 label 仍为规范名，避免影响文件名与 bundle 契约。 */
 const RANGE_ALIASES = {
@@ -48,21 +75,22 @@ const RANGE_ALIASES = {
  *
  * 当前支持：`today`、`this-week`（简写 `tw`）、`last-week`（简写 `lw`）、`5h`、`30m` 这类相对窗口。
  */
-function resolveRange(range, now = new Date()) {
+function resolveRange(range, now = new Date(), dayStartMinutes = exports.DEFAULT_DAY_START_MINUTES) {
     const raw = (range ?? "5h").trim().toLowerCase();
     const normalized = RANGE_ALIASES[raw] ?? raw;
     if (normalized === "today") {
-        return { label: "today", start: startOfLocalDay(now), end: now };
+        return { label: "today", start: startOfReportingDay(now, dayStartMinutes), end: now, dayStartMinutes };
     }
     if (normalized === "this-week") {
-        return { label: "this-week", start: startOfLocalWeek(now), end: now };
+        return { label: "this-week", start: startOfLocalWeek(now, dayStartMinutes), end: now, dayStartMinutes };
     }
     if (normalized === "last-week") {
-        const thisWeekStart = startOfLocalWeek(now);
+        const thisWeekStart = startOfLocalWeek(now, dayStartMinutes);
         const start = new Date(thisWeekStart);
         start.setDate(start.getDate() - 7);
+        start.setHours(0, dayStartMinutes, 0, 0);
         const end = new Date(thisWeekStart.getTime() - 1);
-        return { label: "last-week", start, end };
+        return { label: "last-week", start, end, dayStartMinutes };
     }
     const match = normalized.match(/^(\d+)([hm])$/);
     if (!match) {
@@ -75,6 +103,7 @@ function resolveRange(range, now = new Date()) {
         label: normalized,
         start: new Date(now.getTime() - duration),
         end: now,
+        dayStartMinutes,
     };
 }
 /**
@@ -88,7 +117,7 @@ function expandToFullWeekWindow(window) {
     if (window.label !== "this-week") {
         return window;
     }
-    return { ...window, end: endOfLocalWeek(window.start) };
+    return { ...window, end: endOfLocalWeek(window.start, window.dayStartMinutes ?? exports.DEFAULT_DAY_START_MINUTES) };
 }
 /**
  * 把日期映射成稳定的本地日键，用于事件按天分桶存储。
@@ -102,8 +131,8 @@ function localDateKey(date) {
 /**
  * 把时间窗口渲染成用于文件名的起止日期标记。
  */
-function formatRangeFileLabel(start, end) {
-    return `${localDateKey(start)}_to_${localDateKey(end)}`;
+function formatRangeFileLabel(start, end, dayStartMinutes = 0) {
+    return `${reportingDateKey(start, dayStartMinutes)}_to_${reportingDateKey(end, dayStartMinutes)}`;
 }
 /**
  * 生成定时同步目标目录下「按周」子目录名：年_月_日_年_月_日（全下划线）。
@@ -111,8 +140,8 @@ function formatRangeFileLabel(start, end) {
  * 与 formatRangeFileLabel 同源（都基于 localDateKey 的周一~周日窗口），
  * 但分隔符统一成下划线，例如 `2026_06_01_2026_06_07`。
  */
-function formatWeekDirName(start, end) {
-    const normalize = (date) => localDateKey(date).replaceAll("-", "_");
+function formatWeekDirName(start, end, dayStartMinutes = 0) {
+    const normalize = (date) => reportingDateKey(date, dayStartMinutes).replaceAll("-", "_");
     return `${normalize(start)}_${normalize(end)}`;
 }
 /**
@@ -154,7 +183,18 @@ function enumerateDateKeys(start, end) {
     const cursor = startOfLocalDay(start);
     while (cursor.getTime() <= end.getTime()) {
         keys.push(localDateKey(cursor));
-        cursor.setTime(cursor.getTime() + DAY_MS);
+        cursor.setDate(cursor.getDate() + 1);
+    }
+    return keys;
+}
+/** 枚举统计日；存储读取继续使用自然日枚举。 */
+function enumerateReportingDateKeys(start, end, dayStartMinutes = exports.DEFAULT_DAY_START_MINUTES) {
+    const keys = [];
+    const cursor = startOfReportingDay(start, dayStartMinutes);
+    while (cursor.getTime() <= end.getTime()) {
+        keys.push(localDateKey(cursor));
+        cursor.setDate(cursor.getDate() + 1);
+        cursor.setHours(0, dayStartMinutes, 0, 0);
     }
     return keys;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.2.19",
+  "version": "0.2.22",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {
@@ -17,7 +17,7 @@
     "build": "tsc -p tsconfig.json && node scripts/copy-vendor.js",
     "prepublishOnly": "npm run build",
     "test": "node --test --test-concurrency 1 \"dist/test/**/*.test.js\"",
-    "test:src": "node --import tsx --test --test-concurrency 1 src/test/payload.test.ts src/test/dashboard.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/api-equivalent-cost.test.ts src/test/claude.test.ts src/test/aggregate.test.ts src/test/aggregate-dashboard.test.ts src/test/install.test.ts src/test/debug.test.ts src/test/time.test.ts src/test/update-check.test.ts src/test/sync.test.ts src/test/scheduler.test.ts src/test/api-mode.test.ts src/test/codex-fetcher.test.ts src/test/codex-sessions.test.ts src/test/sessions.test.ts src/test/codex-install.test.ts src/test/cli-codex-notify.test.ts src/test/cli-codex-hook.test.ts src/test/cli-install-codex.test.ts",
+    "test:src": "node --import tsx --test --test-concurrency 1 src/test/payload.test.ts src/test/dashboard.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/api-equivalent-cost.test.ts src/test/claude.test.ts src/test/aggregate.test.ts src/test/aggregate-dashboard.test.ts src/test/install.test.ts src/test/debug.test.ts src/test/time.test.ts src/test/day-start.test.ts src/test/update-check.test.ts src/test/sync.test.ts src/test/scheduler.test.ts src/test/api-mode.test.ts src/test/codex-fetcher.test.ts src/test/codex-sessions.test.ts src/test/sessions.test.ts src/test/codex-install.test.ts src/test/cli-codex-notify.test.ts src/test/cli-codex-hook.test.ts src/test/cli-install-codex.test.ts",
     "smoke:api": "node scripts/smoke-api.mjs"
   },
   "keywords": [