wangchuan 1.0.2 → 2.1.0

package/dist/test/sync.test.js

@@ -0,0 +1,477 @@
+/**
+ * sync.test.ts — 同步引擎单元测试
+ *
+ * 覆盖：
+ *   - buildFileEntries 条目生成（agents + shared + jsonFields + 去重）
+ *   - distributeShared（skills 分发、MCP 分发）
+ *   - stageToRepo + restoreFromRepo 往返一致性
+ *   - jsonFields 字段级提取/合并不丢数据
+ *   - 新增 skill/MCP 的跨 agent 共享
+ *   - 删除 skill 后的行为（当前：只增不删）
+ */
+import { describe, it, before, after } from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { syncEngine, buildFileEntries } from '../src/core/sync.js';
+import { cryptoEngine } from '../src/core/crypto.js';
+// ── 测试工具 ────────────────────────────────────────────────────────
+const TMP = fs.mkdtempSync(path.join(os.tmpdir(), 'wc-sync-'));
+const KEY = path.join(TMP, 'master.key');
+const REPO = path.join(TMP, 'repo');
+const WS_OC = path.join(TMP, 'openclaw');
+const WS_CL = path.join(TMP, 'claude');
+const WS_GE = path.join(TMP, 'gemini');
+function mkCfg(overrides) {
+    return {
+        repo: 'git@example.com:test.git',
+        branch: 'main',
+        localRepoPath: REPO,
+        keyPath: KEY,
+        hostname: 'test-host',
+        version: 2,
+        profiles: {
+            default: {
+                openclaw: {
+                    enabled: true,
+                    workspacePath: WS_OC,
+                    syncFiles: [
+                        { src: 'MEMORY.md', encrypt: true },
+                        { src: 'SOUL.md', encrypt: false },
+                    ],
+                },
+                claude: {
+                    enabled: true,
+                    workspacePath: WS_CL,
+                    syncFiles: [
+                        { src: 'CLAUDE.md', encrypt: false },
+                    ],
+                    jsonFields: [
+                        { src: '.claude.json', fields: ['mcpServers'], repoName: 'mcpServers.json', encrypt: true },
+                    ],
+                },
+                gemini: {
+                    enabled: true,
+                    workspacePath: WS_GE,
+                    syncFiles: [],
+                    jsonFields: [
+                        { src: 'settings.json', fields: ['security', 'model'], repoName: 'settings-sync.json', encrypt: false },
+                    ],
+                },
+            },
+        },
+        shared: {
+            skills: {
+                sources: [
+                    { agent: 'claude', dir: 'skills/' },
+                    { agent: 'openclaw', dir: 'skills/' },
+                ],
+            },
+            mcp: {
+                sources: [
+                    { agent: 'claude', src: '.claude.json', field: 'mcpServers' },
+                    { agent: 'openclaw', src: 'config/mcporter.json', field: 'mcpServers' },
+                ],
+            },
+            syncFiles: [],
+        },
+        ...overrides,
+    };
+}
+/** 写文件，自动建目录 */
+function writeFile(filePath, content) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, content, 'utf-8');
+}
+// ── Setup / Teardown ────────────────────────────────────────────────
+before(() => {
+    cryptoEngine.generateKey(KEY);
+    for (const d of [REPO, WS_OC, WS_CL, WS_GE]) {
+        fs.mkdirSync(d, { recursive: true });
+    }
+});
+after(() => {
+    fs.rmSync(TMP, { recursive: true, force: true });
+});
+// ── buildFileEntries 测试 ───────────────────────────────────────────
+describe('buildFileEntries', () => {
+    it('为每个 agent 生成 agents/<name>/ 前缀的条目', () => {
+        const cfg = mkCfg();
+        const entries = buildFileEntries(cfg);
+        const ocEntries = entries.filter(e => e.agentName === 'openclaw');
+        assert.ok(ocEntries.length >= 2);
+        assert.ok(ocEntries.every(e => e.repoRel.startsWith('agents/openclaw/')));
+        const clEntries = entries.filter(e => e.agentName === 'claude');
+        assert.ok(clEntries.length >= 1);
+        assert.ok(clEntries.every(e => e.repoRel.startsWith('agents/claude/') || e.repoRel.startsWith('shared/')));
+    });
+    it('jsonFields 条目带 jsonExtract 元数据', () => {
+        const cfg = mkCfg();
+        const entries = buildFileEntries(cfg);
+        const jfEntries = entries.filter(e => e.jsonExtract);
+        assert.ok(jfEntries.length >= 2); // claude mcpServers + gemini settings
+        const claudeJf = jfEntries.find(e => e.repoRel.includes('mcpServers'));
+        assert.ok(claudeJf);
+        assert.deepStrictEqual(claudeJf.jsonExtract.fields, ['mcpServers']);
+        assert.ok(claudeJf.encrypt);
+    });
+    it('--agent 过滤只返回指定 agent 条目', () => {
+        const cfg = mkCfg();
+        const entries = buildFileEntries(cfg, undefined, 'gemini');
+        assert.ok(entries.length > 0);
+        assert.ok(entries.every(e => e.agentName === 'gemini'));
+    });
+    it('shared skills 条目带 shared 标识', () => {
+        // 先创建 skill 文件让 walkDir 能扫到
+        writeFile(path.join(WS_CL, 'skills', 'test.md'), '# test skill');
+        const cfg = mkCfg();
+        const entries = buildFileEntries(cfg);
+        const sharedSkills = entries.filter(e => e.agentName === 'shared' && e.repoRel.startsWith('shared/skills/'));
+        assert.ok(sharedSkills.length >= 1);
+        fs.rmSync(path.join(WS_CL, 'skills'), { recursive: true, force: true });
+    });
+    it('repoRel 去重：多 agent 同名 skill 只保留先出现者', () => {
+        writeFile(path.join(WS_CL, 'skills', 'dup.md'), 'claude version');
+        writeFile(path.join(WS_OC, 'skills', 'dup.md'), 'openclaw version');
+        const cfg = mkCfg();
+        const entries = buildFileEntries(cfg);
+        const dupEntries = entries.filter(e => e.repoRel === path.join('shared', 'skills', 'dup.md'));
+        assert.equal(dupEntries.length, 1, '同名 skill 应去重为 1 条');
+        // 清理
+        fs.rmSync(path.join(WS_CL, 'skills'), { recursive: true, force: true });
+        fs.rmSync(path.join(WS_OC, 'skills'), { recursive: true, force: true });
+    });
+});
+// ── stageToRepo + restoreFromRepo 往返测试 ──────────────────────────
+describe('stageToRepo → restoreFromRepo 往返', () => {
+    it('整文件同步：push 后 pull 内容一致', async () => {
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# 记忆内容 v1');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# 灵魂');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# Claude 指令');
+        const cfg = mkCfg({ shared: { skills: { sources: [] }, mcp: { sources: [] }, syncFiles: [] } });
+        const pushResult = await syncEngine.stageToRepo(cfg);
+        assert.ok(pushResult.synced.length >= 3);
+        // repo 中文件应存在
+        assert.ok(fs.existsSync(path.join(REPO, 'agents/openclaw/MEMORY.md.enc')));
+        assert.ok(fs.existsSync(path.join(REPO, 'agents/openclaw/SOUL.md')));
+        assert.ok(fs.existsSync(path.join(REPO, 'agents/claude/CLAUDE.md')));
+        // 模拟新环境：删除本地文件
+        fs.unlinkSync(path.join(WS_OC, 'MEMORY.md'));
+        fs.unlinkSync(path.join(WS_CL, 'CLAUDE.md'));
+        const pullResult = await syncEngine.restoreFromRepo(cfg);
+        assert.ok(pullResult.synced.length >= 3);
+        // 还原后内容一致
+        assert.equal(fs.readFileSync(path.join(WS_OC, 'MEMORY.md'), 'utf-8'), '# 记忆内容 v1');
+        assert.equal(fs.readFileSync(path.join(WS_CL, 'CLAUDE.md'), 'utf-8'), '# Claude 指令');
+    });
+    it('jsonFields：push 只提取指定字段，pull merge 回不丢其他字段', async () => {
+        const claudeJson = {
+            mcpServers: { playwright: { type: 'stdio', cmd: 'npx' } },
+            tipsHistory: { tip1: 5 },
+            numStartups: 42,
+            projects: { '/tmp/proj': { cost: 100 } },
+        };
+        writeFile(path.join(WS_CL, '.claude.json'), JSON.stringify(claudeJson, null, 2));
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# Claude');
+        const geminiJson = {
+            security: { auth: 'gongfeng' },
+            model: { name: 'opus' },
+            ide: { seen: true },
+            cache: { size: 999 },
+        };
+        writeFile(path.join(WS_GE, 'settings.json'), JSON.stringify(geminiJson, null, 2));
+        const cfg = mkCfg({ shared: { skills: { sources: [] }, mcp: { sources: [] }, syncFiles: [] } });
+        await syncEngine.stageToRepo(cfg);
+        // repo 中 claude 的 mcpServers.json.enc 应只含 mcpServers
+        const claudeRepoFile = path.join(REPO, 'agents/claude/mcpServers.json.enc');
+        assert.ok(fs.existsSync(claudeRepoFile));
+        const decrypted = JSON.parse(cryptoEngine.decryptString(fs.readFileSync(claudeRepoFile, 'utf-8').trim(), KEY));
+        assert.deepStrictEqual(Object.keys(decrypted), ['mcpServers']);
+        assert.ok(!('tipsHistory' in decrypted), 'tipsHistory 不应被提取');
+        // repo 中 gemini 的 settings-sync.json 应只含 security + model
+        const geminiRepoFile = path.join(REPO, 'agents/gemini/settings-sync.json');
+        assert.ok(fs.existsSync(geminiRepoFile));
+        const geminiPartial = JSON.parse(fs.readFileSync(geminiRepoFile, 'utf-8'));
+        assert.deepStrictEqual(Object.keys(geminiPartial).sort(), ['model', 'security']);
+        // 模拟远端修改 mcpServers（添加新 server）
+        const modified = { mcpServers: { playwright: { type: 'stdio', cmd: 'npx' }, gongfeng: { type: 'sse' } } };
+        const enc = cryptoEngine.encryptString(JSON.stringify(modified, null, 2), KEY);
+        fs.writeFileSync(claudeRepoFile, enc, 'utf-8');
+        // pull 回来
+        await syncEngine.restoreFromRepo(cfg);
+        // .claude.json 应保留 tipsHistory/numStartups/projects，mcpServers 被更新
+        const restored = JSON.parse(fs.readFileSync(path.join(WS_CL, '.claude.json'), 'utf-8'));
+        assert.deepStrictEqual(restored.mcpServers, modified.mcpServers);
+        assert.equal(restored.tipsHistory.tip1, 5, 'tipsHistory 不应被破坏');
+        assert.equal(restored.numStartups, 42, 'numStartups 不应被破坏');
+        assert.deepStrictEqual(restored.projects, { '/tmp/proj': { cost: 100 } });
+    });
+});
+// ── distributeShared 测试（通过 stageToRepo 间接验证） ───────────────
+describe('skill 跨 agent 共享', () => {
+    it('Claude 新增 skill → push 后 OpenClaw 也获得该 skill', async () => {
+        writeFile(path.join(WS_CL, 'skills', 'new-skill.md'), '# New Skill');
+        // OpenClaw 没有这个 skill
+        const ocSkillPath = path.join(WS_OC, 'skills', 'new-skill.md');
+        if (fs.existsSync(ocSkillPath))
+            fs.unlinkSync(ocSkillPath);
+        const cfg = mkCfg();
+        // 准备必需的工作区文件
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_CL, '.claude.json'), '{"mcpServers":{}}');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        await syncEngine.stageToRepo(cfg);
+        // distributeShared 应将 skill 复制到 OpenClaw
+        assert.ok(fs.existsSync(ocSkillPath), 'OpenClaw 应获得 Claude 的 new-skill.md');
+        assert.equal(fs.readFileSync(ocSkillPath, 'utf-8'), '# New Skill');
+        // repo 中 shared/skills/ 也应有
+        assert.ok(fs.existsSync(path.join(REPO, 'shared', 'skills', 'new-skill.md')));
+    });
+    it('删除 skill 后 push — 另一个 agent 有则复制回来（只增不删）', async () => {
+        // 两个 agent 都有 old-skill
+        writeFile(path.join(WS_CL, 'skills', 'old-skill.md'), '# Old');
+        writeFile(path.join(WS_OC, 'skills', 'old-skill.md'), '# Old');
+        // 从 OpenClaw 删除
+        fs.unlinkSync(path.join(WS_OC, 'skills', 'old-skill.md'));
+        const cfg = mkCfg();
+        await syncEngine.stageToRepo(cfg);
+        // distributeShared 会从 Claude 复制回 OpenClaw
+        assert.ok(fs.existsSync(path.join(WS_OC, 'skills', 'old-skill.md')), '删除的 skill 被从另一个 agent 复制回来');
+    });
+});
+describe('MCP 跨 agent 共享', () => {
+    it('Claude 新增 MCP server → push 后 OpenClaw 也获得', async () => {
+        writeFile(path.join(WS_CL, '.claude.json'), JSON.stringify({
+            mcpServers: { playwright: { type: 'stdio' }, newServer: { type: 'sse' } },
+            tipsHistory: {},
+        }, null, 2));
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), JSON.stringify({
+            mcpServers: { playwright: { type: 'stdio' } },
+        }, null, 2));
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        const cfg = mkCfg();
+        await syncEngine.stageToRepo(cfg);
+        // OpenClaw 的 mcporter.json 应包含 newServer
+        const ocMcp = JSON.parse(fs.readFileSync(path.join(WS_OC, 'config', 'mcporter.json'), 'utf-8'));
+        assert.ok('newServer' in ocMcp.mcpServers, 'OpenClaw 应获得 Claude 的 newServer');
+        assert.deepStrictEqual(ocMcp.mcpServers.newServer, { type: 'sse' });
+    });
+    it('分发 MCP 不覆盖已有配置', async () => {
+        writeFile(path.join(WS_CL, '.claude.json'), JSON.stringify({
+            mcpServers: { playwright: { type: 'stdio', version: 'claude' } },
+        }, null, 2));
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), JSON.stringify({
+            mcpServers: { playwright: { type: 'stdio', version: 'openclaw' } },
+        }, null, 2));
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        const cfg = mkCfg();
+        await syncEngine.stageToRepo(cfg);
+        // 两个 agent 的 playwright 配置应保持各自的 version，不被覆盖
+        const clMcp = JSON.parse(fs.readFileSync(path.join(WS_CL, '.claude.json'), 'utf-8'));
+        const ocMcp = JSON.parse(fs.readFileSync(path.join(WS_OC, 'config', 'mcporter.json'), 'utf-8'));
+        assert.equal(clMcp.mcpServers.playwright.version, 'claude');
+        assert.equal(ocMcp.mcpServers.playwright.version, 'openclaw');
+    });
+});
+// ── 一键还原（新服务器场景） ────────────────────────────────────────
+describe('新环境一键还原', () => {
+    it('工作区为空时 pull 能完整还原所有 agent 配置', async () => {
+        // 先 push 一份完整数据到 repo
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# 永久记忆');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# 灵魂身份');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# Claude 全局指令');
+        writeFile(path.join(WS_CL, '.claude.json'), JSON.stringify({
+            mcpServers: { server1: { cmd: 'test' } },
+            tipsHistory: { x: 1 },
+        }, null, 2));
+        writeFile(path.join(WS_GE, 'settings.json'), JSON.stringify({
+            security: { auth: 'test' },
+            model: { name: 'gemini-2' },
+            cache: { big: true },
+        }, null, 2));
+        writeFile(path.join(WS_CL, 'skills', 'review.md'), '# code review');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        const cfg = mkCfg();
+        await syncEngine.stageToRepo(cfg);
+        // 模拟新服务器：清空所有工作区
+        for (const d of [WS_OC, WS_CL, WS_GE]) {
+            fs.rmSync(d, { recursive: true, force: true });
+            fs.mkdirSync(d, { recursive: true });
+        }
+        // pull 还原
+        const pullResult = await syncEngine.restoreFromRepo(cfg);
+        assert.ok(pullResult.synced.length >= 4);
+        // OpenClaw 还原
+        assert.equal(fs.readFileSync(path.join(WS_OC, 'MEMORY.md'), 'utf-8'), '# 永久记忆');
+        assert.equal(fs.readFileSync(path.join(WS_OC, 'SOUL.md'), 'utf-8'), '# 灵魂身份');
+        // Claude 还原
+        assert.equal(fs.readFileSync(path.join(WS_CL, 'CLAUDE.md'), 'utf-8'), '# Claude 全局指令');
+        // Claude jsonFields merge-back（新环境本地无 .claude.json → 从空 {} merge）
+        const clJson = JSON.parse(fs.readFileSync(path.join(WS_CL, '.claude.json'), 'utf-8'));
+        assert.deepStrictEqual(clJson.mcpServers, { server1: { cmd: 'test' } });
+        assert.ok(!('tipsHistory' in clJson), '新环境不应有 tipsHistory');
+        // Gemini jsonFields merge-back
+        const geJson = JSON.parse(fs.readFileSync(path.join(WS_GE, 'settings.json'), 'utf-8'));
+        assert.deepStrictEqual(geJson.security, { auth: 'test' });
+        assert.deepStrictEqual(geJson.model, { name: 'gemini-2' });
+        assert.ok(!('cache' in geJson), '新环境不应有 cache');
+        // shared skills 分发到所有 agent
+        assert.ok(fs.existsSync(path.join(WS_CL, 'skills', 'review.md')), 'Claude 应还原 skill');
+        assert.ok(fs.existsSync(path.join(WS_OC, 'skills', 'review.md')), 'OpenClaw 也应获得共享 skill');
+    });
+});
+// ── 删除传播测试 ────────────────────────────────────────────────────
+describe('删除传播', () => {
+    it('所有 agent 都删除的 skill → push 后从 repo 清理', async () => {
+        // 先 push 一个 skill 到 repo
+        writeFile(path.join(WS_CL, 'skills', 'obsolete.md'), '# 过时的 skill');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_CL, '.claude.json'), '{"mcpServers":{}}');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        const cfg = mkCfg();
+        await syncEngine.stageToRepo(cfg);
+        assert.ok(fs.existsSync(path.join(REPO, 'shared', 'skills', 'obsolete.md')));
+        // 从所有 agent 删除（Claude 有，OpenClaw 也被分发了）
+        const clSkill = path.join(WS_CL, 'skills', 'obsolete.md');
+        const ocSkill = path.join(WS_OC, 'skills', 'obsolete.md');
+        if (fs.existsSync(clSkill))
+            fs.unlinkSync(clSkill);
+        if (fs.existsSync(ocSkill))
+            fs.unlinkSync(ocSkill);
+        // 再次 push
+        const result = await syncEngine.stageToRepo(cfg);
+        // repo 中应被清理
+        assert.ok(!fs.existsSync(path.join(REPO, 'shared', 'skills', 'obsolete.md')), '所有 agent 都删除后，repo 中也应被清理');
+        assert.ok(result.deleted.includes(path.join('shared', 'skills', 'obsolete.md')));
+    });
+    it('repo 有但本地所有 agent 都无的整文件 → push 后从 repo 清理', async () => {
+        // 手动在 repo 中创建一个「幽灵文件」（模拟旧版残留）
+        writeFile(path.join(REPO, 'agents', 'openclaw', 'GHOST.md'), '幽灵');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_CL, '.claude.json'), '{"mcpServers":{}}');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        const cfg = mkCfg();
+        const result = await syncEngine.stageToRepo(cfg);
+        assert.ok(!fs.existsSync(path.join(REPO, 'agents', 'openclaw', 'GHOST.md')), 'repo 中的幽灵文件应被清理');
+        assert.ok(result.deleted.includes(path.join('agents', 'openclaw', 'GHOST.md')));
+    });
+    it('pull 后 repo 中删除的 skill 不再分发到任何 agent', async () => {
+        // 先创建 skill 并 push
+        writeFile(path.join(WS_CL, 'skills', 'temp.md'), '# temp');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_CL, '.claude.json'), '{"mcpServers":{}}');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        const cfg = mkCfg();
+        await syncEngine.stageToRepo(cfg);
+        // 从所有 agent 删除并 push（触发 repo 清理）
+        for (const d of [WS_CL, WS_OC]) {
+            const f = path.join(d, 'skills', 'temp.md');
+            if (fs.existsSync(f))
+                fs.unlinkSync(f);
+        }
+        await syncEngine.stageToRepo(cfg);
+        assert.ok(!fs.existsSync(path.join(REPO, 'shared', 'skills', 'temp.md')));
+        // pull — temp.md 不应出现在任何 agent
+        await syncEngine.restoreFromRepo(cfg);
+        assert.ok(!fs.existsSync(path.join(WS_CL, 'skills', 'temp.md')), 'Claude 不应恢复已删除的 skill');
+        assert.ok(!fs.existsSync(path.join(WS_OC, 'skills', 'temp.md')), 'OpenClaw 不应恢复已删除的 skill');
+    });
+});
+// ── localOnly 检测测试 ──────────────────────────────────────────────
+describe('pull 检测本地独有文件', () => {
+    it('本地有但 repo 无的文件标记为 localOnly', async () => {
+        // 清空 repo
+        fs.rmSync(REPO, { recursive: true, force: true });
+        fs.mkdirSync(REPO, { recursive: true });
+        // 本地有文件
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# 本地记忆');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# 灵魂');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# 指令');
+        writeFile(path.join(WS_CL, '.claude.json'), '{"mcpServers":{}}');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        const cfg = mkCfg({ shared: { skills: { sources: [] }, mcp: { sources: [] }, syncFiles: [] } });
+        const result = await syncEngine.restoreFromRepo(cfg);
+        // 应检测到本地独有文件
+        assert.ok(result.localOnly.length >= 2, `应有 localOnly 文件，实际: ${result.localOnly.length}`);
+        assert.ok(result.localOnly.some(f => f.includes('MEMORY.md')), 'MEMORY.md 应标记为 localOnly');
+    });
+    it('jsonFields 的 localOnly 不误报 — 提取字段为空则不标记', async () => {
+        fs.rmSync(REPO, { recursive: true, force: true });
+        fs.mkdirSync(REPO, { recursive: true });
+        // .claude.json 存在但 mcpServers 字段为空
+        writeFile(path.join(WS_CL, '.claude.json'), JSON.stringify({
+            tipsHistory: { x: 1 },
+            numStartups: 5,
+        }, null, 2));
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_GE, 'settings.json'), '{}');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        const cfg = mkCfg({ shared: { skills: { sources: [] }, mcp: { sources: [] }, syncFiles: [] } });
+        const result = await syncEngine.restoreFromRepo(cfg);
+        // .claude.json 没有 mcpServers 字段，不应标记为 localOnly
+        assert.ok(!result.localOnly.some(f => f.includes('mcpServers')), 'mcpServers 字段为空时不应标记为 localOnly');
+    });
+});
+// ── shared MCP 跨 agent 分发（pull 时） ─────────────────────────────
+describe('pull 时 shared MCP 跨 agent 分发', () => {
+    it('从 repo pull 的 MCP 配置应分发到所有 agent', async () => {
+        // 清理 repo
+        fs.rmSync(REPO, { recursive: true, force: true });
+        fs.mkdirSync(REPO, { recursive: true });
+        // 准备 Claude 有 MCP config，OpenClaw 没有
+        writeFile(path.join(WS_CL, '.claude.json'), JSON.stringify({
+            mcpServers: { playwright: { type: 'stdio' } },
+        }, null, 2));
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        const cfg = mkCfg();
+        // push 先（创建 repo 内容）
+        await syncEngine.stageToRepo(cfg);
+        // 模拟新环境：清空 OpenClaw 的 mcporter.json
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        // pull
+        await syncEngine.restoreFromRepo(cfg);
+        // OpenClaw 应从 shared MCP 获得 playwright
+        const ocMcp = JSON.parse(fs.readFileSync(path.join(WS_OC, 'config', 'mcporter.json'), 'utf-8'));
+        assert.ok('playwright' in (ocMcp.mcpServers ?? {}), 'OpenClaw 应通过 pull 获得 Claude 的 MCP 配置');
+    });
+});
+// ── JSON 解析失败容错 ───────────────────────────────────────────────
+describe('JSON 解析失败容错', () => {
+    it('损坏的 JSON 源文件不导致 push 崩溃', async () => {
+        writeFile(path.join(WS_CL, '.claude.json'), '{ invalid json !!!');
+        writeFile(path.join(WS_CL, 'CLAUDE.md'), '# C');
+        writeFile(path.join(WS_OC, 'MEMORY.md'), '# M');
+        writeFile(path.join(WS_OC, 'SOUL.md'), '# S');
+        writeFile(path.join(WS_GE, 'settings.json'), '{"security":{},"model":{}}');
+        writeFile(path.join(WS_OC, 'config', 'mcporter.json'), '{"mcpServers":{}}');
+        const cfg = mkCfg({ shared: { skills: { sources: [] }, mcp: { sources: [] }, syncFiles: [] } });
+        // 不应抛异常
+        const result = await syncEngine.stageToRepo(cfg);
+        assert.ok(result.skipped.some(f => f.includes('mcpServers')), '损坏 JSON 对应的条目应被 skip');
+    });
+});
+//# sourceMappingURL=sync.test.js.map

