wangchuan 1.0.2 → 2.2.0

package/dist/src/core/sync.js

@@ -6,12 +6,17 @@
  *   restoreFromRepo  本地仓库目录 → 工作区（拉取后还原）
  *   diff             对比两侧，返回差异摘要
  *
+ * 支持三层同步：
+ *   shared   — 跨 agent 共享（skills、MCP 模板、共享记忆）
+ *   agents/* — per-agent 跨环境同步
+ *
  * 所有方法支持可选的 agent 过滤参数，只操作指定智能体的文件。
  */
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { cryptoEngine } from './crypto.js';
+import { jsonField } from './json-field.js';
 import { validator } from '../utils/validator.js';
 import { logger } from '../utils/logger.js';
 import { askConflict } from '../utils/prompt.js';
@@ -36,6 +41,138 @@ function walkDir(dirAbs) {
     fs.readdirSync(dirAbs).forEach(f => walk(f));
     return results;
 }
+/** 按 repoRel 去重，保留第一个出现的条目 */
+function deduplicateEntries(entries) {
+    const seen = new Set();
+    return entries.filter(e => {
+        if (seen.has(e.repoRel))
+            return false;
+        seen.add(e.repoRel);
+        return true;
+    });
+}
+const AGENT_NAMES = ['openclaw', 'claude', 'gemini'];
+/**
+ * 为指定 agent profile 生成 syncFiles + syncDirs + jsonFields 条目
+ */
+function buildAgentEntries(name, profile, repoDirBase) {
+    const entries = [];
+    const wsPath = expandHome(profile.workspacePath);
+    const repoPrefix = `agents/${name}`;
+    // syncFiles
+    for (const item of profile.syncFiles) {
+        const suffix = item.encrypt ? '.enc' : '';
+        entries.push({
+            srcAbs: path.join(wsPath, item.src),
+            repoRel: path.join(repoPrefix, item.src + suffix),
+            plainRel: path.join(repoPrefix, item.src),
+            encrypt: item.encrypt,
+            agentName: name,
+        });
+    }
+    // syncDirs
+    for (const dir of (profile.syncDirs ?? [])) {
+        const scanBase = repoDirBase
+            ? path.join(repoDirBase, repoPrefix, dir.src)
+            : path.join(wsPath, dir.src);
+        if (!fs.existsSync(scanBase))
+            continue;
+        for (const relFile of walkDir(scanBase)) {
+            const suffix = dir.encrypt ? '.enc' : '';
+            const plainFile = relFile.endsWith('.enc') ? relFile.slice(0, -4) : relFile;
+            entries.push({
+                srcAbs: path.join(wsPath, dir.src, plainFile),
+                repoRel: path.join(repoPrefix, dir.src, plainFile + suffix),
+                plainRel: path.join(repoPrefix, dir.src, plainFile),
+                encrypt: dir.encrypt,
+                agentName: name,
+            });
+        }
+    }
+    // jsonFields — 字段级 JSON 提取
+    for (const jf of (profile.jsonFields ?? [])) {
+        const suffix = jf.encrypt ? '.enc' : '';
+        entries.push({
+            srcAbs: path.join(wsPath, jf.src),
+            repoRel: path.join(repoPrefix, jf.repoName + suffix),
+            plainRel: path.join(repoPrefix, jf.repoName),
+            encrypt: jf.encrypt,
+            agentName: name,
+            jsonExtract: {
+                fields: jf.fields,
+                originalPath: path.join(wsPath, jf.src),
+            },
+        });
+    }
+    return entries;
+}
+/**
+ * 构建 shared tier 条目（skills、MCP 模板、共享文件）
+ */
+function buildSharedEntries(cfg, repoDirBase) {
+    const entries = [];
+    const shared = cfg.shared;
+    if (!shared)
+        return entries;
+    const profiles = cfg.profiles.default;
+    // ── shared skills：多源汇聚 ────────────────────────────────
+    for (const source of shared.skills.sources) {
+        const p = profiles[source.agent];
+        if (!p.enabled)
+            continue;
+        const wsPath = expandHome(p.workspacePath);
+        const scanBase = repoDirBase
+            ? path.join(repoDirBase, 'shared', 'skills')
+            : path.join(wsPath, source.dir);
+        if (!fs.existsSync(scanBase))
+            continue;
+        for (const relFile of walkDir(scanBase)) {
+            // 跳过 .DS_Store 等系统文件
+            if (path.basename(relFile).startsWith('.'))
+                continue;
+            entries.push({
+                srcAbs: path.join(wsPath, source.dir, relFile),
+                repoRel: path.join('shared', 'skills', relFile),
+                plainRel: path.join('shared', 'skills', relFile),
+                encrypt: false,
+                agentName: 'shared',
+            });
+        }
+    }
+    // ── shared MCP：从各 agent 的 JSON 中提取 mcpServers ──────
+    for (const source of shared.mcp.sources) {
+        const p = profiles[source.agent];
+        if (!p.enabled)
+            continue;
+        const wsPath = expandHome(p.workspacePath);
+        const srcPath = path.join(wsPath, source.src);
+        const repoName = `mcp/${source.agent}-${source.field}.json`;
+        entries.push({
+            srcAbs: srcPath,
+            repoRel: path.join('shared', repoName + '.enc'),
+            plainRel: path.join('shared', repoName),
+            encrypt: true,
+            agentName: 'shared',
+            jsonExtract: {
+                fields: [source.field],
+                originalPath: srcPath,
+            },
+        });
+    }
+    // ── shared syncFiles ───────────────────────────────────────
+    for (const item of shared.syncFiles) {
+        const wsPath = expandHome(item.workspacePath);
+        const suffix = item.encrypt ? '.enc' : '';
+        entries.push({
+            srcAbs: path.join(wsPath, item.src),
+            repoRel: path.join('shared', item.src + suffix),
+            plainRel: path.join('shared', item.src),
+            encrypt: item.encrypt,
+            agentName: 'shared',
+        });
+    }
+    return entries;
+}
 /**
  * 构建需要同步的文件条目列表（所有同步方向的单一事实来源）。
  *
@@ -44,83 +181,204 @@ function walkDir(dirAbs) {
  */
 export function buildFileEntries(cfg, repoDirBase, agent) {
     const entries = [];
-    const profile = cfg.profiles.default;
-    // ── OpenClaw ────────────────────────────────────────────────
-    if (profile.openclaw.enabled && (!agent || agent === 'openclaw')) {
-        const wsPath = expandHome(profile.openclaw.workspacePath);
-        for (const item of profile.openclaw.syncFiles) {
-            const suffix = item.encrypt ? '.enc' : '';
-            entries.push({
-                srcAbs: path.join(wsPath, item.src),
-                repoRel: path.join('openclaw', item.src + suffix),
-                plainRel: path.join('openclaw', item.src),
-                encrypt: item.encrypt,
-                agentName: 'openclaw',
-            });
+    const profiles = cfg.profiles.default;
+    // per-agent 条目
+    for (const name of AGENT_NAMES) {
+        const p = profiles[name];
+        if (!p.enabled || (agent && agent !== name))
+            continue;
+        entries.push(...buildAgentEntries(name, p, repoDirBase));
+    }
+    // shared 条目（--agent 过滤时不包含 shared，因为 shared 不属于任何单一 agent）
+    if (!agent) {
+        entries.push(...buildSharedEntries(cfg, repoDirBase));
+    }
+    return deduplicateEntries(entries);
+}
+/**
+ * 将 shared 内容（skills、MCP 配置）分发到各 agent 的本地目录。
+ * push 前调用，确保各 agent 在推送前已获得最新共享资源。
+ */
+function distributeShared(cfg) {
+    const shared = cfg.shared;
+    if (!shared)
+        return;
+    const profiles = cfg.profiles.default;
+    // ── 分发 skills：从每个 source 收集，只添加对方完全没有的新 skill ──
+    // 收集各 agent 当前拥有的 skill 集合
+    const agentSkills = new Map(); // agent → relPath → absPath
+    for (const source of shared.skills.sources) {
+        const p = profiles[source.agent];
+        if (!p.enabled)
+            continue;
+        const skillsDir = path.join(expandHome(p.workspacePath), source.dir);
+        const skills = new Map();
+        if (fs.existsSync(skillsDir)) {
+            for (const relFile of walkDir(skillsDir)) {
+                if (path.basename(relFile).startsWith('.'))
+                    continue;
+                skills.set(relFile, path.join(skillsDir, relFile));
+            }
         }
-        for (const dir of profile.openclaw.syncDirs) {
-            const scanBase = repoDirBase
-                ? path.join(repoDirBase, 'openclaw', dir.src)
-                : path.join(wsPath, dir.src);
-            if (!fs.existsSync(scanBase))
-                continue;
-            for (const relFile of walkDir(scanBase)) {
-                const suffix = dir.encrypt ? '.enc' : '';
-                const plainFile = relFile.endsWith('.enc') ? relFile.slice(0, -4) : relFile;
-                entries.push({
-                    srcAbs: path.join(wsPath, dir.src, plainFile),
-                    repoRel: path.join('openclaw', dir.src, plainFile + suffix),
-                    plainRel: path.join('openclaw', dir.src, plainFile),
-                    encrypt: dir.encrypt,
-                    agentName: 'openclaw',
-                });
+        agentSkills.set(source.agent, skills);
+    }
+    // 合并所有 agent 的 skill（去重，先出现者优先）
+    const allSkills = new Map();
+    for (const skills of agentSkills.values()) {
+        for (const [rel, abs] of skills) {
+            if (!allSkills.has(rel))
+                allSkills.set(rel, abs);
+        }
+    }
+    // 分发：只把某 agent 缺少的 skill 复制过去（skill 存在于全局集合中）
+    for (const source of shared.skills.sources) {
+        const p = profiles[source.agent];
+        if (!p.enabled)
+            continue;
+        const mySkills = agentSkills.get(source.agent);
+        const skillsDir = path.join(expandHome(p.workspacePath), source.dir);
+        for (const [relFile, srcAbs] of allSkills) {
+            if (mySkills.has(relFile))
+                continue; // 已有，不覆盖
+            const dest = path.join(skillsDir, relFile);
+            fs.mkdirSync(path.dirname(dest), { recursive: true });
+            fs.copyFileSync(srcAbs, dest);
+            logger.debug(`  分发 skill: ${relFile} → ${source.agent}`);
+        }
+    }
+    // ── 分发 MCP 配置：从每个 source 提取，merge 到其他 agent ──
+    const mergedMcp = {};
+    for (const source of shared.mcp.sources) {
+        const p = profiles[source.agent];
+        if (!p.enabled)
+            continue;
+        const srcPath = path.join(expandHome(p.workspacePath), source.src);
+        if (!fs.existsSync(srcPath))
+            continue;
+        try {
+            const json = JSON.parse(fs.readFileSync(srcPath, 'utf-8'));
+            const mcpField = json[source.field];
+            if (mcpField && typeof mcpField === 'object') {
+                Object.assign(mergedMcp, mcpField);
             }
         }
+        catch { /* 忽略解析失败 */ }
     }
-    // ── Claude ──────────────────────────────────────────────────
-    if (profile.claude.enabled && (!agent || agent === 'claude')) {
-        const wsPath = expandHome(profile.claude.workspacePath);
-        for (const item of profile.claude.syncFiles) {
-            const suffix = item.encrypt ? '.enc' : '';
-            entries.push({
-                srcAbs: path.join(wsPath, item.src),
-                repoRel: path.join('claude', item.src + suffix),
-                plainRel: path.join('claude', item.src),
-                encrypt: item.encrypt,
-                agentName: 'claude',
-            });
+    // 写回到每个 source agent 的 MCP 配置（文件不存在时创建）
+    if (Object.keys(mergedMcp).length > 0) {
+        for (const source of shared.mcp.sources) {
+            const p = profiles[source.agent];
+            if (!p.enabled)
+                continue;
+            const srcPath = path.join(expandHome(p.workspacePath), source.src);
+            try {
+                let json = {};
+                if (fs.existsSync(srcPath)) {
+                    json = JSON.parse(fs.readFileSync(srcPath, 'utf-8'));
+                }
+                const currentMcp = (json[source.field] ?? {});
+                // 只添加本地没有的 MCP server，不覆盖已有配置
+                let changed = false;
+                for (const [key, val] of Object.entries(mergedMcp)) {
+                    if (!(key in currentMcp)) {
+                        currentMcp[key] = val;
+                        changed = true;
+                    }
+                }
+                if (changed) {
+                    json[source.field] = currentMcp;
+                    fs.mkdirSync(path.dirname(srcPath), { recursive: true });
+                    fs.writeFileSync(srcPath, JSON.stringify(json, null, 2), 'utf-8');
+                    logger.debug(`  分发 MCP servers → ${source.agent}`);
+                }
+            }
+            catch { /* 忽略 */ }
         }
     }
-    // ── Gemini ──────────────────────────────────────────────────
-    if (profile.gemini.enabled && (!agent || agent === 'gemini')) {
-        const wsPath = expandHome(profile.gemini.workspacePath);
-        for (const item of profile.gemini.syncFiles) {
-            const suffix = item.encrypt ? '.enc' : '';
-            entries.push({
-                srcAbs: path.join(wsPath, item.src),
-                repoRel: path.join('gemini', item.src + suffix),
-                plainRel: path.join('gemini', item.src),
-                encrypt: item.encrypt,
-                agentName: 'gemini',
-            });
+}
+/**
+ * 清理 repo 中的过期文件 — repo 有但当前 entries 中不包含的条目删除。
+ * 仅清理 agents/ 和 shared/ 目录下的文件（不删 .git 等）。
+ */
+function pruneRepoStaleFiles(repoPath, entries) {
+    const activeRepoRels = new Set(entries.map(e => e.repoRel));
+    const deleted = [];
+    for (const topDir of ['agents', 'shared']) {
+        const scanRoot = path.join(repoPath, topDir);
+        if (!fs.existsSync(scanRoot))
+            continue;
+        for (const relFile of walkDir(scanRoot)) {
+            if (path.basename(relFile).startsWith('.'))
+                continue;
+            const repoRel = path.join(topDir, relFile);
+            if (!activeRepoRels.has(repoRel)) {
+                const abs = path.join(repoPath, repoRel);
+                fs.unlinkSync(abs);
+                deleted.push(repoRel);
+                logger.debug(`  repo 清理过期文件: ${repoRel}`);
+                // 清理空目录
+                let dir = path.dirname(abs);
+                while (dir !== scanRoot && dir.startsWith(scanRoot)) {
+                    const remaining = fs.readdirSync(dir);
+                    if (remaining.length === 0) {
+                        fs.rmdirSync(dir);
+                        dir = path.dirname(dir);
+                    }
+                    else {
+                        break;
+                    }
+                }
+            }
         }
     }
-    return entries;
+    return deleted;
 }
 export const syncEngine = {
     expandHome,
     buildFileEntries,
+    /**
+     * 推送前：先分发 shared 内容到各 agent，再收集文件到 repo。
+     */
     async stageToRepo(cfg, agent) {
+        // 推送全部时，先分发 shared 资源到各 agent
+        if (!agent) {
+            distributeShared(cfg);
+        }
         const repoPath = expandHome(cfg.localRepoPath);
         const keyPath = expandHome(cfg.keyPath);
         const entries = buildFileEntries(cfg, undefined, agent);
-        const result = { synced: [], skipped: [], encrypted: [] };
+        const result = { synced: [], skipped: [], encrypted: [], deleted: [] };
         for (const entry of entries) {
             if (!fs.existsSync(entry.srcAbs)) {
                 logger.debug(`跳过（不存在）: ${entry.srcAbs}`);
                 result.skipped.push(entry.srcAbs);
                 continue;
             }
+            const destAbs = path.join(repoPath, entry.repoRel);
+            fs.mkdirSync(path.dirname(destAbs), { recursive: true });
+            // ── JSON 字段级提取 ─────────────────────────────────────
+            if (entry.jsonExtract) {
+                try {
+                    const fullJson = JSON.parse(fs.readFileSync(entry.srcAbs, 'utf-8'));
+                    const partial = jsonField.extractFields(fullJson, entry.jsonExtract.fields);
+                    const content = JSON.stringify(partial, null, 2);
+                    if (entry.encrypt) {
+                        const encrypted = cryptoEngine.encryptString(content, keyPath);
+                        fs.writeFileSync(destAbs, encrypted, 'utf-8');
+                        result.encrypted.push(entry.repoRel);
+                    }
+                    else {
+                        fs.writeFileSync(destAbs, content, 'utf-8');
+                    }
+                    result.synced.push(entry.repoRel);
+                }
+                catch (err) {
+                    logger.warn(`跳过 JSON 字段提取（解析失败）: ${entry.srcAbs} — ${err.message}`);
+                    result.skipped.push(entry.repoRel);
+                }
+                continue;
+            }
+            // ── 整文件同步（原有逻辑） ────────────────────────────────
             if (!entry.encrypt) {
                 const content = fs.readFileSync(entry.srcAbs, 'utf-8');
                 if (validator.containsSensitiveData(content)) {
@@ -128,8 +386,6 @@ export const syncEngine = {
                     logger.warn(`   建议在配置中将该文件标记为 encrypt:true`);
                 }
             }
-            const destAbs = path.join(repoPath, entry.repoRel);
-            fs.mkdirSync(path.dirname(destAbs), { recursive: true });
             if (entry.encrypt) {
                 cryptoEngine.encryptFile(entry.srcAbs, destAbs, keyPath);
                 result.encrypted.push(entry.repoRel);
@@ -139,23 +395,106 @@ export const syncEngine = {
             }
             result.synced.push(entry.repoRel);
         }
+        // ── 清理 repo 中的过期文件（全量 push 时） ──────────────────
+        // 只用实际写入 repo 的条目做 prune，排除本地不存在的 skipped 条目
+        if (!agent) {
+            const syncedEntries = entries.filter(e => fs.existsSync(e.srcAbs));
+            const pruned = pruneRepoStaleFiles(repoPath, syncedEntries);
+            result.deleted.push(...pruned);
+        }
         return result;
     },
     async restoreFromRepo(cfg, agent) {
         const repoPath = expandHome(cfg.localRepoPath);
         const keyPath = expandHome(cfg.keyPath);
         const entries = buildFileEntries(cfg, repoPath, agent);
-        const result = { synced: [], skipped: [], decrypted: [], conflicts: [] };
-        // 批量决策：overwrite_all / skip_all
+        const result = { synced: [], skipped: [], decrypted: [], conflicts: [], localOnly: [] };
         let batchDecision;
         for (const entry of entries) {
             const srcRepo = path.join(repoPath, entry.repoRel);
             if (!fs.existsSync(srcRepo)) {
+                // repo 没有但本地有 → 记录为 localOnly
+                // jsonFields 条目：srcAbs 是完整 JSON（总是存在），需检查提取字段是否非空
+                if (entry.jsonExtract) {
+                    try {
+                        const fullJson = JSON.parse(fs.readFileSync(entry.srcAbs, 'utf-8'));
+                        const extracted = jsonField.extractFields(fullJson, entry.jsonExtract.fields);
+                        if (Object.keys(extracted).length > 0) {
+                            result.localOnly.push(entry.repoRel);
+                        }
+                    }
+                    catch { /* JSON 解析失败则忽略 */ }
+                }
+                else if (fs.existsSync(entry.srcAbs)) {
+                    result.localOnly.push(entry.repoRel);
+                }
                 logger.debug(`跳过（仓库中不存在）: ${entry.repoRel}`);
                 result.skipped.push(entry.repoRel);
                 continue;
             }
-            // ── 冲突检测 ─────────────────────────────────────────────
+            // ── JSON 字段级 merge-back ────────────────────────────────
+            if (entry.jsonExtract) {
+                let partialContent;
+                if (entry.encrypt) {
+                    partialContent = cryptoEngine.decryptString(fs.readFileSync(srcRepo, 'utf-8').trim(), keyPath);
+                }
+                else {
+                    partialContent = fs.readFileSync(srcRepo, 'utf-8');
+                }
+                const partial = JSON.parse(partialContent);
+                // 读取本地完整 JSON，merge 进去（不破坏其他字段）
+                const targetPath = entry.jsonExtract.originalPath;
+                let fullJson = {};
+                if (fs.existsSync(targetPath)) {
+                    fullJson = JSON.parse(fs.readFileSync(targetPath, 'utf-8'));
+                }
+                const merged = jsonField.mergeFields(fullJson, partial);
+                fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+                fs.writeFileSync(targetPath, JSON.stringify(merged, null, 2), 'utf-8');
+                // shared MCP 条目：同时分发到所有其他 agent
+                if (entry.agentName === 'shared' && cfg.shared) {
+                    for (const source of cfg.shared.mcp.sources) {
+                        const p = cfg.profiles.default[source.agent];
+                        if (!p.enabled)
+                            continue;
+                        const otherPath = path.join(expandHome(p.workspacePath), source.src);
+                        if (otherPath === targetPath)
+                            continue; // 已处理
+                        let otherJson = {};
+                        if (fs.existsSync(otherPath)) {
+                            try {
+                                otherJson = JSON.parse(fs.readFileSync(otherPath, 'utf-8'));
+                            }
+                            catch { /* */ }
+                        }
+                        const otherMerged = jsonField.mergeFields(otherJson, partial);
+                        fs.mkdirSync(path.dirname(otherPath), { recursive: true });
+                        fs.writeFileSync(otherPath, JSON.stringify(otherMerged, null, 2), 'utf-8');
+                    }
+                }
+                result.synced.push(entry.repoRel);
+                if (entry.encrypt)
+                    result.decrypted.push(entry.repoRel);
+                continue;
+            }
+            // ── shared skills 分发到各 agent ──────────────────────────
+            if (entry.agentName === 'shared' && entry.repoRel.startsWith('shared/skills/')) {
+                const relInSkills = entry.repoRel.slice('shared/skills/'.length);
+                const shared = cfg.shared;
+                if (shared) {
+                    for (const source of shared.skills.sources) {
+                        const p = cfg.profiles.default[source.agent];
+                        if (!p.enabled)
+                            continue;
+                        const dest = path.join(expandHome(p.workspacePath), source.dir, relInSkills);
+                        fs.mkdirSync(path.dirname(dest), { recursive: true });
+                        fs.copyFileSync(srcRepo, dest);
+                    }
+                }
+                result.synced.push(entry.repoRel);
+                continue;
+            }
+            // ── 冲突检测（整文件同步） ────────────────────────────────
             if (fs.existsSync(entry.srcAbs)) {
                 let isDiff = false;
                 const localBuf = fs.readFileSync(entry.srcAbs);
@@ -173,17 +512,12 @@ export const syncEngine = {
                 }
                 if (isDiff) {
                     result.conflicts.push(entry.repoRel);
-                    // 已有批量决策则直接应用
                     if (batchDecision === 'skip_all') {
                         logger.info(`  ↷ 跳过（保留本地）: ${entry.repoRel}`);
                         result.skipped.push(entry.repoRel);
                         continue;
                     }
-                    if (batchDecision === 'overwrite_all') {
-                        // 继续走下方写入逻辑
-                    }
-                    else {
-                        // 无批量决策，询问用户
+                    if (batchDecision !== 'overwrite_all') {
                         const ans = await askConflict(entry.repoRel);
                         if (ans === 'skip' || ans === 'skip_all') {
                             if (ans === 'skip_all')
@@ -194,7 +528,6 @@ export const syncEngine = {
                         }
                         if (ans === 'overwrite_all')
                             batchDecision = 'overwrite_all';
-                        // ans === 'overwrite' 或 'overwrite_all'：继续走下方写入逻辑
                     }
                 }
             }
@@ -207,7 +540,7 @@ export const syncEngine = {
             else {
                 fs.copyFileSync(srcRepo, entry.srcAbs);
             }
-            result.synced.push(entry.srcAbs);
+            result.synced.push(entry.repoRel);
         }
         return result;
     },
@@ -229,6 +562,28 @@ export const syncEngine = {
                 diff.missing.push(entry.repoRel);
                 continue;
             }
+            // JSON 字段提取时，比较提取后的内容
+            if (entry.jsonExtract) {
+                try {
+                    const fullJson = JSON.parse(fs.readFileSync(entry.srcAbs, 'utf-8'));
+                    const localPartial = JSON.stringify(jsonField.extractFields(fullJson, entry.jsonExtract.fields), null, 2);
+                    let repoContent;
+                    if (entry.encrypt) {
+                        repoContent = cryptoEngine.decryptString(fs.readFileSync(path.join(repoPath, entry.repoRel), 'utf-8').trim(), keyPath);
+                    }
+                    else {
+                        repoContent = fs.readFileSync(path.join(repoPath, entry.repoRel), 'utf-8');
+                    }
+                    if (localPartial !== repoContent) {
+                        diff.modified.push(entry.repoRel);
+                    }
+                }
+                catch {
+                    diff.modified.push(entry.repoRel);
+                }
+                continue;
+            }
+            // 整文件比较
             const srcBuf = fs.readFileSync(entry.srcAbs);
             const repoBuf = fs.readFileSync(path.join(repoPath, entry.repoRel));
             if (entry.encrypt) {