wangchuan 5.1.0 → 5.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -6
- package/README.zh-CN.md +8 -6
- package/dist/bin/wangchuan.js +10 -4
- package/dist/bin/wangchuan.js.map +1 -1
- package/dist/src/agents/index.d.ts.map +1 -1
- package/dist/src/agents/index.js +9 -0
- package/dist/src/agents/index.js.map +1 -1
- package/dist/src/commands/doctor.d.ts.map +1 -1
- package/dist/src/commands/doctor.js +3 -17
- package/dist/src/commands/doctor.js.map +1 -1
- package/dist/src/commands/init.d.ts.map +1 -1
- package/dist/src/commands/init.js +49 -4
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/key.d.ts.map +1 -1
- package/dist/src/commands/key.js +1 -17
- package/dist/src/commands/key.js.map +1 -1
- package/dist/src/commands/memory.js +44 -2
- package/dist/src/commands/memory.js.map +1 -1
- package/dist/src/commands/pull.js.map +1 -1
- package/dist/src/commands/push.js.map +1 -1
- package/dist/src/commands/snapshot.d.ts.map +1 -1
- package/dist/src/commands/snapshot.js +1 -19
- package/dist/src/commands/snapshot.js.map +1 -1
- package/dist/src/commands/sync.d.ts.map +1 -1
- package/dist/src/commands/sync.js +1 -15
- package/dist/src/commands/sync.js.map +1 -1
- package/dist/src/commands/watch.js.map +1 -1
- package/dist/src/core/crypto.d.ts +2 -0
- package/dist/src/core/crypto.d.ts.map +1 -1
- package/dist/src/core/crypto.js +10 -2
- package/dist/src/core/crypto.js.map +1 -1
- package/dist/src/core/merge.d.ts +1 -1
- package/dist/src/core/merge.d.ts.map +1 -1
- package/dist/src/core/merge.js +2 -18
- package/dist/src/core/merge.js.map +1 -1
- package/dist/src/core/migrate.d.ts.map +1 -1
- package/dist/src/core/migrate.js +5 -20
- package/dist/src/core/migrate.js.map +1 -1
- package/dist/src/core/sync-lock.d.ts.map +1 -1
- package/dist/src/core/sync-lock.js +20 -1
- package/dist/src/core/sync-lock.js.map +1 -1
- package/dist/src/core/sync.d.ts +4 -4
- package/dist/src/core/sync.d.ts.map +1 -1
- package/dist/src/core/sync.js +29 -19
- package/dist/src/core/sync.js.map +1 -1
- package/dist/src/i18n.d.ts.map +1 -1
- package/dist/src/i18n.js +10 -1
- package/dist/src/i18n.js.map +1 -1
- package/dist/src/types.d.ts +13 -3
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/utils/fs.d.ts +18 -0
- package/dist/src/utils/fs.d.ts.map +1 -0
- package/dist/src/utils/fs.js +56 -0
- package/dist/src/utils/fs.js.map +1 -0
- package/dist/src/utils/lcs.d.ts +8 -0
- package/dist/src/utils/lcs.d.ts.map +1 -0
- package/dist/src/utils/lcs.js +20 -0
- package/dist/src/utils/lcs.js.map +1 -0
- package/dist/src/utils/linediff.d.ts +1 -1
- package/dist/src/utils/linediff.d.ts.map +1 -1
- package/dist/src/utils/linediff.js +2 -15
- package/dist/src/utils/linediff.js.map +1 -1
- package/dist/test/merge.test.d.ts +5 -0
- package/dist/test/merge.test.d.ts.map +1 -0
- package/dist/test/merge.test.js +226 -0
- package/dist/test/merge.test.js.map +1 -0
- package/package.json +2 -2
- package/skill/SKILL.md +6 -2
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqIH,oEAAoE;AAEpE;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* fs.ts — Shared filesystem utilities
|
|
3
|
+
*
|
|
4
|
+
* Consolidates walkDir and copyDirSync implementations previously
|
|
5
|
+
* duplicated across sync.ts, doctor.ts, key.ts, snapshot.ts, migrate.ts.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Recursively list all file paths under a directory.
|
|
9
|
+
* Returns paths relative to dirAbs.
|
|
10
|
+
* @param filter Optional predicate to exclude relative paths (return false to skip)
|
|
11
|
+
*/
|
|
12
|
+
export declare function walkDir(dirAbs: string, filter?: (relPath: string) => boolean): string[];
|
|
13
|
+
/**
|
|
14
|
+
* Recursively copy a directory. Returns the number of files copied.
|
|
15
|
+
* @param skipNames Optional set of entry names to skip (e.g. '.git')
|
|
16
|
+
*/
|
|
17
|
+
export declare function copyDirSync(src: string, dest: string, skipNames?: ReadonlySet<string>): number;
|
|
18
|
+
//# sourceMappingURL=fs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../src/utils/fs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,EAAE,CAcvF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAgB9F"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* fs.ts — Shared filesystem utilities
|
|
3
|
+
*
|
|
4
|
+
* Consolidates walkDir and copyDirSync implementations previously
|
|
5
|
+
* duplicated across sync.ts, doctor.ts, key.ts, snapshot.ts, migrate.ts.
|
|
6
|
+
*/
|
|
7
|
+
import fs from 'fs';
|
|
8
|
+
import path from 'path';
|
|
9
|
+
/**
|
|
10
|
+
* Recursively list all file paths under a directory.
|
|
11
|
+
* Returns paths relative to dirAbs.
|
|
12
|
+
* @param filter Optional predicate to exclude relative paths (return false to skip)
|
|
13
|
+
*/
|
|
14
|
+
export function walkDir(dirAbs, filter) {
|
|
15
|
+
const results = [];
|
|
16
|
+
if (!fs.existsSync(dirAbs))
|
|
17
|
+
return results;
|
|
18
|
+
function walk(subPath) {
|
|
19
|
+
const full = path.join(dirAbs, subPath);
|
|
20
|
+
if (fs.statSync(full).isDirectory()) {
|
|
21
|
+
fs.readdirSync(full).forEach(f => walk(path.join(subPath, f)));
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
if (filter && !filter(subPath))
|
|
25
|
+
return;
|
|
26
|
+
results.push(subPath);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
fs.readdirSync(dirAbs).forEach(f => walk(f));
|
|
30
|
+
return results;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Recursively copy a directory. Returns the number of files copied.
|
|
34
|
+
* @param skipNames Optional set of entry names to skip (e.g. '.git')
|
|
35
|
+
*/
|
|
36
|
+
export function copyDirSync(src, dest, skipNames) {
|
|
37
|
+
let count = 0;
|
|
38
|
+
if (!fs.existsSync(src))
|
|
39
|
+
return count;
|
|
40
|
+
fs.mkdirSync(dest, { recursive: true });
|
|
41
|
+
for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
|
|
42
|
+
if (skipNames?.has(entry.name))
|
|
43
|
+
continue;
|
|
44
|
+
const srcPath = path.join(src, entry.name);
|
|
45
|
+
const destPath = path.join(dest, entry.name);
|
|
46
|
+
if (entry.isDirectory()) {
|
|
47
|
+
count += copyDirSync(srcPath, destPath, skipNames);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
fs.copyFileSync(srcPath, destPath);
|
|
51
|
+
count++;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return count;
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=fs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/utils/fs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAQ,IAAI,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,MAAc,EAAE,MAAqC;IAC3E,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IAC3C,SAAS,IAAI,CAAC,OAAe;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACpC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;gBAAE,OAAO;YACvC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,GAAW,EAAE,IAAY,EAAE,SAA+B;IACpF,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACtC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,IAAI,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAS;QACzC,MAAM,OAAO,GAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,KAAK,IAAI,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnC,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* lcs.ts — Shared Longest Common Subsequence (LCS) table builder
|
|
3
|
+
*
|
|
4
|
+
* Used by both linediff.ts (unified diff) and merge.ts (three-way merge).
|
|
5
|
+
*/
|
|
6
|
+
/** Build the LCS traceback table for two string arrays (iterative, O(m*n) time and space) */
|
|
7
|
+
export declare function buildLcsTable(a: readonly string[], b: readonly string[]): number[][];
|
|
8
|
+
//# sourceMappingURL=lcs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lcs.d.ts","sourceRoot":"","sources":["../../../src/utils/lcs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,6FAA6F;AAC7F,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,CAcpF"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* lcs.ts — Shared Longest Common Subsequence (LCS) table builder
|
|
3
|
+
*
|
|
4
|
+
* Used by both linediff.ts (unified diff) and merge.ts (three-way merge).
|
|
5
|
+
*/
|
|
6
|
+
/** Build the LCS traceback table for two string arrays (iterative, O(m*n) time and space) */
|
|
7
|
+
export function buildLcsTable(a, b) {
|
|
8
|
+
const m = a.length;
|
|
9
|
+
const n = b.length;
|
|
10
|
+
const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
|
|
11
|
+
for (let i = 1; i <= m; i++) {
|
|
12
|
+
for (let j = 1; j <= n; j++) {
|
|
13
|
+
dp[i][j] = a[i - 1] === b[j - 1]
|
|
14
|
+
? (dp[i - 1][j - 1] + 1)
|
|
15
|
+
: Math.max(dp[i - 1][j], dp[i][j - 1]);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return dp;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=lcs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lcs.js","sourceRoot":"","sources":["../../../src/utils/lcs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,6FAA6F;AAC7F,MAAM,UAAU,aAAa,CAAC,CAAoB,EAAE,CAAoB;IACtE,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACnB,MAAM,EAAE,GAAe,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CACxD,IAAI,KAAK,CAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACjC,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5B,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAE,GAAG,CAAC,CAAC;gBAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* linediff.ts — Line-level unified diff tool (no external dependencies)
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* Uses the shared LCS algorithm from lcs.ts,
|
|
5
5
|
* outputs human-readable unified diff format.
|
|
6
6
|
*/
|
|
7
7
|
export interface DiffLine {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linediff.d.ts","sourceRoot":"","sources":["../../../src/utils/linediff.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"linediff.d.ts","sourceRoot":"","sources":["../../../src/utils/linediff.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IACpC,0CAA0C;IAC1C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAsBD;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAI,GAAG,QAAQ,EAAE,CA8B/E"}
|
|
@@ -1,23 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* linediff.ts — Line-level unified diff tool (no external dependencies)
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* Uses the shared LCS algorithm from lcs.ts,
|
|
5
5
|
* outputs human-readable unified diff format.
|
|
6
6
|
*/
|
|
7
|
-
|
|
8
|
-
function buildLcsTable(a, b) {
|
|
9
|
-
const m = a.length;
|
|
10
|
-
const n = b.length;
|
|
11
|
-
const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
|
|
12
|
-
for (let i = 1; i <= m; i++) {
|
|
13
|
-
for (let j = 1; j <= n; j++) {
|
|
14
|
-
dp[i][j] = a[i - 1] === b[j - 1]
|
|
15
|
-
? (dp[i - 1][j - 1] + 1)
|
|
16
|
-
: Math.max(dp[i - 1][j], dp[i][j - 1]);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
return dp;
|
|
20
|
-
}
|
|
7
|
+
import { buildLcsTable } from './lcs.js';
|
|
21
8
|
/** Generate diff line list from the LCS traceback table (iterative to avoid stack overflow on large files) */
|
|
22
9
|
function traceback(dp, a, b) {
|
|
23
10
|
const stack = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linediff.js","sourceRoot":"","sources":["../../../src/utils/linediff.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"linediff.js","sourceRoot":"","sources":["../../../src/utils/linediff.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge.test.d.ts","sourceRoot":"","sources":["../../test/merge.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* merge.test.ts — Three-way merge module unit tests
|
|
3
|
+
*/
|
|
4
|
+
import { describe, it } from 'node:test';
|
|
5
|
+
import assert from 'node:assert/strict';
|
|
6
|
+
import { threeWayMerge } from '../src/core/merge.js';
|
|
7
|
+
// ---------------------------------------------------------------------------
|
|
8
|
+
// 1. Fast paths
|
|
9
|
+
// ---------------------------------------------------------------------------
|
|
10
|
+
describe('threeWayMerge fast paths', () => {
|
|
11
|
+
it('local === remote → returns local as-is, no conflicts', () => {
|
|
12
|
+
const base = 'a\nb\nc';
|
|
13
|
+
const local = 'a\nX\nc';
|
|
14
|
+
const remote = 'a\nX\nc';
|
|
15
|
+
const result = threeWayMerge(base, local, remote);
|
|
16
|
+
assert.equal(result.merged, local);
|
|
17
|
+
assert.equal(result.hasConflicts, false);
|
|
18
|
+
});
|
|
19
|
+
it('local === base → returns remote (only remote changed)', () => {
|
|
20
|
+
const base = 'a\nb\nc';
|
|
21
|
+
const local = 'a\nb\nc';
|
|
22
|
+
const remote = 'a\nB\nc';
|
|
23
|
+
const result = threeWayMerge(base, local, remote);
|
|
24
|
+
assert.equal(result.merged, remote);
|
|
25
|
+
assert.equal(result.hasConflicts, false);
|
|
26
|
+
});
|
|
27
|
+
it('remote === base → returns local (only local changed)', () => {
|
|
28
|
+
const base = 'a\nb\nc';
|
|
29
|
+
const local = 'a\nL\nc';
|
|
30
|
+
const remote = 'a\nb\nc';
|
|
31
|
+
const result = threeWayMerge(base, local, remote);
|
|
32
|
+
assert.equal(result.merged, local);
|
|
33
|
+
assert.equal(result.hasConflicts, false);
|
|
34
|
+
});
|
|
35
|
+
it('all three identical → returns as-is, no conflicts', () => {
|
|
36
|
+
const text = 'hello\nworld';
|
|
37
|
+
const result = threeWayMerge(text, text, text);
|
|
38
|
+
assert.equal(result.merged, text);
|
|
39
|
+
assert.equal(result.hasConflicts, false);
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
// ---------------------------------------------------------------------------
|
|
43
|
+
// 2. Non-overlapping edits
|
|
44
|
+
// ---------------------------------------------------------------------------
|
|
45
|
+
describe('threeWayMerge non-overlapping edits', () => {
|
|
46
|
+
it('local edits top, remote edits bottom → clean merge', () => {
|
|
47
|
+
const base = 'a\nb\nc\nd\ne';
|
|
48
|
+
const local = 'A\nb\nc\nd\ne'; // changed line 1
|
|
49
|
+
const remote = 'a\nb\nc\nd\nE'; // changed line 5
|
|
50
|
+
const result = threeWayMerge(base, local, remote);
|
|
51
|
+
assert.equal(result.hasConflicts, false);
|
|
52
|
+
assert.equal(result.merged, 'A\nb\nc\nd\nE');
|
|
53
|
+
});
|
|
54
|
+
it('local inserts a line, remote edits a different line → clean merge', () => {
|
|
55
|
+
const base = 'a\nb\nc';
|
|
56
|
+
const local = 'a\nb\nINSERTED\nc'; // insertion between b and c
|
|
57
|
+
const remote = 'a\nB\nc'; // edit line 2
|
|
58
|
+
const result = threeWayMerge(base, local, remote);
|
|
59
|
+
assert.equal(result.hasConflicts, false);
|
|
60
|
+
// Both changes should be present
|
|
61
|
+
assert.ok(result.merged.includes('B'));
|
|
62
|
+
assert.ok(result.merged.includes('INSERTED'));
|
|
63
|
+
});
|
|
64
|
+
it('local deletes a line, remote edits a different line → clean merge', () => {
|
|
65
|
+
const base = 'a\nb\nc\nd';
|
|
66
|
+
const local = 'a\nc\nd'; // deleted line 2 (b)
|
|
67
|
+
const remote = 'a\nb\nc\nD'; // edited line 4
|
|
68
|
+
const result = threeWayMerge(base, local, remote);
|
|
69
|
+
assert.equal(result.hasConflicts, false);
|
|
70
|
+
assert.ok(!result.merged.includes('b'));
|
|
71
|
+
assert.ok(result.merged.includes('D'));
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
// ---------------------------------------------------------------------------
|
|
75
|
+
// 3. Identical overlapping edits → auto-resolve
|
|
76
|
+
// ---------------------------------------------------------------------------
|
|
77
|
+
describe('threeWayMerge identical overlapping edits', () => {
|
|
78
|
+
it('both sides make the same edit → auto-resolved, no conflict', () => {
|
|
79
|
+
const base = 'a\nb\nc';
|
|
80
|
+
const local = 'a\nX\nc';
|
|
81
|
+
const remote = 'a\nX\nc';
|
|
82
|
+
const result = threeWayMerge(base, local, remote);
|
|
83
|
+
assert.equal(result.hasConflicts, false);
|
|
84
|
+
assert.equal(result.merged, 'a\nX\nc');
|
|
85
|
+
});
|
|
86
|
+
it('both sides delete the same line → auto-resolved', () => {
|
|
87
|
+
const base = 'a\nb\nc';
|
|
88
|
+
const local = 'a\nc';
|
|
89
|
+
const remote = 'a\nc';
|
|
90
|
+
const result = threeWayMerge(base, local, remote);
|
|
91
|
+
assert.equal(result.hasConflicts, false);
|
|
92
|
+
assert.equal(result.merged, 'a\nc');
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
// ---------------------------------------------------------------------------
|
|
96
|
+
// 4. Conflicting edits → conflict markers
|
|
97
|
+
// ---------------------------------------------------------------------------
|
|
98
|
+
describe('threeWayMerge conflicting edits', () => {
|
|
99
|
+
it('both sides edit the same line differently → conflict markers', () => {
|
|
100
|
+
const base = 'a\nb\nc';
|
|
101
|
+
const local = 'a\nL\nc';
|
|
102
|
+
const remote = 'a\nR\nc';
|
|
103
|
+
const result = threeWayMerge(base, local, remote);
|
|
104
|
+
assert.equal(result.hasConflicts, true);
|
|
105
|
+
assert.ok(result.merged.includes('<<<<<<< LOCAL'));
|
|
106
|
+
assert.ok(result.merged.includes('======='));
|
|
107
|
+
assert.ok(result.merged.includes('>>>>>>> REMOTE'));
|
|
108
|
+
assert.ok(result.merged.includes('L'));
|
|
109
|
+
assert.ok(result.merged.includes('R'));
|
|
110
|
+
});
|
|
111
|
+
it('conflict markers are properly structured', () => {
|
|
112
|
+
const base = 'x\ny\nz';
|
|
113
|
+
const local = 'x\nLOCAL_Y\nz';
|
|
114
|
+
const remote = 'x\nREMOTE_Y\nz';
|
|
115
|
+
const result = threeWayMerge(base, local, remote);
|
|
116
|
+
const lines = result.merged.split('\n');
|
|
117
|
+
const markerStart = lines.indexOf('<<<<<<< LOCAL');
|
|
118
|
+
const separator = lines.indexOf('=======');
|
|
119
|
+
const markerEnd = lines.indexOf('>>>>>>> REMOTE');
|
|
120
|
+
assert.ok(markerStart >= 0, 'should have LOCAL marker');
|
|
121
|
+
assert.ok(separator > markerStart, 'separator after LOCAL marker');
|
|
122
|
+
assert.ok(markerEnd > separator, 'REMOTE marker after separator');
|
|
123
|
+
// Local content between LOCAL marker and separator
|
|
124
|
+
const localContent = lines.slice(markerStart + 1, separator);
|
|
125
|
+
assert.ok(localContent.includes('LOCAL_Y'));
|
|
126
|
+
// Remote content between separator and REMOTE marker
|
|
127
|
+
const remoteContent = lines.slice(separator + 1, markerEnd);
|
|
128
|
+
assert.ok(remoteContent.includes('REMOTE_Y'));
|
|
129
|
+
});
|
|
130
|
+
it('surrounding unchanged lines are preserved around conflict', () => {
|
|
131
|
+
const base = 'first\nmiddle\nlast';
|
|
132
|
+
const local = 'first\nL\nlast';
|
|
133
|
+
const remote = 'first\nR\nlast';
|
|
134
|
+
const result = threeWayMerge(base, local, remote);
|
|
135
|
+
const lines = result.merged.split('\n');
|
|
136
|
+
assert.equal(lines[0], 'first');
|
|
137
|
+
assert.equal(lines[lines.length - 1], 'last');
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
// ---------------------------------------------------------------------------
|
|
141
|
+
// 5. Empty inputs
|
|
142
|
+
// ---------------------------------------------------------------------------
|
|
143
|
+
describe('threeWayMerge empty inputs', () => {
|
|
144
|
+
it('all three empty → empty result, no conflicts', () => {
|
|
145
|
+
const result = threeWayMerge('', '', '');
|
|
146
|
+
assert.equal(result.merged, '');
|
|
147
|
+
assert.equal(result.hasConflicts, false);
|
|
148
|
+
});
|
|
149
|
+
it('base empty, local and remote add identical content → auto-resolve', () => {
|
|
150
|
+
const result = threeWayMerge('', 'new line', 'new line');
|
|
151
|
+
assert.equal(result.hasConflicts, false);
|
|
152
|
+
assert.equal(result.merged, 'new line');
|
|
153
|
+
});
|
|
154
|
+
it('base empty, local and remote add different content → conflict', () => {
|
|
155
|
+
const result = threeWayMerge('', 'local line', 'remote line');
|
|
156
|
+
assert.equal(result.hasConflicts, true);
|
|
157
|
+
assert.ok(result.merged.includes('<<<<<<< LOCAL'));
|
|
158
|
+
assert.ok(result.merged.includes('>>>>>>> REMOTE'));
|
|
159
|
+
});
|
|
160
|
+
it('base has content, both local and remote are empty → auto-resolve (identical delete)', () => {
|
|
161
|
+
const result = threeWayMerge('some content', '', '');
|
|
162
|
+
assert.equal(result.hasConflicts, false);
|
|
163
|
+
assert.equal(result.merged, '');
|
|
164
|
+
});
|
|
165
|
+
it('base has content, only local is empty → return local (remote unchanged)', () => {
|
|
166
|
+
const base = 'content';
|
|
167
|
+
const result = threeWayMerge(base, '', base);
|
|
168
|
+
assert.equal(result.hasConflicts, false);
|
|
169
|
+
assert.equal(result.merged, '');
|
|
170
|
+
});
|
|
171
|
+
});
|
|
172
|
+
// ---------------------------------------------------------------------------
|
|
173
|
+
// 6. Trailing newlines
|
|
174
|
+
// ---------------------------------------------------------------------------
|
|
175
|
+
describe('threeWayMerge trailing newlines', () => {
|
|
176
|
+
it('preserves trailing newline when present in both', () => {
|
|
177
|
+
const base = 'a\nb\n';
|
|
178
|
+
const local = 'a\nL\n';
|
|
179
|
+
const remote = 'a\nb\n';
|
|
180
|
+
const result = threeWayMerge(base, local, remote);
|
|
181
|
+
assert.equal(result.hasConflicts, false);
|
|
182
|
+
assert.equal(result.merged, 'a\nL\n');
|
|
183
|
+
});
|
|
184
|
+
it('local adds trailing newline, remote unchanged → local wins', () => {
|
|
185
|
+
const base = 'a\nb';
|
|
186
|
+
const local = 'a\nb\n';
|
|
187
|
+
const remote = 'a\nb';
|
|
188
|
+
const result = threeWayMerge(base, local, remote);
|
|
189
|
+
assert.equal(result.hasConflicts, false);
|
|
190
|
+
assert.equal(result.merged, 'a\nb\n');
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
// ---------------------------------------------------------------------------
|
|
194
|
+
// 7. Multiple conflict regions in one merge
|
|
195
|
+
// ---------------------------------------------------------------------------
|
|
196
|
+
describe('threeWayMerge multiple conflict regions', () => {
|
|
197
|
+
it('two separate conflict regions produce two sets of markers', () => {
|
|
198
|
+
const base = 'a\nb\nc\nd\ne';
|
|
199
|
+
const local = 'L1\nb\nc\nd\nL2';
|
|
200
|
+
const remote = 'R1\nb\nc\nd\nR2';
|
|
201
|
+
const result = threeWayMerge(base, local, remote);
|
|
202
|
+
assert.equal(result.hasConflicts, true);
|
|
203
|
+
const markers = result.merged.split('\n').filter(l => l === '<<<<<<< LOCAL');
|
|
204
|
+
assert.equal(markers.length, 2, 'should have two conflict regions');
|
|
205
|
+
});
|
|
206
|
+
it('mix of clean merge and conflict in one file', () => {
|
|
207
|
+
// Line layout: a / b / c / d / e / f / g
|
|
208
|
+
// local: A / b / c / L / e / f / g (edit a→A, edit d→L)
|
|
209
|
+
// remote: a / b / c / R / e / f / G (edit d→R, edit g→G)
|
|
210
|
+
// Expected: A cleanly merged, d→conflict, G cleanly merged
|
|
211
|
+
const base = 'a\nb\nc\nd\ne\nf\ng';
|
|
212
|
+
const local = 'A\nb\nc\nL\ne\nf\ng';
|
|
213
|
+
const remote = 'a\nb\nc\nR\ne\nf\nG';
|
|
214
|
+
const result = threeWayMerge(base, local, remote);
|
|
215
|
+
assert.equal(result.hasConflicts, true);
|
|
216
|
+
const lines = result.merged.split('\n');
|
|
217
|
+
// a→A should be cleanly resolved
|
|
218
|
+
assert.equal(lines[0], 'A');
|
|
219
|
+
// g→G should be cleanly resolved
|
|
220
|
+
assert.equal(lines[lines.length - 1], 'G');
|
|
221
|
+
// Only one conflict region (for d)
|
|
222
|
+
const conflictCount = lines.filter(l => l === '<<<<<<< LOCAL').length;
|
|
223
|
+
assert.equal(conflictCount, 1);
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
//# sourceMappingURL=merge.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../test/merge.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "wangchuan",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.2.0",
|
|
4
4
|
"description": "忘川 · AI 记忆同步系统 — 智能体记忆永不遗失",
|
|
5
5
|
"bin": {
|
|
6
6
|
"wangchuan": "./dist/bin/wangchuan.js"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"postbuild": "chmod +x dist/bin/wangchuan.js",
|
|
18
18
|
"prepublishOnly": "npm run build",
|
|
19
19
|
"dev": "tsx bin/wangchuan.ts",
|
|
20
|
-
"test": "node --import tsx/esm --test test/crypto.test.ts test/json-field.test.ts test/sync.test.ts test/sync-history.test.ts",
|
|
20
|
+
"test": "node --import tsx/esm --test test/crypto.test.ts test/json-field.test.ts test/sync.test.ts test/sync-history.test.ts test/merge.test.ts",
|
|
21
21
|
"typecheck": "tsc --noEmit"
|
|
22
22
|
},
|
|
23
23
|
"keywords": [
|
package/skill/SKILL.md
CHANGED
|
@@ -7,7 +7,7 @@ OpenClaw Skill wrapper for the Wangchuan AI memory sync system. Invoke directly
|
|
|
7
7
|
## Command Reference
|
|
8
8
|
|
|
9
9
|
```
|
|
10
|
-
wangchuan init [--repo <url>] [--key <path>] One-time setup — auto-detects agents, runs first sync
|
|
10
|
+
wangchuan init [--repo <url>] [--key <path>] One-time setup — auto-detects agents, offers gh repo create, runs first sync
|
|
11
11
|
wangchuan sync [-a, --agent <name>] [-n, --dry-run] Smart bidirectional sync (THE daily command)
|
|
12
12
|
[-o, --only <patterns...>] Filter: only sync files matching patterns
|
|
13
13
|
[-x, --exclude <patterns...>] Filter: exclude files matching patterns
|
|
@@ -96,7 +96,7 @@ Aliases: `sync` → `s`, `status` → `st`, `snapshot` → `snap`
|
|
|
96
96
|
|
|
97
97
|
### memory
|
|
98
98
|
- `list` — show all agent memories with summaries
|
|
99
|
-
- `show <agent>` —
|
|
99
|
+
- `show <agent>` — list all files when no filename given; fuzzy/substring matching with suggestions on mismatch
|
|
100
100
|
- `copy <from> <to>` — copy memory between agents
|
|
101
101
|
- `broadcast <agent>` — distribute memory to all agents
|
|
102
102
|
|
|
@@ -120,6 +120,10 @@ When omitted, operates on all enabled agents plus the shared tier (skills/MCP/cu
|
|
|
120
120
|
|
|
121
121
|
Custom sub-agents defined in the `agents/` directory of any supported agent (Claude, Cursor, CodeBuddy, WorkBuddy) are automatically synced across all agents via the shared tier (`shared/agents/`). The same deletion confirmation logic as skills applies — a custom agent is pruned from the repo only when all local agents have removed it.
|
|
122
122
|
|
|
123
|
+
## Dynamic Agent Registration
|
|
124
|
+
|
|
125
|
+
Custom agents can be registered at runtime via the `customAgents` field in `config.json`, without recompilation. Custom agents participate in sync identically to built-in agents and support all three entry types (`syncFiles`, `syncDirs`, `jsonFields`).
|
|
126
|
+
|
|
123
127
|
## Sync Protocol for AI Agents (IMPORTANT — all agents must follow)
|
|
124
128
|
|
|
125
129
|
When this skill is loaded by an AI agent, the agent MUST follow these rules:
|