package/dist/test/sync.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.test.js","sourceRoot":"","sources":["../../test/sync.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wangchuan",
-  "version": "1.0.2",
+  "version": "2.1.0",
   "description": "忘川 · AI 记忆同步系统 — 智能体记忆永不遗失",
   "bin": {
     "wangchuan": "./dist/bin/wangchuan.js"
@@ -17,7 +17,7 @@
     "postbuild": "chmod +x dist/bin/wangchuan.js",
     "prepublishOnly": "npm run build",
     "dev": "tsx bin/wangchuan.ts",
-    "test": "node --import tsx/esm --test test/crypto.test.ts",
+    "test": "node --import tsx/esm --test test/crypto.test.ts test/json-field.test.ts test/sync.test.ts",
     "typecheck": "tsc --noEmit"
   },
   "keywords": [

package/skill/SKILL.md

@@ -13,6 +13,7 @@ wangchuan status [--agent openclaw|claude|gemini]     查看同步状态和差
 wangchuan diff   [--agent openclaw|claude|gemini]     显示行级文件差异
 wangchuan pull   [--agent openclaw|claude|gemini]     拉取远端配置，还原到本地
 wangchuan push   [--agent <name>] [-m "<描述>"]       加密推送本地配置到远端
+wangchuan dump   [--agent openclaw|claude|gemini]     生成明文快照到临时目录
 wangchuan init   --repo <git地址>                     首次初始化
 ```
 
@@ -39,6 +40,7 @@ wangchuan init   --repo <git地址>                     首次初始化
 - `✔ 本地  · 仓库` — 本地有但未推送
 - `✖ 本地  ✔ 仓库` — 仓库有但本地缺失，执行 pull 还原
 - `[enc]` — 该文件加密存储（AES-256-GCM）
+- `[字段]` — JSON 字段级提取（只同步指定字段，不影响其他内容）
 
 ### diff
 - `+` 绿色行 — 本地新增内容
@@ -48,6 +50,8 @@ wangchuan init   --repo <git地址>                     首次初始化
 
 ### push / pull
 - `[已加密]` / `[已解密]` — 经过 AES-256-GCM 处理
+- `[已清理]` — 所有 agent 都已删除的文件从 repo 移除（删除传播）
+- `⚠ 本地独有` — pull 时检测到本地有但 repo 无的文件，建议 push 同步
 
 ## --agent 说明
 
@@ -55,9 +59,11 @@ wangchuan init   --repo <git地址>                     首次初始化
 
 | 值 | 说明 |
 |----|------|
-| `openclaw` | ~/.openclaw/workspace/ 下的所有配置 |
-| `claude`   | ~/.claude/.claude.json（需在 config.json 中 enabled:true）|
-| `gemini`   | ~/.gemini/ 下的配置（需在 config.json 中 enabled:true）|
+| `openclaw` | MEMORY.md(加密)、AGENTS.md、SOUL.md — 默认 ~/.openclaw/workspace/ |
+| `claude`   | CLAUDE.md、settings.json(加密)、.claude.json→mcpServers 字段级提取(加密) — 默认 ~/.claude-internal/ |
+| `gemini`   | settings.internal.json→security+model 字段级提取(加密) — 默认 ~/.gemini/ |
+
+不指定 `--agent` 时，同时操作所有已启用的 agent 及 shared 共享层（skills/MCP/共享记忆）。
 
 ## 前置条件