ccus-cli 0.2.17 → 0.2.18

package/README.md

@@ -209,6 +209,22 @@ ccus aggregate serve --input-dir ./team-exports
 
 ## 定时同步
 
+session 内容已更新但文件修改时间仍旧，导致统计遗漏时，可手动修复：
+
+```bash
+ccus sessions repair --dry-run        # 预览全部待修复文件
+ccus sessions repair                 # 修复全部类型
+ccus sessions repair codex           # 仅修复 Codex（含 Orca）
+ccus sessions repair claude          # 仅修复 Claude
+ccus sessions repair codex --dry-run # 仅预览 Codex
+ccus sessions repair codex --min-gap 3h # 至少落后 3 小时才修复
+ccus sync                   # 重新统计并同步
+```
+
+预览和执行均按实际文件标识去重：Codex 与 Orca 的硬链接只显示、计数一次，修复一个路径会同时更新所有硬链接路径。普通独立副本仍分别处理。
+
+默认扫描 Claude projects、Codex 与 Orca sessions 的 JSONL；指定类型时只扫描对应目录。从尾部分块读取最后一条非空记录。默认仅当文件修改时间落后于记录的 `timestamp`，且两者按本机时区跨自然日时修复（不是必须相差 24 小时）。`--min-gap` 改为按实际时差判断，支持非负整数加 `m`（分钟）、`h`（小时）、`d`（24 小时）；达到阈值即修复，`0m` 表示任何正差值。保留更晚的修改时间，不改写会话内容。末条 JSON 不完整、时间戳缺失或无效时跳过并列出原因。此命令不限制本周，处理所选类型的所有历史 session；日常统计的修改时间预筛保持不变。
+
 把每个人的 `ccus export` 攒到一个共享目录（团队网盘 / 共享盘）通常是手动的，容易漏。`ccus sync` 用来自动化这一步：周期到了就 `export` 一次，并把导出文件**复制**到目标目录下**按周命名的子目录**里。
 
 ```bash

package/dist/cli.js

@@ -70,7 +70,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\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 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`);
+    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`);
 }
 /** 一个轻量的参数解析器，当前命令面不复杂，没必要引入额外依赖。 */
 function parseOptions(args) {
@@ -743,9 +743,48 @@ async function handleSessions(options) {
     await fsNode.writeFile(outputPath, zipBuffer);
     process.stdout.write(`${outputPath}\n`);
 }
-/**
- * 解析 sessions 命令的参数，支持 RANGE 作为位置参数简写。
- */
+/** 手动修复 session 修改时间，并报告逐文件结果。 */
+async function handleRepairSessionMtimes(args) {
+    const startedAt = performance.now();
+    let source;
+    let dryRun = false;
+    let minGapMs;
+    for (let index = 0; index < args.length; index += 1) {
+        const arg = args[index];
+        if (arg === "--dry-run")
+            dryRun = true;
+        else if (arg === "--min-gap" && minGapMs === undefined) {
+            const match = /^(\d+)(m|h|d)$/.exec(args[++index] ?? "");
+            if (!match)
+                throw new Error("--min-gap 需要非负整数和单位 m/h/d，例如 30m、3h、1d；0m 表示任何正差值。");
+            minGapMs = Number(match[1]) * ({ m: 60_000, h: 3_600_000, d: 86_400_000 }[match[2]]);
+            if (!Number.isSafeInteger(minGapMs))
+                throw new Error("--min-gap 数值过大。");
+        }
+        else if (["--verbose", "--debug", "-v"].includes(arg))
+            continue;
+        else if ((arg === "codex" || arg === "claude") && source === undefined)
+            source = arg;
+        else
+            throw new Error(`不支持的修复参数：${arg}。用法：ccus sessions repair [codex|claude] [--min-gap 3h] [--dry-run]`);
+    }
+    const { repairSessionMtimes } = await Promise.resolve().then(() => __importStar(require("./lib/session-mtime")));
+    const results = await repairSessionMtimes(dryRun, source, minGapMs);
+    for (const result of results) {
+        if (result.status === "repaired") {
+            process.stdout.write(`${dryRun ? "待修复" : "已修复"} ${result.filePath}: ${result.before.toISOString()} → ${result.after.toISOString()}\n`);
+        }
+        else if (result.status === "skipped" || result.status === "failed") {
+            process.stderr.write(`${result.status === "failed" ? "失败" : "跳过"} ${result.filePath}: ${result.reason}\n`);
+        }
+    }
+    const count = (status) => results.filter((result) => result.status === status).length;
+    process.stdout.write(`扫描 ${results.length}，${dryRun ? "待修复" : "已修复"} ${count("repaired")}，无需修复 ${count("unchanged")}，跳过 ${count("skipped")}，失败 ${count("failed")}\n`);
+    process.stdout.write(`耗时：${(0, sync_1.formatSyncElapsed)(performance.now() - startedAt)}\n`);
+    if (count("failed") > 0)
+        process.exitCode = 1;
+}
+/** 解析 sessions 命令的参数，支持 RANGE 作为位置参数简写。 */
 function resolveSessionsOptions(action, args, rest) {
     if (!action || action.startsWith("--")) {
         return parseOptions(args.slice(1));
@@ -1423,6 +1462,10 @@ async function main(args = process.argv.slice(2)) {
         await handleExport(exportOptions);
         return;
     }
+    if (group === "sessions" && action === "repair") {
+        await handleRepairSessionMtimes(rest);
+        return;
+    }
     if (group === "sessions") {
         const sessionsOptions = resolveSessionsOptions(action, args, rest);
         await handleSessions(sessionsOptions);

package/dist/lib/claude.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectProjectJsonlFiles = collectProjectJsonlFiles;
 exports.summarizeClaudeProjectUsage = summarizeClaudeProjectUsage;
 exports.summarizeClaudeProjectUsageCombined = summarizeClaudeProjectUsageCombined;
 exports.findActiveSessionFiles = findActiveSessionFiles;

package/dist/lib/session-mtime.js

@@ -0,0 +1,98 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.repairSessionMtimes = repairSessionMtimes;
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const claude_1 = require("./claude");
+const paths_1 = require("./paths");
+const time_1 = require("./time");
+/** 从尾部按块取最后一条非空 JSON；异常末行不猜测时间。 */
+async function readLastTimestamp(file, size) {
+    let position = size;
+    const chunks = [];
+    while (position > 0) {
+        const length = Math.min(position, 16 * 1024);
+        position -= length;
+        const buffer = Buffer.allocUnsafe(length);
+        const { bytesRead } = await file.read(buffer, 0, length, position);
+        if (bytesRead !== length)
+            return null;
+        let end = length;
+        if (chunks.length === 0) {
+            while (end > 0 && [9, 10, 13, 32].includes(buffer[end - 1]))
+                end -= 1;
+            if (end === 0)
+                continue;
+        }
+        const newline = buffer.lastIndexOf(10, end - 1);
+        chunks.push(buffer.subarray(newline + 1, end));
+        if (newline >= 0 || position === 0) {
+            try {
+                const record = JSON.parse(Buffer.concat(chunks.reverse()).toString("utf8"));
+                if (typeof record !== "object" || record === null || !("timestamp" in record)
+                    || typeof record.timestamp !== "string")
+                    return null;
+                const timestamp = new Date(record.timestamp).getTime();
+                return Number.isFinite(timestamp) ? timestamp : null;
+            }
+            catch {
+                return null;
+            }
+        }
+    }
+    return null;
+}
+async function repairSessionMtimes(dryRun, source, minGapMs) {
+    const directories = [
+        ...(source !== "codex" ? [node_path_1.default.join((0, paths_1.getClaudeDataDir)(), "projects")] : []),
+        ...(source !== "claude" ? (0, paths_1.getCodexSessionHomes)().map((home) => node_path_1.default.join(home, "sessions")) : []),
+    ];
+    const files = [...new Set((await Promise.all(directories.map(claude_1.collectProjectJsonlFiles))).flat())];
+    const results = [];
+    const seenFiles = new Set();
+    for (const filePath of files) {
+        try {
+            const file = await promises_1.default.open(filePath, dryRun ? "r" : "r+");
+            try {
+                const before = await file.stat({ bigint: true });
+                const identity = before.ino === 0n ? `path:${filePath}` : `${before.dev}:${before.ino}`;
+                if (seenFiles.has(identity))
+                    continue;
+                seenFiles.add(identity);
+                const timestamp = await readLastTimestamp(file, Number(before.size));
+                if (timestamp === null) {
+                    results.push({ filePath, status: "skipped", reason: "末条记录无有效时间戳" });
+                    continue;
+                }
+                const current = await file.stat({ bigint: true });
+                if (current.size !== before.size || current.mtimeMs !== before.mtimeMs) {
+                    results.push({ filePath, status: "skipped", reason: "读取期间文件发生变化，请稍后重试" });
+                    continue;
+                }
+                const after = new Date(timestamp);
+                const gap = timestamp - Number(current.mtimeMs);
+                const meetsThreshold = minGapMs === undefined
+                    ? (0, time_1.localDateKey)(current.mtime) !== (0, time_1.localDateKey)(after)
+                    : gap >= minGapMs;
+                if (gap <= 0 || !meetsThreshold) {
+                    results.push({ filePath, status: "unchanged" });
+                    continue;
+                }
+                if (!dryRun)
+                    await file.utimes(before.atime, after);
+                results.push({ filePath, status: "repaired", before: current.mtime, after });
+            }
+            finally {
+                await file.close();
+            }
+        }
+        catch (error) {
+            results.push({ filePath, status: "failed", reason: error.message });
+        }
+    }
+    return results;
+}
+//# sourceMappingURL=session-mtime.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {