e10-data 0.1.2 → 0.1.4

package/README.md

@@ -19,6 +19,7 @@ e10-data ds      tables|fields|list|chart|stat|count   数据源（业务模块
 e10-data doc     count|list                            文档查询（documentListCount + documentList）
 e10-data noun    list --skill <skillKey>               词库查询（可带 --source-type/--source-group/--source-table 三参数）
 e10-data field   id2name|name2id                       关联字段翻译（testRemoteBrowser / complete）
+e10-data conf    get|batch|batch-file|resolve|resolve-file|add|add-file|update|delete   环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；confType 默认按 CONN_/DS_/WF_ 前缀推导，可 --type 显式）
 e10-data exp     status|manifest|commits|file|pull|init|commit|lock|release|rollback   专家包版本管理
 ```
 
@@ -41,6 +42,27 @@ e10-data doc count --name 智能问数
 e10-data noun list --skill rd-department
 e10-data field id2name --module ebuilder/form --type ebuilder --ids 3194494277170470571 \
     --form-param '{"fieldId":"966849910772850766","module":"ebuilderform"}'
+e10-data conf get CONN_EC_EDCAPP                                     # 读配置中心单条
+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

@@ -9,6 +9,8 @@
  *   e10-data doc    count|list   文档查询 documentListCount / documentList
  *   e10-data noun   list         词库 getChatDocsBySkillKey
  *   e10-data field  id2name|name2id  关联字段翻译 testRemoteBrowser / complete
+ *   e10-data conf   get|batch|batch-file|resolve|resolve-file|add|add-file|update|delete
+ *                              环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连）
  *
  * 通用：--json 原样输出；复杂 JSON 参数支持 @文件 或 内联（中文走 @文件 更稳）
  * 认证：进程内读取用户级登录缓存 ~/.workbuddy/e10-login-cache.md；不存在/失效提示先 e10-login
@@ -453,6 +455,230 @@ async function cmdFieldName2id(args, json) {
   printHuman("name→id 候选 " + rows.length + " 条", rows.map((x) => ({ id: x.id, name: x.name ?? x.title ?? "" })), ["id", "name"]);
 }
 
+// ---------------- conf：环境参数配置中心（chatBi config map） ----------------
+// 覆盖 config-resolve 原 resolve_config.py 的 URL 直连调用：get/batch/batch-file/resolve/resolve-file
+// 与管理 add/add-file/update/delete。认证复用进程内登录缓存（完整 Cookie + eteamsid，同 query/ds/doc），
+// 无内置令牌；baseUrl 取登录缓存（与 executeQueryDsl 同域）。confType 默认由 key 前缀推导
+// （CONN_→conn / DS_→ds / WF_→wf），可用 --type 显式指定任意大类（如 data-source-query / system-config）。
+const CONF_PREFIX_TYPE = [["CONN_", "conn"], ["DS_", "ds"], ["WF_", "wf"]];
+const CONF_GET_PATH = "/api/dw/newetl/chatBi/getChatBiConfigMap";
+const CONF_BATCH_PATH = "/api/dw/newetl/chatBi/batchGetChatBiConfigMap";
+const CONF_ADD_PATH = "/api/dw/newetl/chatBi/batchAddChatBiConfigMap";
+const CONF_UPDATE_PATH = "/api/dw/newetl/chatBi/updateChatBiConfigMap";
+const CONF_DELETE_PATH = "/api/dw/newetl/chatBi/deleteChatBiConfigMap";
+const CONF_TOKEN_RE = /#\{([A-Z][A-Z0-9_]{2,})\}/g;
+function confKeyType(key, explicitType) {
+  if (explicitType) return explicitType;
+  for (const [p, t] of CONF_PREFIX_TYPE) if (key.startsWith(p)) return t;
+  throw new Error("无法由 confKey 推导 confType（需 CONN_/DS_/WF_ 前缀或显式 --type）: " + key);
+}
+function confFail(j, url) {
+  const m = (j && (j.msg || (j.actionMsg && j.actionMsg.message))) || "";
+  throw new Error("配置服务请求失败 [" + url + "]" + (m ? ": " + m : ""));
+}
+async function confRequest(method, url, bodyObj) {
+  const resp = await fetch(BASE + url, {
+    method,
+    headers: {
+      "accept": "application/json, text/plain, */*",
+      "langType": "zh_CN",
+      "cookie": auth.cookie,
+      "eteamsid": auth.eteamsid,
+      "ebbusinessid": EB_BIZ_ID,
+      "user-agent": UA,
+      ...(bodyObj !== undefined ? { "Content-Type": "application/json;charset=UTF-8" } : {}),
+    },
+    ...(bodyObj !== undefined ? { body: JSON.stringify(bodyObj) } : {}),
+  });
+  const text = await resp.text();
+  let j; try { j = parseJsonSafe(text); } catch { throw new Error("HTTP " + resp.status + " 非JSON响应: " + text.slice(0, 300)); }
+  checkAuthFail(resp, text, j);
+  return j;
+}
+async function confGetData(ctype, key, silent) {
+  const url = CONF_GET_PATH + "?confType=" + encodeURIComponent(ctype) + "&confKey=" + encodeURIComponent(key);
+  let r;
+  try { r = await confRequest("GET", url); }
+  catch (e) { if (silent) return null; throw e; }
+  const data = (r && r.data) || null;
+  if (!silent && (!data || data.confValue === undefined || data.confValue === null || data.confValue === "")) {
+    throw new Error("配置不存在或为空: confType=" + ctype + " confKey=" + key);
+  }
+  return data;
+}
+function confNormalizeBatch(payload) {
+  const data = (payload && payload.data) || null;
+  const out = {};
+  if (Array.isArray(data)) {
+    for (const row of data) {
+      if (!row || typeof row !== "object") continue;
+      const k = row.confKey || row.conf_key;
+      if (k) out[k] = row;
+    }
+  } else if (data && typeof data === "object") {
+    for (const [k, v] of Object.entries(data)) {
+      if (v && typeof v === "object" && !v.confKey) v.confKey = k;
+      out[k] = v;
+    }
+  }
+  return out;
+}
+async function cmdConfGet(args, json, keys) {
+  const key = keys[0];
+  if (!key) throw new Error("conf get 缺少 confKey（用法: conf get <key> [--type t]）");
+  const ctype = confKeyType(key, args.type);
+  const data = await confGetData(ctype, key);
+  if (json) return data;
+  console.log(JSON.stringify(data, null, 1));
+}
+async function cmdConfBatch(args, json, keys) {
+  if (!keys.length) throw new Error("conf batch 缺少 confKey 列表（用法: conf batch <key1> [key2 ...]）");
+  const items = keys.map((k) => ({ confType: confKeyType(k, args.type), confKey: k }));
+  let map = {};
+  try {
+    const r = await confRequest("POST", CONF_BATCH_PATH, items);
+    map = confNormalizeBatch(r);
+    for (const it of items) {
+      const c = map[it.confKey];
+      if (!c || c.confValue === undefined || c.confValue === null || c.confValue === "") {
+        throw new Error("批量响应缺失 confKey=" + it.confKey);
+      }
+    }
+  } catch (e) {
+    if (String(e.message).indexOf("批量响应缺失") === 0) throw e;
+    console.error("[config-resolve] 批量接口不可用，降级逐条单查: " + e.message);
+    map = {};
+    for (const it of items) map[it.confKey] = await confGetData(it.confType, it.confKey);
+  }
+  if (json) return map;
+  printHuman("配置 " + items.length + " 条", keys.map((k) => ({ key: k, confType: items.find((x) => x.confKey === k).confType, confValue: (map[k] || {}).confValue ?? "", confName: (map[k] || {}).confName ?? "" })), ["key", "confType", "confValue", "confName"]);
+}
+async function cmdConfBatchFile(args, json) {
+  if (!args["batch-file"]) throw new Error("conf batch-file 缺少参数（用法: conf batch-file @items.json）");
+  const items = readJsonArg(args["batch-file"], "--batch-file");
+  const list = Array.isArray(items) ? items : [items];
+  const map = {};
+  for (const it of list) {
+    if (!it.confKey || !it.confType) continue;
+    map[it.confKey] = await confGetData(it.confType, it.confKey);
+  }
+  if (json) return map;
+  printHuman("配置 " + Object.keys(map).length + " 条", Object.keys(map).map((k) => ({ key: k, confValue: (map[k] || {}).confValue ?? "", confName: (map[k] || {}).confName ?? "" })), ["key", "confValue", "confName"]);
+}
+async function confResolveAll(keys) {
+  // 多占位符：先批量预取一轮（失败降级逐条单查），返回 {key: data}
+  const items = keys.map((k) => ({ confType: confKeyType(k, ""), confKey: k }));
+  const map = {};
+  try {
+    const r = await confRequest("POST", CONF_BATCH_PATH, items);
+    const got = confNormalizeBatch(r);
+    for (const it of items) {
+      const c = got[it.confKey];
+      if (!c || c.confValue === undefined || c.confValue === null || c.confValue === "") throw new Error("缺失 " + it.confKey);
+      map[it.confKey] = c;
+    }
+  } catch {
+    for (const it of items) map[it.confKey] = await confGetData(it.confType, it.confKey);
+  }
+  return map;
+}
+async function confResolveText(text, json) {
+  const found = [...new Set([...text.matchAll(CONF_TOKEN_RE)].map((m) => m[1]))];
+  const map = found.length ? await confResolveAll(found) : {};
+  const out = text.replace(CONF_TOKEN_RE, (m0, k) => {
+    const cfg = map[k];
+    if (!cfg) throw new Error("配置不存在或为空: " + k);
+    return cfg.confValue ?? "";
+  });
+  if (json) return { input: text, output: out, resolved: Object.fromEntries(Object.entries(map).map(([k, v]) => [k, v.confValue ?? ""])) };
+  return out;
+}
+async function cmdConfResolve(args, json, keys) {
+  let text = keys[0];
+  if (!text) throw new Error("conf resolve 缺少文本（用法: conf resolve '<含#{KEY}文本>' | @file.txt）");
+  if (text.startsWith("@")) text = fs.readFileSync(text.slice(1), "utf-8");
+  const out = await confResolveText(text, json);
+  if (json) { console.log(JSON.stringify(out, null, 1)); return out; }
+  process.stdout.write(out + "\n");
+}
+async function cmdConfResolveFile(args, json) {
+  const p = args["resolve-file"];
+  if (!p) throw new Error("conf resolve-file 缺少文件路径（用法: conf resolve-file <文件路径>）");
+  if (!fs.existsSync(p)) throw new Error("文件不存在: " + p);
+  const text = fs.readFileSync(p, "utf-8");
+  const out = await confResolveText(text, json);
+  if (json) { console.log(JSON.stringify(out, null, 1)); return out; }
+  process.stdout.write(out + "\n");
+}
+async function cmdConfAdd(args, json, keys) {
+  const key = keys[0];
+  if (!key || args.value === undefined) throw new Error("conf add 缺少 confKey/confValue（用法: conf add <key> --value <真实值> [--name] [--attrs] [--type] [--force]）");
+  const ctype = confKeyType(key, args.type);
+  if (!args.force && await confGetData(ctype, key, true)) {
+    console.error("[config-resolve] 配置已存在，跳过新增（如需修改请用 conf update；确需重建可先 conf delete）: " + key);
+    return null;
+  }
+  const item = { confType: ctype, confKey: key, confValue: String(args.value), confAttrs: args.attrs || "", confName: args.name || "" };
+  const r = await confRequest("POST", CONF_ADD_PATH, [item]);
+  if (json) return r;
+  console.log("新增成功: " + key + " = " + item.confValue);
+}
+async function cmdConfAddFile(args, json) {
+  if (args["add-file"] === undefined) throw new Error("conf add-file 缺少参数（用法: conf add-file @items.json）");
+  const items = readJsonArg(args["add-file"], "--add-file");
+  const list = Array.isArray(items) ? items : [items];
+  const toAdd = [];
+  for (const it of list) {
+    if (!it.confKey || it.confValue === undefined) continue;
+    const ctype = it.confType || confKeyType(it.confKey, args.type);
+    const dup = await confGetData(ctype, it.confKey, true);
+    if (dup) { console.error("[config-resolve] 已存在跳过: " + it.confKey); continue; }
+    toAdd.push({ confType: ctype, confKey: it.confKey, confValue: String(it.confValue), confAttrs: it.confAttrs || "", confName: it.confName || "" });
+  }
+  if (!toAdd.length) { console.log("全部已存在，无新增"); return null; }
+  const r = await confRequest("POST", CONF_ADD_PATH, toAdd);
+  if (json) return r;
+  console.log("批量新增 " + toAdd.length + " 条成功");
+}
+async function cmdConfUpdate(args, json, keys) {
+  const key = keys[0];
+  if (!key) throw new Error("conf update 缺少 confKey（用法: conf update <key> [--value v] [--name n] [--attrs a] [--type t]）");
+  if (args.value === undefined && args.name === undefined && args.attrs === undefined) {
+    throw new Error("conf update 至少需提供 --value / --name / --attrs 之一");
+  }
+  const body = { confType: confKeyType(key, args.type), confKey: key };
+  if (args.value !== undefined) body.confValue = String(args.value);
+  if (args.name !== undefined) body.confName = args.name;
+  if (args.attrs !== undefined) body.confAttrs = args.attrs;
+  const r = await confRequest("POST", CONF_UPDATE_PATH, body);
+  if (json) return r;
+  console.log("更新成功: " + key);
+}
+async function cmdConfDelete(args, json, keys) {
+  const key = keys[0];
+  if (!key) throw new Error("conf delete 缺少 confKey（用法: conf delete <key> [--type t]）");
+  const ctype = confKeyType(key, args.type);
+  const url = CONF_DELETE_PATH + "?confType=" + encodeURIComponent(ctype) + "&confKey=" + encodeURIComponent(key);
+  const r = await confRequest("DELETE", url);
+  if (json) return r;
+  console.log("删除成功: " + key);
+}
+async function cmdConf(sub, args, json, pos) {
+  const keys = pos.slice(2);
+  switch (sub) {
+    case "get": return cmdConfGet(args, json, keys);
+    case "batch": return cmdConfBatch(args, json, keys);
+    case "batch-file": return cmdConfBatchFile(args, json);
+    case "resolve": return cmdConfResolve(args, json, keys);
+    case "resolve-file": return cmdConfResolveFile(args, json);
+    case "add": return cmdConfAdd(args, json, keys);
+    case "add-file": return cmdConfAddFile(args, json);
+    case "update": return cmdConfUpdate(args, json, keys);
+    case "delete": return cmdConfDelete(args, json, keys);
+    default: usage(); process.exit(1);
+  }
+}
+
 // ---------------- exp：专家包版本管理（expert-repository） ----------------
 async function expGet(url) {
   // 返回 {raw, j}：raw 用于正则提取大整数 id（commitId 19 位超 JS Number 精度，JSON.parse 会丢精度！）
@@ -479,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 = [];
@@ -491,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 });
     }
@@ -577,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);
@@ -656,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) {
@@ -734,12 +1027,22 @@ noun    词库查询
 field   关联字段翻译
   field id2name  --module <m> --type <t> --ids id1,id2 [--form-param '{"fieldId":"..","module":"ebuilderform"}'|--eb-browser-param '{..}'|--property-type x]
   field name2id  --module <m> --type <t> --name 名称 [同上附加参数]
+conf    环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；confType 默认由 CONN_/DS_/WF_ 前缀推导，可 --type 显式）
+  conf get <key> [--type t]                       # 单查（confValue/confAttrs/confName 全量 JSON）
+  conf batch <key1> [key2 ...]                    # 批量查（批量接口异常自动降级逐条单查）
+  conf batch-file @items.json                     # 按 [{confType,confKey}..] 显式批量查（支持任意 confType）
+  conf resolve '<含#{KEY}文本>'|@file.txt         # 文本占位符替换为真实值（含中文建议 @file）
+  conf resolve-file <文件路径>                     # 读文件替换全部占位符并打印（不改写原文件）
+  conf add <key> --value <真实值> [--name 说明] [--attrs '{"schema":..}'] [--type t] [--force]  # 新增（默认判重，已存在跳过）
+  conf add-file @items.json                       # JSON 数组批量新增（逐条判重）
+  conf update <key> [--value v] [--name n] [--attrs a] [--type t]   # 更新（confType+confKey 定位，传哪个字段更哪个）
+  conf delete <key> [--type t]                    # 删除
 exp     专家包版本管理（expert-repository/v1，响应以 data.actionMsg.code=0 判成功）
   exp status    --expert <code> [--branch main]                       # 仓库状态（headCommitId/headRevision=提交基线）
   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>
@@ -750,7 +1053,8 @@ exp     专家包版本管理（expert-repository/v1，响应以 data.actionMsg.
 
 async function main() {
   const rawArgv = process.argv.slice(2);
-  if (rawArgv.includes("--version") || rawArgv.includes("-v") || rawArgv.includes("version")) {
+  // 仅当顶层显式 -v/--version（无子命令）时打印版本；exp release/rollback 的 --version 是版本号参数、conf 文本可能含 version 字样，一律放行
+  if (rawArgv.length === 1 && (rawArgv[0] === "--version" || rawArgv[0] === "-v")) {
     console.log("e10-data " + cliVersion());
     process.exit(0);
   }
@@ -782,6 +1086,9 @@ async function main() {
     if (sub === "id2name") result = await cmdFieldId2name(args, json);
     else if (sub === "name2id") result = await cmdFieldName2id(args, json);
     else { usage(); process.exit(1); }
+  } else if (family === "conf") {
+    if (!sub) { usage(); process.exit(1); }
+    result = await cmdConf(sub, args, json, pos);
   } else if (family === "exp") {
     if (!sub) { usage(); process.exit(1); }
     switch (sub) {

package/package.json

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