wangchuan 3.0.0 → 3.1.0

package/dist/src/core/crypto.js

@@ -1,8 +1,8 @@
 /**
- * crypto.ts — AES-256-GCM 加解密模块
+ * crypto.ts — AES-256-GCM encryption/decryption module
  *
- * 密钥文件格式：32 字节随机数据，以十六进制字符串存储（64 chars）
- * 密文文件格式：IV(12B) | AuthTag(16B) | CipherText → Base64 写入 .enc 文件
+ * Key file format: 32 bytes of random data, stored as hex string (64 chars)
+ * Ciphertext format: IV(12B) | AuthTag(16B) | CipherText → Base64 written to .enc file
  */
 import crypto from 'crypto';
 import fs from 'fs';
@@ -10,20 +10,20 @@ import path from 'path';
 import { logger } from '../utils/logger.js';
 const ALGO = 'aes-256-gcm';
 const KEY_BYTES = 32; // 256 bit
-const IV_BYTES = 12; // 96 bit (GCM 推荐)
+const IV_BYTES = 12; // 96 bit (GCM recommended)
 const TAG_BYTES = 16; // 128 bit auth tag
-/** 从文件加载并验证主密钥 */
+/** Load and validate the master key from file */
 function loadKey(keyPath) {
     if (!fs.existsSync(keyPath)) {
-        throw new Error(`密钥文件不存在: ${keyPath}\n请先运行 wangchuan init 生成密钥。`);
+        throw new Error(`Key file not found: ${keyPath}\nPlease run wangchuan init to generate a key.`);
     }
     const hex = fs.readFileSync(keyPath, 'utf-8').trim();
     if (hex.length !== KEY_BYTES * 2) {
-        throw new Error(`密钥文件格式无效，期望 ${KEY_BYTES * 2} 个十六进制字符`);
+        throw new Error(`Invalid key file format, expected ${KEY_BYTES * 2} hex characters`);
     }
     return Buffer.from(hex, 'hex');
 }
-/** 加密 Buffer → Base64 字符串（格式：IV + AuthTag + CipherText） */
+/** Encrypt Buffer → Base64 string (format: IV + AuthTag + CipherText) */
 function encryptBuffer(plaintext, key) {
     const iv = crypto.randomBytes(IV_BYTES);
     const cipher = crypto.createCipheriv(ALGO, key, iv);
@@ -31,7 +31,7 @@ function encryptBuffer(plaintext, key) {
     const tag = cipher.getAuthTag();
     return Buffer.concat([iv, tag, enc]).toString('base64');
 }
-/** Base64 密文 → 原始 Buffer */
+/** Base64 ciphertext → original Buffer */
 function decryptBuffer(b64, key) {
     const data = Buffer.from(b64, 'base64');
     const iv = data.subarray(0, IV_BYTES);
@@ -43,44 +43,44 @@ function decryptBuffer(b64, key) {
 }
 export const cryptoEngine = {
     /**
-     * 生成新主密钥并写入文件（mode 0o600）
-     * 返回原始 32 字节 Buffer，供测试断言使用
+     * Generate a new master key and write to file (mode 0o600).
+     * Returns the raw 32-byte Buffer for test assertions.
      */
     generateKey(keyPath) {
         fs.mkdirSync(path.dirname(keyPath), { recursive: true });
         const key = crypto.randomBytes(KEY_BYTES);
         fs.writeFileSync(keyPath, key.toString('hex'), { mode: 0o600, encoding: 'utf-8' });
-        logger.ok(`主密钥已生成: ${keyPath}`);
+        logger.ok(`Master key generated: ${keyPath}`);
         return key;
     },
-    /** 密钥文件是否存在 */
+    /** Check if key file exists */
     hasKey(keyPath) {
         return fs.existsSync(keyPath);
     },
-    /** 加密源文件，密文写入 destPath（通常以 .enc 结尾） */
+    /** Encrypt source file, write ciphertext to destPath (typically ending in .enc) */
     encryptFile(srcPath, destPath, keyPath) {
         const key = loadKey(keyPath);
         const plaintext = fs.readFileSync(srcPath);
         const encrypted = encryptBuffer(plaintext, key);
         fs.mkdirSync(path.dirname(destPath), { recursive: true });
         fs.writeFileSync(destPath, encrypted, 'utf-8');
-        logger.debug(`已加密: ${srcPath} → ${destPath}`);
+        logger.debug(`Encrypted: ${srcPath} → ${destPath}`);
     },
-    /** 解密 .enc 文件，明文写入 destPath */
+    /** Decrypt .enc file, write plaintext to destPath */
     decryptFile(srcPath, destPath, keyPath) {
         const key = loadKey(keyPath);
         const encrypted = fs.readFileSync(srcPath, 'utf-8').trim();
         const plaintext = decryptBuffer(encrypted, key);
         fs.mkdirSync(path.dirname(destPath), { recursive: true });
         fs.writeFileSync(destPath, plaintext);
-        logger.debug(`已解密: ${srcPath} → ${destPath}`);
+        logger.debug(`Decrypted: ${srcPath} → ${destPath}`);
     },
-    /** 加密任意字符串，返回 Base64 密文 */
+    /** Encrypt an arbitrary string, return Base64 ciphertext */
     encryptString(plaintext, keyPath) {
         const key = loadKey(keyPath);
         return encryptBuffer(Buffer.from(plaintext, 'utf-8'), key);
     },
-    /** 解密 Base64 密文，返回原始字符串 */
+    /** Decrypt Base64 ciphertext, return original string */
     decryptString(b64, keyPath) {
         const key = loadKey(keyPath);
         return decryptBuffer(b64, key).toString('utf-8');

package/dist/src/core/crypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../src/core/crypto.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAU,IAAI,CAAC;AACxB,OAAO,IAAI,MAAQ,MAAM,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,IAAI,GAAQ,aAAsB,CAAC;AACzC,MAAM,SAAS,GAAG,EAAE,CAAC,CAAE,UAAU;AACjC,MAAM,QAAQ,GAAI,EAAE,CAAC,CAAE,kBAAkB;AACzC,MAAM,SAAS,GAAG,EAAE,CAAC,CAAE,mBAAmB;AAE1C,kBAAkB;AAClB,SAAS,OAAO,CAAC,OAAe;IAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,6BAA6B,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,eAAe,SAAS,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,2DAA2D;AAC3D,SAAS,aAAa,CAAC,SAAiB,EAAE,GAAW;IACnD,MAAM,EAAE,GAAO,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,GAAG,GAAM,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACzE,MAAM,GAAG,GAAM,MAAM,CAAC,UAAU,EAAE,CAAC;IACnC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC1D,CAAC;AAED,4BAA4B;AAC5B,SAAS,aAAa,CAAC,GAAW,EAAE,GAAW;IAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,EAAE,GAAK,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,GAAG,GAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACxD,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACzB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B;;;OAGG;IACH,WAAW,CAAC,OAAe;QACzB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC1C,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACnF,MAAM,CAAC,EAAE,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;QAChC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,eAAe;IACf,MAAM,CAAC,OAAe;QACpB,OAAO,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,uCAAuC;IACvC,WAAW,CAAC,OAAe,EAAE,QAAgB,EAAE,OAAe;QAC5D,MAAM,GAAG,GAAS,OAAO,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,MAAM,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,+BAA+B;IAC/B,WAAW,CAAC,OAAe,EAAE,QAAgB,EAAE,OAAe;QAC5D,MAAM,GAAG,GAAS,OAAO,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3D,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,MAAM,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,2BAA2B;IAC3B,aAAa,CAAC,SAAiB,EAAE,OAAe;QAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED,2BAA2B;IAC3B,aAAa,CAAC,GAAW,EAAE,OAAe;QACxC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;CACO,CAAC"}
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../src/core/crypto.ts"],"names":[],"mappings":"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"}

package/dist/src/core/git.d.ts

@@ -1,7 +1,7 @@
 /**
- * git.ts — simple-git 封装，提供幂等的 Git 操作
+ * git.ts — simple-git wrapper providing idempotent Git operations
  *
- * simple-git v3 在 ESM 下必须使用具名导入 { simpleGit } 而非默认导入。
+ * simple-git v3 requires named import { simpleGit } under ESM (not default import).
  */
 import type { DefaultLogFields } from 'simple-git';
 import type { CommitResult } from '../types.js';

package/dist/src/core/git.js

@@ -1,7 +1,7 @@
 /**
- * git.ts — simple-git 封装，提供幂等的 Git 操作
+ * git.ts — simple-git wrapper providing idempotent Git operations
  *
- * simple-git v3 在 ESM 下必须使用具名导入 { simpleGit } 而非默认导入。
+ * simple-git v3 requires named import { simpleGit } under ESM (not default import).
  */
 import { simpleGit } from 'simple-git';
 import fs from 'fs';
@@ -16,13 +16,13 @@ function createGit(repoPath) {
 export const gitEngine = {
     async cloneOrFetch(remoteUrl, localPath, branch = 'main') {
         if (fs.existsSync(path.join(localPath, '.git'))) {
-            logger.debug(`仓库已存在，执行 fetch: ${localPath}`);
+            logger.debug(`Repo exists, running fetch: ${localPath}`);
             const git = createGit(localPath);
             await git.fetch('origin', branch);
             await git.reset(['--hard', `origin/${branch}`]);
         }
         else {
-            logger.debug(`克隆仓库: ${remoteUrl} → ${localPath}`);
+            logger.debug(`Cloning repo: ${remoteUrl} → ${localPath}`);
             fs.mkdirSync(localPath, { recursive: true });
             await simpleGit().clone(remoteUrl, localPath, ['--branch', branch, '--single-branch']);
         }
@@ -38,14 +38,14 @@ export const gitEngine = {
         await git.add('.');
         const status = await git.status();
         if (status.isClean()) {
-            logger.info('没有新的变更需要提交');
+            logger.info('No new changes to commit');
             return { committed: false, pushed: false };
         }
-        logger.debug(`暂存文件: ${status.staged.join(', ')}`);
+        logger.debug(`Staged files: ${status.staged.join(', ')}`);
         const commitResult = await git.commit(message);
         logger.debug(`commit: ${commitResult.commit}`);
         await git.push('origin', branch);
-        logger.debug(`已推送到 origin/${branch}`);
+        logger.debug(`Pushed to origin/${branch}`);
         return { committed: true, pushed: true, sha: commitResult.commit };
     },
     async status(localPath) {
@@ -62,9 +62,9 @@ export const gitEngine = {
         return remotes.find(r => r.name === 'origin')?.refs?.fetch ?? null;
     },
     async rollback(localPath) {
-        logger.warn('正在回滚最近一次 commit …');
+        logger.warn('Rolling back the last commit...');
         await createGit(localPath).reset(['--soft', 'HEAD~1']);
-        logger.warn('回滚完成，本地变更已保留在暂存区');
+        logger.warn('Rollback complete, local changes preserved in staging area');
     },
     /**
      * Fetch from remote and check if remote branch is ahead of local.

package/dist/src/core/git.js.map

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

package/dist/src/core/json-field.d.ts

@@ -1,13 +1,13 @@
 /**
- * json-field.ts — JSON 字段级提取与合并
+ * json-field.ts — JSON field-level extraction and merge
  *
- * 支持从大 JSON 文件中 pick 指定顶层字段进行同步，
- * pull 时 merge 回目标 JSON（不破坏其他字段）。
+ * Supports picking specified top-level fields from large JSON files for sync;
+ * merges fields back into target JSON on pull (without destroying other fields).
  */
 type JsonObject = Record<string, unknown>;
-/** 从对象中提取指定顶层字段 */
+/** Extract specified top-level fields from an object */
 export declare function extractFields(obj: JsonObject, fields: readonly string[]): JsonObject;
-/** 将提取的字段 shallow merge 回目标对象（仅覆盖提取字段，保留其余） */
+/** Shallow merge extracted fields back into target object (only overwrites extracted fields, preserves the rest) */
 export declare function mergeFields(target: JsonObject, partial: JsonObject): JsonObject;
 export declare const jsonField: {
     readonly extractFields: typeof extractFields;

package/dist/src/core/json-field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-field.d.ts","sourceRoot":"","sources":["../../../src/core/json-field.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE1C,mBAAmB;AACnB,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAMpF;AAED,+CAA+C;AAC/C,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,UAAU,CAE/E;AAED,eAAO,MAAM,SAAS;;;CAA0C,CAAC"}
+{"version":3,"file":"json-field.d.ts","sourceRoot":"","sources":["../../../src/core/json-field.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE1C,wDAAwD;AACxD,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAMpF;AAED,oHAAoH;AACpH,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,UAAU,CAE/E;AAED,eAAO,MAAM,SAAS;;;CAA0C,CAAC"}

package/dist/src/core/json-field.js

@@ -1,10 +1,10 @@
 /**
- * json-field.ts — JSON 字段级提取与合并
+ * json-field.ts — JSON field-level extraction and merge
  *
- * 支持从大 JSON 文件中 pick 指定顶层字段进行同步，
- * pull 时 merge 回目标 JSON（不破坏其他字段）。
+ * Supports picking specified top-level fields from large JSON files for sync;
+ * merges fields back into target JSON on pull (without destroying other fields).
  */
-/** 从对象中提取指定顶层字段 */
+/** Extract specified top-level fields from an object */
 export function extractFields(obj, fields) {
     const result = {};
     for (const f of fields) {
@@ -13,7 +13,7 @@ export function extractFields(obj, fields) {
     }
     return result;
 }
-/** 将提取的字段 shallow merge 回目标对象（仅覆盖提取字段，保留其余） */
+/** Shallow merge extracted fields back into target object (only overwrites extracted fields, preserves the rest) */
 export function mergeFields(target, partial) {
     return { ...target, ...partial };
 }

package/dist/src/core/json-field.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-field.js","sourceRoot":"","sources":["../../../src/core/json-field.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,mBAAmB;AACnB,MAAM,UAAU,aAAa,CAAC,GAAe,EAAE,MAAyB;IACtE,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,WAAW,CAAC,MAAkB,EAAE,OAAmB;IACjE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,EAAE,aAAa,EAAE,WAAW,EAAW,CAAC"}
+{"version":3,"file":"json-field.js","sourceRoot":"","sources":["../../../src/core/json-field.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,wDAAwD;AACxD,MAAM,UAAU,aAAa,CAAC,GAAe,EAAE,MAAyB;IACtE,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oHAAoH;AACpH,MAAM,UAAU,WAAW,CAAC,MAAkB,EAAE,OAAmB;IACjE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,EAAE,aAAa,EAAE,WAAW,EAAW,CAAC"}

package/dist/src/core/sync.d.ts

@@ -1,16 +1,16 @@
 /**
- * sync.ts — 同步引擎核心
+ * sync.ts — Core sync engine
  *
- * 三个方向：
- *   stageToRepo      工作区 → 本地仓库目录（推送前准备）
- *   restoreFromRepo  本地仓库目录 → 工作区（拉取后还原）
- *   diff             对比两侧，返回差异摘要
+ * Three directions:
+ *   stageToRepo      workspace → local repo directory (pre-push staging)
+ *   restoreFromRepo  local repo directory → workspace (post-pull restore)
+ *   diff             compare both sides, return diff summary
  *
- * 支持三层同步：
- *   shared   — 跨 agent 共享（skills、MCP 模板、共享记忆）
- *   agents/* — per-agent 跨环境同步
+ * Supports two-tier sync:
+ *   shared   — cross-agent sharing (skills, MCP templates, shared memory)
+ *   agents/* — per-agent cross-environment sync
  *
- * 所有方法支持可选的 agent 过滤参数，只操作指定智能体的文件。
+ * All methods accept an optional agent filter parameter to operate on a specific agent's files only.
  */
 import type { WangchuanConfig, FileEntry, StageResult, RestoreResult, DiffResult, AgentName, FilterOptions } from '../types.js';
 export declare function expandHome(p: string): string;

package/dist/src/core/sync.js

@@ -1,16 +1,16 @@
 /**
- * sync.ts — 同步引擎核心
+ * sync.ts — Core sync engine
  *
- * 三个方向：
- *   stageToRepo      工作区 → 本地仓库目录（推送前准备）
- *   restoreFromRepo  本地仓库目录 → 工作区（拉取后还原）
- *   diff             对比两侧，返回差异摘要
+ * Three directions:
+ *   stageToRepo      workspace → local repo directory (pre-push staging)
+ *   restoreFromRepo  local repo directory → workspace (post-pull restore)
+ *   diff             compare both sides, return diff summary
  *
- * 支持三层同步：
- *   shared   — 跨 agent 共享（skills、MCP 模板、共享记忆）
- *   agents/* — per-agent 跨环境同步
+ * Supports two-tier sync:
+ *   shared   — cross-agent sharing (skills, MCP templates, shared memory)
+ *   agents/* — per-agent cross-environment sync
  *
- * 所有方法支持可选的 agent 过滤参数，只操作指定智能体的文件。
+ * All methods accept an optional agent filter parameter to operate on a specific agent's files only.
  */
 import fs from 'fs';
 import path from 'path';
@@ -136,7 +136,7 @@ function walkDir(dirAbs) {
     fs.readdirSync(dirAbs).forEach(f => walk(f));
     return results;
 }
-/** 按 repoRel 去重，保留第一个出现的条目 */
+/** Deduplicate by repoRel, keeping the first occurrence */
 function deduplicateEntries(entries) {
     const seen = new Set();
     return entries.filter(e => {
@@ -159,7 +159,7 @@ function logProgress(index, total, tag, filePath) {
     logger.info(`  ${counter} ${coloredTag} ${chalk.white(filePath)}`);
 }
 /**
- * 为指定 agent profile 生成 syncFiles + syncDirs + jsonFields 条目
+ * Build syncFiles + syncDirs + jsonFields entries for a given agent profile.
  */
 function buildAgentEntries(name, profile, repoDirBase) {
     const entries = [];
@@ -195,7 +195,7 @@ function buildAgentEntries(name, profile, repoDirBase) {
             });
         }
     }
-    // jsonFields — 字段级 JSON 提取
+    // jsonFields — field-level JSON extraction
     for (const jf of (profile.jsonFields ?? [])) {
         const suffix = jf.encrypt ? '.enc' : '';
         entries.push({
@@ -213,7 +213,7 @@ function buildAgentEntries(name, profile, repoDirBase) {
     return entries;
 }
 /**
- * 构建 shared tier 条目（skills、MCP 模板、共享文件）
+ * Build shared tier entries (skills, MCP templates, shared files).
  */
 function buildSharedEntries(cfg, repoDirBase) {
     const entries = [];
@@ -221,7 +221,7 @@ function buildSharedEntries(cfg, repoDirBase) {
     if (!shared)
         return entries;
     const profiles = cfg.profiles.default;
-    // ── shared skills：多源汇聚 ────────────────────────────────
+    // ── shared skills: multi-source aggregation ────────────────
     for (const source of shared.skills.sources) {
         const p = profiles[source.agent];
         if (!p.enabled)
@@ -233,7 +233,7 @@ function buildSharedEntries(cfg, repoDirBase) {
         if (!fs.existsSync(scanBase))
             continue;
         for (const relFile of walkDir(scanBase)) {
-            // 跳过 .DS_Store 等系统文件
+            // Skip system files like .DS_Store
             if (path.basename(relFile).startsWith('.'))
                 continue;
             entries.push({
@@ -245,7 +245,7 @@ function buildSharedEntries(cfg, repoDirBase) {
             });
         }
     }
-    // ── shared MCP：从各 agent 的 JSON 中提取 mcpServers ──────
+    // ── shared MCP: extract mcpServers from each agent's JSON ──
     for (const source of shared.mcp.sources) {
         const p = profiles[source.agent];
         if (!p.enabled)
@@ -308,30 +308,30 @@ function applyFilter(entries, filter) {
 export function buildFileEntries(cfg, repoDirBase, agent, filter) {
     const entries = [];
     const profiles = cfg.profiles.default;
-    // per-agent 条目
+    // per-agent entries
     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）
+    // shared entries (excluded when --agent filter is active, since shared belongs to no single agent)
     if (!agent) {
         entries.push(...buildSharedEntries(cfg, repoDirBase));
     }
     return applyFilter(deduplicateEntries(entries), filter);
 }
 /**
- * 将 shared 内容（skills、MCP 配置）分发到各 agent 的本地目录。
- * push 前调用，确保各 agent 在推送前已获得最新共享资源。
+ * Distribute shared content (skills, MCP configs) to each agent's local directory.
+ * Called before push to ensure all agents have the latest shared resources.
  */
 function distributeShared(cfg) {
     const shared = cfg.shared;
     if (!shared)
         return;
     const profiles = cfg.profiles.default;
-    // ── 分发 skills：从每个 source 收集，只添加对方完全没有的新 skill ──
-    // 收集各 agent 当前拥有的 skill 集合
+    // ── Distribute skills: collect from each source, only add skills the target is missing ──
+    // Collect each agent's current skill set
     const agentSkills = new Map(); // agent → relPath → absPath
     for (const source of shared.skills.sources) {
         const p = profiles[source.agent];
@@ -348,7 +348,7 @@ function distributeShared(cfg) {
         }
         agentSkills.set(source.agent, skills);
     }
-    // 合并所有 agent 的 skill（去重，先出现者优先）
+    // Merge all agents' skills (deduplicate, first occurrence wins)
     const allSkills = new Map();
     for (const skills of agentSkills.values()) {
         for (const [rel, abs] of skills) {
@@ -356,7 +356,7 @@ function distributeShared(cfg) {
                 allSkills.set(rel, abs);
         }
     }
-    // 分发：只把某 agent 缺少的 skill 复制过去（skill 存在于全局集合中）
+    // Distribute: only copy skills that a given agent is missing (present in global set)
     for (const source of shared.skills.sources) {
         const p = profiles[source.agent];
         if (!p.enabled)
@@ -365,14 +365,14 @@ function distributeShared(cfg) {
         const skillsDir = path.join(expandHome(p.workspacePath), source.dir);
         for (const [relFile, srcAbs] of allSkills) {
             if (mySkills.has(relFile))
-                continue; // 已有，不覆盖
+                continue; // already exists, do not overwrite
             const dest = path.join(skillsDir, relFile);
             fs.mkdirSync(path.dirname(dest), { recursive: true });
             fs.copyFileSync(srcAbs, dest);
             logger.debug(`  ${t('sync.distributeSkill', { file: relFile, agent: source.agent })}`);
         }
     }
-    // ── 分发 MCP 配置：从每个 source 提取，merge 到其他 agent ──
+    // ── Distribute MCP configs: extract from each source, merge into other agents ──
     const mergedMcp = {};
     for (const source of shared.mcp.sources) {
         const p = profiles[source.agent];
@@ -388,9 +388,9 @@ function distributeShared(cfg) {
                 Object.assign(mergedMcp, mcpField);
             }
         }
-        catch { /* 忽略解析失败 */ }
+        catch { /* ignore parse failures */ }
     }
-    // 写回到每个 source agent 的 MCP 配置（文件不存在时创建）
+    // Write back to each source agent's MCP config (create file if missing)
     if (Object.keys(mergedMcp).length > 0) {
         for (const source of shared.mcp.sources) {
             const p = profiles[source.agent];
@@ -403,7 +403,7 @@ function distributeShared(cfg) {
                     json = JSON.parse(fs.readFileSync(srcPath, 'utf-8'));
                 }
                 const currentMcp = (json[source.field] ?? {});
-                // 只添加本地没有的 MCP server，不覆盖已有配置
+                // Only add MCP servers not present locally; do not overwrite existing configs
                 let changed = false;
                 for (const [key, val] of Object.entries(mergedMcp)) {
                     if (!(key in currentMcp)) {
@@ -418,13 +418,13 @@ function distributeShared(cfg) {
                     logger.debug(`  ${t('sync.distributeMcp', { agent: source.agent })}`);
                 }
             }
-            catch { /* 忽略 */ }
+            catch { /* ignore */ }
         }
     }
 }
 /**
- * 清理 repo 中的过期文件 — repo 有但当前 entries 中不包含的条目删除。
- * 仅清理 agents/ 和 shared/ 目录下的文件（不删 .git 等）。
+ * Prune stale files from repo — delete entries present in repo but absent from current entries.
+ * Only prunes files under agents/ and shared/ directories (does not touch .git etc.).
  */
 function pruneRepoStaleFiles(repoPath, entries) {
     const activeRepoRels = new Set(entries.map(e => e.repoRel));
@@ -442,7 +442,7 @@ function pruneRepoStaleFiles(repoPath, entries) {
                 fs.unlinkSync(abs);
                 deleted.push(repoRel);
                 logger.debug(`  ${t('sync.pruneStale', { file: repoRel })}`);
-                // 清理空目录
+                // Clean up empty directories
                 let dir = path.dirname(abs);
                 while (dir !== scanRoot && dir.startsWith(scanRoot)) {
                     const remaining = fs.readdirSync(dir);
@@ -698,8 +698,8 @@ export const syncEngine = {
             }
             result.synced.push(entry.repoRel);
         }
-        // ── 清理 repo 中的过期文件（全量 push 时） ──────────────────
-        // 只用实际写入 repo 的条目做 prune，排除本地不存在的 skipped 条目
+        // ── Prune stale files from repo (full push only) ──────────────
+        // Only prune using entries actually written to repo, excluding skipped entries with missing local files
         if (!agent) {
             const syncedEntries = entries.filter(e => fs.existsSync(e.srcAbs));
             const pruned = pruneRepoStaleFiles(repoPath, syncedEntries);
@@ -729,8 +729,8 @@ export const syncEngine = {
         for (const entry of entries) {
             const srcRepo = path.join(repoPath, entry.repoRel);
             if (!fs.existsSync(srcRepo)) {
-                // repo 没有但本地有 → 记录为 localOnly
-                // jsonFields 条目：srcAbs 是完整 JSON（总是存在），需检查提取字段是否非空
+                // Not in repo but exists locally → mark as localOnly
+                // jsonFields entries: srcAbs is the full JSON (always exists), check if extracted fields are non-empty
                 if (entry.jsonExtract) {
                     try {
                         const fullJson = JSON.parse(fs.readFileSync(entry.srcAbs, 'utf-8'));
@@ -739,7 +739,7 @@ export const syncEngine = {
                             result.localOnly.push(entry.repoRel);
                         }
                     }
-                    catch { /* JSON 解析失败则忽略 */ }
+                    catch { /* ignore JSON parse failures */ }
                 }
                 else if (fs.existsSync(entry.srcAbs)) {
                     result.localOnly.push(entry.repoRel);
@@ -748,7 +748,7 @@ export const syncEngine = {
                 result.skipped.push(entry.repoRel);
                 continue;
             }
-            // ── JSON 字段级 merge-back ────────────────────────────────
+            // ── JSON field-level merge-back ────────────────────────────
             if (entry.jsonExtract) {
                 let partialContent;
                 if (entry.encrypt) {
@@ -758,7 +758,7 @@ export const syncEngine = {
                     partialContent = fs.readFileSync(srcRepo, 'utf-8');
                 }
                 const partial = JSON.parse(partialContent);
-                // 读取本地完整 JSON，merge 进去（不破坏其他字段）
+                // Read local full JSON, merge into it (without destroying other fields)
                 const targetPath = entry.jsonExtract.originalPath;
                 let fullJson = {};
                 if (fs.existsSync(targetPath)) {
@@ -767,7 +767,7 @@ export const syncEngine = {
                 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
+                // shared MCP entry: also distribute to all other agents
                 if (entry.agentName === 'shared' && cfg.shared) {
                     for (const source of cfg.shared.mcp.sources) {
                         const p = cfg.profiles.default[source.agent];
@@ -775,7 +775,7 @@ export const syncEngine = {
                             continue;
                         const otherPath = path.join(expandHome(p.workspacePath), source.src);
                         if (otherPath === targetPath)
-                            continue; // 已处理
+                            continue; // already handled
                         let otherJson = {};
                         if (fs.existsSync(otherPath)) {
                             try {
@@ -795,7 +795,7 @@ export const syncEngine = {
                 logProgress(restoreIdx, restoreTotal, entry.encrypt ? 'decrypted' : 'field', entry.repoRel);
                 continue;
             }
-            // ── shared skills 分发到各 agent ──────────────────────────
+            // ── Distribute shared skills to all agents ─────────────────
             if (entry.agentName === 'shared' && entry.repoRel.startsWith('shared/skills/')) {
                 const relInSkills = entry.repoRel.slice('shared/skills/'.length);
                 const shared = cfg.shared;
@@ -814,7 +814,7 @@ export const syncEngine = {
                 logProgress(restoreIdx, restoreTotal, 'copy', entry.repoRel);
                 continue;
             }
-            // ── 冲突检测（整文件同步） ────────────────────────────────
+            // ── Conflict detection (whole-file sync) ──────────────────
             if (fs.existsSync(entry.srcAbs)) {
                 let isDiff = false;
                 const localBuf = fs.readFileSync(entry.srcAbs);
@@ -906,7 +906,7 @@ export const syncEngine = {
                     }
                 }
             }
-            // ── 写入文件 ──────────────────────────────────────────────
+            // ── Write file ───────────────────────────────────────────
             fs.mkdirSync(path.dirname(entry.srcAbs), { recursive: true });
             if (entry.encrypt) {
                 cryptoEngine.decryptFile(srcRepo, entry.srcAbs, keyPath);
@@ -953,7 +953,7 @@ export const syncEngine = {
                 diff.missing.push(entry.repoRel);
                 continue;
             }
-            // JSON 字段提取时，比较提取后的内容
+            // For JSON field extraction, compare the extracted content
             if (entry.jsonExtract) {
                 try {
                     const fullJson = JSON.parse(fs.readFileSync(entry.srcAbs, 'utf-8'));
@@ -974,7 +974,7 @@ export const syncEngine = {
                 }
                 continue;
             }
-            // 整文件比较
+            // Whole-file comparison
             const srcBuf = fs.readFileSync(entry.srcAbs);
             const repoBuf = fs.readFileSync(path.join(repoPath, entry.repoRel));
             if (entry.encrypt) {