ccus-cli 0.1.11 → 0.1.12

package/README.md

@@ -187,6 +187,8 @@ ccus aggregate serve --input-dir ./team-exports
 ```bash
 ccus sync config --target ./team-exports         # 配置同步目标目录（默认周期 3h）
 ccus sync config --interval daily                # 改周期，可写 3h（默认）/ daily / 6h / 30m
+ccus sync config --suffix laptop                 # 给目标文件名加机器后缀，区分多台电脑
+ccus sync config --no-suffix                     # 移除已配置的机器后缀
 ccus sync config                                 # 不带参数：打印当前配置
 ccus sync                                        # 用已存配置立即同步一次
 ccus sync install                                # 注册系统调度器：每周五 18:00 自动同步（Windows 直接创建计划任务）
@@ -199,6 +201,7 @@ ccus sync status                                 # 查看目标目录、周期
 - **目标目录按周建子目录**：子目录名形如 `2026_06_01_2026_06_07`（该周周一~周日，全下划线），不存在时自动创建。
 - **周一归档上一周**：周一同步时会额外把刚结束的上一整周（`last-week`）导出并归档到对应的上一周子目录（周一是第一个能拿到完整上一周数据的日子）；同一天内多次同步用 `sync-state.lastArchivedWeek` 去重，不重复归档。
 - **复制语义**：本地 `data-dir/exports` 仍保留一份，目标目录再放一份，本地照旧可 `aggregate` / `dashboard`。导出产物与 `ccus export` 完全一致，目标目录可直接喂给 `ccus aggregate`。
+- **机器后缀**：`ccus sync config --suffix laptop` 会在**目标目录副本**的文件名扩展名前加 `-laptop`（如 `…_to_2026-06-07-laptop.json.gz`），本地原文件名不变。同一个人多台电脑同步到同一目标目录时，靠后缀让各机器的文件互不覆盖、都保留下来，正好供 `ccus aggregate` 按 personKey 合并去重。用 `ccus sync config --no-suffix` 移除后缀。
 - **配置与同步分离**：`ccus sync config` 只读写配置（`--target` / `--interval` / `--range` 写进数据目录下的 `sync-config.json`，可手编；不带参数则打印当前配置）；`ccus sync` 只用已存配置执行一次同步。上次同步时间记录在 `sync-state.json`。
 - **周期**：默认 `3h`（每 3 小时最多同步一次的滚动周期）；也支持 `daily`（按**自然日**判断——同一天内不重复同步，跨到下一天才再同步）与 `<N>h` / `<N>m` 的滚动周期。
 

package/dist/cli.js

@@ -61,7 +61,7 @@ const update_check_1 = require("./lib/update-check");
 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]\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 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] [--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 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]\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 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 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) {
@@ -642,12 +642,14 @@ async function handleSync(options) {
     const target = getStringOption(options, "target");
     const interval = getStringOption(options, "interval");
     const range = getStringOption(options, "range");
-    if (target !== undefined || interval !== undefined || range !== undefined) {
+    const suffix = getStringOption(options, "suffix");
+    if (target !== undefined || interval !== undefined || range !== undefined || suffix !== undefined) {
         const current = (0, sync_1.readSyncConfig)(dataDir);
         const next = {
             targetDir: target !== undefined ? node_path_1.default.resolve(target) : current.targetDir,
             intervalLabel: interval ?? current.intervalLabel,
             range: range ?? current.range,
+            suffix: suffix !== undefined ? (0, sync_1.sanitizeSuffix)(suffix) : current.suffix,
         };
         await (0, sync_1.writeSyncConfig)(dataDir, next);
         (0, debug_1.debugLog)("sync", "config updated", next);
@@ -674,6 +676,7 @@ async function handleSyncStatus(options) {
         `目标目录: ${config.targetDir ?? "(未配置)"}`,
         `同步周期: ${config.intervalLabel}`,
         `导出范围: ${config.range}`,
+        `文件后缀: ${config.suffix ?? "(无)"}`,
         `上次同步: ${state?.lastSyncedAt ?? "(从未)"}${state?.lastResult ? ` [${state.lastResult}]` : ""}`,
         state?.lastArchivedWeek ? `已归档上一周: ${state.lastArchivedWeek}` : null,
         state?.lastError ? `上次错误: ${state.lastError}` : null,
@@ -692,19 +695,23 @@ async function handleSyncConfig(options) {
     const target = getStringOption(options, "target");
     const interval = getStringOption(options, "interval");
     const range = getStringOption(options, "range");
+    const suffix = getStringOption(options, "suffix");
+    const clearSuffix = getBooleanOption(options, "no-suffix");
     const current = (0, sync_1.readSyncConfig)(dataDir);
-    const changed = target !== undefined || interval !== undefined || range !== undefined;
+    const changed = target !== undefined || interval !== undefined || range !== undefined || suffix !== undefined || clearSuffix;
     const next = {
         targetDir: target !== undefined ? node_path_1.default.resolve(target) : current.targetDir,
         intervalLabel: interval ?? current.intervalLabel,
         range: range ?? current.range,
+        // --no-suffix 优先清除；否则有 --suffix 就更新，没有就保持原值。
+        suffix: clearSuffix ? null : suffix !== undefined ? (0, sync_1.sanitizeSuffix)(suffix) : current.suffix,
     };
     if (changed) {
         await (0, sync_1.writeSyncConfig)(dataDir, next);
         (0, debug_1.debugLog)("sync", "config updated", next);
     }
     const header = changed ? "同步配置已更新：" : "当前同步配置：";
-    process.stdout.write(`${header}\n  目标目录: ${next.targetDir ?? "(未配置)"}\n  同步周期: ${next.intervalLabel}\n  导出范围: ${next.range}\n`);
+    process.stdout.write(`${header}\n  目标目录: ${next.targetDir ?? "(未配置)"}\n  同步周期: ${next.intervalLabel}\n  导出范围: ${next.range}\n  文件后缀: ${next.suffix ?? "(无)"}\n`);
 }
 /**
  * `ccus sync install`：安装一个系统调度器，每周五 18:00 跑一次 `ccus sync`。

package/dist/lib/sync.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSyncInterval = parseSyncInterval;
+exports.sanitizeSuffix = sanitizeSuffix;
+exports.applyFileSuffix = applyFileSuffix;
 exports.readSyncConfig = readSyncConfig;
 exports.writeSyncConfig = writeSyncConfig;
 exports.readSyncStateSync = readSyncStateSync;
@@ -40,6 +42,41 @@ function parseSyncInterval(label) {
     // 无法识别的标签退回每天语义，保持「默认每天」的承诺。
     return { kind: "daily" };
 }
+/**
+ * 清洗用户传入的文件名后缀：去首尾分隔、把非法字符折叠成连字符。
+ *
+ * 只保留字母数字与 `._-`，避免生成非法/危险的文件名；清洗后为空则返回 null。
+ */
+function sanitizeSuffix(raw) {
+    if (raw === undefined) {
+        return null;
+    }
+    const cleaned = raw
+        .trim()
+        .replaceAll(/[^a-zA-Z0-9._-]+/g, "-")
+        .replaceAll(/-+/g, "-")
+        .replaceAll(/^[-_.]+|[-_.]+$/g, "");
+    return cleaned === "" ? null : cleaned;
+}
+/**
+ * 把后缀插到文件名的扩展名之前（`.json.gz` / `.json` 视为整体扩展名）。
+ *
+ * 例如 `alice_export_2026-06-01_to_2026-06-07.json.gz` + `laptop`
+ * → `alice_export_2026-06-01_to_2026-06-07-laptop.json.gz`。
+ */
+function applyFileSuffix(fileName, suffix) {
+    if (!suffix) {
+        return fileName;
+    }
+    const tag = `-${suffix}`;
+    for (const ext of [".json.gz", ".json"]) {
+        if (fileName.endsWith(ext)) {
+            return `${fileName.slice(0, fileName.length - ext.length)}${tag}${ext}`;
+        }
+    }
+    const ext = node_path_1.default.extname(fileName);
+    return `${fileName.slice(0, fileName.length - ext.length)}${tag}${ext}`;
+}
 /** 把同一本地日映射成稳定日键，用于 daily 周期的「是否跨天」判断。 */
 function localDayKey(date) {
     const year = date.getFullYear();
@@ -53,7 +90,7 @@ function localDayKey(date) {
  * statusline 兜底路径需要同步、极快、绝不抛错，所以这里用同步 IO。
  */
 function readSyncConfig(dataDir) {
-    const fallback = { targetDir: null, intervalLabel: DEFAULT_INTERVAL_LABEL, range: DEFAULT_RANGE };
+    const fallback = { targetDir: null, intervalLabel: DEFAULT_INTERVAL_LABEL, range: DEFAULT_RANGE, suffix: null };
     try {
         const raw = node_fs_1.default.readFileSync((0, paths_1.getSyncConfigPath)(dataDir), "utf8");
         const parsed = JSON.parse(raw);
@@ -61,6 +98,7 @@ function readSyncConfig(dataDir) {
             targetDir: typeof parsed.targetDir === "string" && parsed.targetDir.trim() !== "" ? parsed.targetDir : null,
             intervalLabel: typeof parsed.intervalLabel === "string" && parsed.intervalLabel.trim() !== "" ? parsed.intervalLabel : DEFAULT_INTERVAL_LABEL,
             range: typeof parsed.range === "string" && parsed.range.trim() !== "" ? parsed.range : DEFAULT_RANGE,
+            suffix: typeof parsed.suffix === "string" && parsed.suffix.trim() !== "" ? parsed.suffix : null,
         };
     }
     catch {
@@ -126,14 +164,15 @@ function isSyncDue(config, state, now = new Date()) {
  *
  * 复制语义：本地 exports 仍保留一份，目标目录再放一份。周目录名按导出窗口的周一~周日推导。
  */
-async function exportAndCopy(dataDir, runExport, targetDir, range) {
+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 targetWeekDir = node_path_1.default.join(targetDir, weekDir);
     await promises_1.default.mkdir(targetWeekDir, { recursive: true });
-    const destPath = node_path_1.default.join(targetWeekDir, node_path_1.default.basename(outputPath));
+    // 后缀只加在目标目录的副本上，本地 exports 原文件名保持不变。
+    const destPath = node_path_1.default.join(targetWeekDir, applyFileSuffix(node_path_1.default.basename(outputPath), suffix));
     await promises_1.default.copyFile(outputPath, destPath);
-    (0, debug_1.debugLog)("sync", "copied bundle", { range, outputPath, destPath, weekDir });
+    (0, debug_1.debugLog)("sync", "copied bundle", { range, outputPath, destPath, weekDir, suffix });
     return { outputPath, destPath, weekDir, targetWeekDir };
 }
 /**
@@ -152,14 +191,14 @@ async function performSync(dataDir, runExport, now = new Date()) {
     const state = readSyncStateSync(dataDir);
     let lastArchivedWeek = state?.lastArchivedWeek;
     try {
-        const primary = await exportAndCopy(dataDir, runExport, config.targetDir, config.range);
+        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 (lastArchivedWeek !== lastWeekDir) {
-                const archived = await exportAndCopy(dataDir, runExport, config.targetDir, "last-week");
+                const archived = await exportAndCopy(dataDir, runExport, config.targetDir, "last-week", config.suffix);
                 lastArchivedWeek = archived.weekDir;
                 archivedLastWeekDest = archived.destPath;
                 (0, debug_1.debugLog)("sync", "archived last week", { weekDir: archived.weekDir, destPath: archived.destPath });

package/package.json

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