e10-data 0.1.3 → 0.1.4

package/README.md

@@ -47,5 +47,22 @@ e10-data conf resolve '{"connId":"#{CONN_EC_EDCAPP}"}'                # 占位
 e10-data conf add CONN_EC_EDCAPP --value 10 --name "说明" --attrs '{"schema":"ec_edcapp"}'
 e10-data conf delete CONN_EC_EDCAPP
 e10-data exp status --expert data-assistant
-e10-data exp pull --expert data-assistant --dir <本地专家包目录> --dry-run
+e10-data exp pull --expert data-assistant --dir <本地专家包目录> [--dry-run] [--force]
 ```
+
+## exp pull 智能拉取（v0.1.4 新增，防本地修改被覆盖）
+
+`exp pull` 不再盲目覆盖。CLI 在专家包本地目录维护基线文件 `.sync-state.json`（记录上次同步的 commitId/headRevision 与每文件 sha256），拉取时逐文件三方对比：
+
+| 场景 | 判定 | 处理 |
+|---|---|---|
+| 仅远端改（本地未动） | 本地 sha == 基线 sha ≠ 远端 sha | 直接下载覆盖（安全） |
+| 仅本地改（远端未动） | 本地 sha ≠ 基线 sha == 远端 sha | **保留本地，不覆盖** |
+| 双方都改 / 无基线可判 | 本地、基线、远端互不相同 | **先备份本地副本到 `<专家包目录>.pull-backup-<时间戳>/`，再下载覆盖** |
+| 本地缺失 | manifest 有、本地无 | 直接下载（新增/恢复） |
+
+- 拉取成功后将 `.sync-state.json` 刷新到新 head，后续判定持续准确；
+- `--force`：一律以远端覆盖（放弃本地修改，不备份）；
+- `--dry-run`：只预览决策，不写盘不下载；
+- `.sync-state.json` 为本地同步元文件，**永不随包提交**（`walkDir`/`collectPackage` 已排除）；`exp commit` 成功后也会自动刷新该基线。
+

package/bin/e10-data.mjs

@@ -705,6 +705,7 @@ function rawNumSeq(raw, key) {
 }
 const EXP_ALLOWED_DIRS = [".codebuddy-plugin", "agents", "avatars", "skills"];
 const EXP_SKIP_DIRS = [".git", ".workbuddy", "node_modules", "__pycache__"];
+const EXP_SKIP_FILES = [".sync-state.json"]; // 本地同步状态元文件（含基线 sha），永不随包提交
 function sha256(buf) { return crypto.createHash("sha256").update(buf).digest("hex"); }
 function walkDir(dir, root) {
   const out = [];
@@ -717,6 +718,7 @@ function walkDir(dir, root) {
       if (rel.includes("/") && !EXP_ALLOWED_DIRS.includes(top)) continue; // 仅允许根文件+四大目录
       walkDir(abs, root).forEach((x) => out.push(x));
     } else if (entry.isFile()) {
+      if (EXP_SKIP_FILES.includes(entry.name)) continue; // .sync-state.json 不入包
       const top = rel.split("/")[0];
       if (!rel.includes("/") || EXP_ALLOWED_DIRS.includes(top)) out.push({ rel, abs });
     }
@@ -803,37 +805,96 @@ async function expFile(args, json) {
   if (json) { console.log(JSON.stringify({ relativePath: rp, size: buf.length, base64: buf.toString("base64") })); return; }
   process.stdout.write(buf.toString("utf-8"));
 }
+// ---- exp 智能拉取：基线状态文件（三方差异保护，2026-09-04 实现）----
+// .sync-state.json 记录上次成功同步的 commitId/revision 与每文件 sha256（基线）。
+// pull 逐文件三方对比：local(当前本地) vs base(上次同步基线) vs remote(远端 manifest)，
+// 决策：仅远端改→覆盖；仅本地改→保留本地；双方都改→备份本地副本后覆盖（备份目录保留本地版）；
+// 无基线文件/基线无记录→保守备份后覆盖。拉取成功后把 .sync-state.json 更新为新 head。
+function syncStatePath(dir) { return path.join(dir, ".sync-state.json"); }
+function readSyncState(dir) {
+  const p = syncStatePath(dir);
+  if (!fs.existsSync(p)) return null;
+  try {
+    const j = JSON.parse(fs.readFileSync(p, "utf-8"));
+    const files = {};
+    for (const [rel, v] of Object.entries(j.files || {})) files[rel] = (typeof v === "string") ? v : (v.sha256 || "");
+    return { commitId: String(j.commitId || ""), headRevision: j.headRevision, files };
+  } catch { return null; }
+}
+function writeSyncState(dir, commitId, headRevision, fileShaMap) {
+  const files = {};
+  for (const [rel, sha] of Object.entries(fileShaMap)) files[rel] = { sha256: sha };
+  const obj = { commitId: String(commitId), headRevision, files, updateTime: new Date().toISOString() };
+  fs.writeFileSync(syncStatePath(dir), JSON.stringify(obj, null, 1), "utf-8");
+}
 async function expPull(args, json) {
   const expert = need("expert", args), dir = need("dir", args);
   const dry = !!args["dry-run"];
+  const force = !!args["force"]; // --force = 一律以远端覆盖（放弃本地修改）
   const st = await expGet("/api/dw/expert-repository/v1/repositories/status?expertCode=" + encodeURIComponent(expert) + "&branchName=" + (args.branch || "main"));
   if (!expOk(st.j)) throw new Error(expFailMsg(st.j));
   const headId = rawNum(st.raw, "headCommitId") || String((st.j.data || {}).headCommitId);
+  const headRev = (st.j.data || {}).headRevision;
   const mf = await expGet("/api/dw/expert-repository/v1/repositories/manifest?expertCode=" + encodeURIComponent(expert) + "&branchName=" + (args.branch || "main"));
   if (!expOk(mf.j)) throw new Error(expFailMsg(mf.j));
   const items = (mf.j.data || []).filter((f) => f.relativePath && f.relativePath !== "DELETE");
   const local = fs.existsSync(dir) ? localShaMap(dir) : {};
-  let downloaded = 0, unchanged = 0, changed = 0, missing = 0;
-  const plan = [];
+  const base = readSyncState(dir); // 基线：上次同步后的文件 sha（无则 null）
+  const baseCommit = (base && base.commitId) || "";
+  // 基线有效判定：上次同步 commitId 须在提交历史上（取不到历史就保守按无基线处理）
+  let backupRoot = "";
+  let downloaded = 0, unchanged = 0, preserved = 0, backed = 0, missing = 0;
+  const plan = []; // {rel, action, reason}
+  const mkBackupRoot = () => {
+    if (backupRoot) return backupRoot;
+    const absDir = path.resolve(dir);
+    const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+    backupRoot = path.join(path.dirname(absDir), path.basename(absDir) + ".pull-backup-" + ts);
+    fs.mkdirSync(backupRoot, { recursive: true });
+    return backupRoot;
+  };
   for (const it of items) {
     const lp = path.join(dir, it.relativePath.split("/").join(path.sep));
     const ls = local[it.relativePath];
+    const baseSha = (base && base.files) ? base.files[it.relativePath] : undefined;
     if (ls === it.sha256) { unchanged++; continue; }
-    changed++;
-    if (ls === undefined) missing++;
-    plan.push({ rel: it.relativePath, lp, sha: it.sha256, size: it.size });
+    if (ls === undefined) { // 本地缺失 → 直接下载（新增/恢复）
+      missing++; plan.push({ rel: it.relativePath, action: dry ? "待下载" : "已下载", reason: "本地缺失" });
+    } else if (!force && baseSha !== undefined && ls === baseSha && baseSha !== it.sha256) {
+      // 仅远端改（本地未动，与基线一致）→ 覆盖
+      plan.push({ rel: it.relativePath, action: dry ? "待下载" : "已下载", reason: "远端更新（本地未动）" });
+    } else if (!force && baseSha !== undefined && baseSha === it.sha256) {
+      // 仅本地改（远端=基线，本地≠基线）→ 保留本地，不覆盖
+      preserved++; plan.push({ rel: it.relativePath, action: "保留本地", reason: "本地修改（远端未动）" });
+      continue;
+    } else { // 双方都改 / 无基线可判 / --force → 先备份本地副本再覆盖
+      backed++;
+      if (!dry && !force) {
+        const bdir = path.join(mkBackupRoot(), it.relativePath.split("/").join(path.sep));
+        fs.mkdirSync(path.dirname(bdir), { recursive: true });
+        fs.copyFileSync(lp, bdir);
+      }
+      plan.push({ rel: it.relativePath, action: dry ? "待下载(将备份本地)" : (force ? "已下载(force覆盖)" : "已下载(本地已备份)"), reason: (force ? "force 覆盖" : (baseSha === undefined ? "无基线记录" : "双方都改")) });
+    }
     if (dry) continue;
     fs.mkdirSync(path.dirname(lp), { recursive: true });
     const buf = await rawGet("/api/dw/expert-repository/v1/repositories/file?expertCode=" + encodeURIComponent(expert) + "&commitId=" + encodeURIComponent(headId) + "&relativePath=" + encodeURIComponent(it.relativePath));
     fs.writeFileSync(lp, buf);
     downloaded++;
   }
-  const out = { expert, headCommitId: headId, total: items.length, unchanged, changed, downloaded, missing, dryRun: !!dry };
+  // 拉取成功后更新基线状态文件（记录新 head + 本地最终文件 sha）
+  if (!dry) {
+    const finalLocal = localShaMap(dir);
+    writeSyncState(dir, headId, headRev, finalLocal);
+  }
+  const out = { expert, headCommitId: headId, headRevision: headRev, total: items.length, unchanged, downloaded, preserved, backed, missing, dryRun: !!dry, backupDir: backupRoot || undefined };
   if (json) { console.log(JSON.stringify(out)); return; }
   console.log("== pull " + expert + "@" + headId + (dry ? " (dry-run)" : "") + " ==");
-  console.log("清单 " + out.total + " 项 | 未变 " + unchanged + " | 需更新 " + changed + "（缺失 " + missing + "）" + (dry ? "（dry-run 未下载）" : " | 已下载 " + downloaded));
-  for (const p of plan.slice(0, 30)) console.log("  " + (dry ? "[待下载]" : "[已下载]") + " " + p.rel + " (" + p.sha.slice(0, 12) + "…)");
-  if (plan.length > 30) console.log("  ... 共 " + plan.length + " 个文件待更新");
+  console.log("清单 " + out.total + " 项 | 未变 " + unchanged + " | 已下载 " + downloaded + " | 保留本地 " + preserved + " | 覆盖前备份 " + backed + " | 缺失 " + missing);
+  for (const p of plan.slice(0, 40)) console.log("  [" + p.action + "] " + p.rel + (p.reason ? "（" + p.reason + "）" : ""));
+  if (plan.length > 40) console.log("  ... 共 " + plan.length + " 个文件");
+  if (backupRoot && !dry) console.log("本地修改副本备份于: " + backupRoot);
+  if (preserved > 0 && !dry) console.log("⚠️ " + preserved + " 个文件因含本地修改被保留（远端未改）；如需强制覆盖请加 --force");
 }
 async function expInit(args, json) {
   const expert = need("expert", args), dir = need("dir", args);
@@ -882,6 +943,12 @@ async function expCommit(args, json) {
     if (/基线|过期|revision|冲突/i.test(m)) throw new Error("提交冲突: " + m + " —— 请先 exp pull 拉取最新并合并后重试");
     throw new Error("提交失败: " + m);
   }
+  // 提交成功后把本地 .sync-state.json 基线刷新到新 head（与本地文件 sha 一致），保证后续 pull 三方判定准确
+  const rj = r.data || {};
+  const newHead = rawNum(JSON.stringify(r), "headCommitId") || rawNum(JSON.stringify(r), "commitId") || rj.headCommitId || rj.commitId || "";
+  if (newHead && fs.existsSync(dir)) {
+    try { writeSyncState(dir, newHead, rj.headRevision ?? rj.revision ?? 0, localShaMap(dir)); } catch {}
+  }
   console.log("== 提交成功 =="); console.log(JSON.stringify(r.data ?? {}, null, 1));
 }
 async function expLock(args, json) {
@@ -975,7 +1042,7 @@ exp     专家包版本管理（expert-repository/v1，响应以 data.actionMsg.
   exp manifest  --expert <code> [--commit <id>]                       # 文件清单（sha256）
   exp commits   --expert <code>                                       # 提交历史
   exp file      --expert <code> --commit <id> --path <相对路径> [--out 本地文件]
-  exp pull      --expert <code> --dir <本地专家包目录> [--dry-run]     # 按 manifest sha 差异下载缺失/不一致文件
+  exp pull      --expert <code> --dir <本地专家包目录> [--dry-run] [--force]   # 智能拉取：基线三方对比（仅远端改→覆盖/仅本地改→保留/双方都改→备份后覆盖；--force 一律覆盖），成功后更新 .sync-state.json 基线
   exp init      --expert <code> --dir <本地目录> [--display-name X] [--message 初始化导入]
   exp commit    --expert <code> --dir <本地目录> --message "..." [--mode FULL_SNAPSHOT|FILE_PATCH]
   exp lock      --expert <code> --action query|acquire(默认)|heartbeat|release --component ROOT --ttl 30 --lock-token <token>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "e10-data",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "泛微 E10 数据接口统一 CLI（data-assistant 专家配套）：DSL 查询/数据源/文档/词库/关联字段翻译/环境参数配置中心(conf)/专家包版本管理，认证复用 weaver-e10-login 登录态",
   "author": "e10-dw",
   "license": "MIT",