wangchuan 5.0.0 → 5.2.0

package/dist/src/utils/fs.js

@@ -0,0 +1,56 @@
+/**
+ * fs.ts — Shared filesystem utilities
+ *
+ * Consolidates walkDir and copyDirSync implementations previously
+ * duplicated across sync.ts, doctor.ts, key.ts, snapshot.ts, migrate.ts.
+ */
+import fs from 'fs';
+import path from 'path';
+/**
+ * Recursively list all file paths under a directory.
+ * Returns paths relative to dirAbs.
+ * @param filter Optional predicate to exclude relative paths (return false to skip)
+ */
+export function walkDir(dirAbs, filter) {
+    const results = [];
+    if (!fs.existsSync(dirAbs))
+        return results;
+    function walk(subPath) {
+        const full = path.join(dirAbs, subPath);
+        if (fs.statSync(full).isDirectory()) {
+            fs.readdirSync(full).forEach(f => walk(path.join(subPath, f)));
+        }
+        else {
+            if (filter && !filter(subPath))
+                return;
+            results.push(subPath);
+        }
+    }
+    fs.readdirSync(dirAbs).forEach(f => walk(f));
+    return results;
+}
+/**
+ * Recursively copy a directory. Returns the number of files copied.
+ * @param skipNames Optional set of entry names to skip (e.g. '.git')
+ */
+export function copyDirSync(src, dest, skipNames) {
+    let count = 0;
+    if (!fs.existsSync(src))
+        return count;
+    fs.mkdirSync(dest, { recursive: true });
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        if (skipNames?.has(entry.name))
+            continue;
+        const srcPath = path.join(src, entry.name);
+        const destPath = path.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            count += copyDirSync(srcPath, destPath, skipNames);
+        }
+        else {
+            fs.copyFileSync(srcPath, destPath);
+            count++;
+        }
+    }
+    return count;
+}
+//# sourceMappingURL=fs.js.map

package/dist/src/utils/fs.js.map

@@ -0,0 +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"}

package/dist/src/utils/lcs.d.ts

@@ -0,0 +1,8 @@
+/**
+ * lcs.ts — Shared Longest Common Subsequence (LCS) table builder
+ *
+ * Used by both linediff.ts (unified diff) and merge.ts (three-way merge).
+ */
+/** Build the LCS traceback table for two string arrays (iterative, O(m*n) time and space) */
+export declare function buildLcsTable(a: readonly string[], b: readonly string[]): number[][];
+//# sourceMappingURL=lcs.d.ts.map

package/dist/src/utils/lcs.d.ts.map

@@ -0,0 +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"}

package/dist/src/utils/lcs.js

@@ -0,0 +1,20 @@
+/**
+ * lcs.ts — Shared Longest Common Subsequence (LCS) table builder
+ *
+ * Used by both linediff.ts (unified diff) and merge.ts (three-way merge).
+ */
+/** Build the LCS traceback table for two string arrays (iterative, O(m*n) time and space) */
+export function buildLcsTable(a, b) {
+    const m = a.length;
+    const n = b.length;
+    const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+    for (let i = 1; i <= m; i++) {
+        for (let j = 1; j <= n; j++) {
+            dp[i][j] = a[i - 1] === b[j - 1]
+                ? (dp[i - 1][j - 1] + 1)
+                : Math.max(dp[i - 1][j], dp[i][j - 1]);
+        }
+    }
+    return dp;
+}
+//# sourceMappingURL=lcs.js.map

package/dist/src/utils/lcs.js.map

@@ -0,0 +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"}

package/dist/src/utils/linediff.d.ts

@@ -1,7 +1,7 @@
 /**
  * linediff.ts — Line-level unified diff tool (no external dependencies)
  *
- * Implements the Longest Common Subsequence (LCS) algorithm,
+ * Uses the shared LCS algorithm from lcs.ts,
  * outputs human-readable unified diff format.
  */
 export interface DiffLine {

package/dist/src/utils/linediff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linediff.d.ts","sourceRoot":"","sources":["../../../src/utils/linediff.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,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;AA+CD;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAI,GAAG,QAAQ,EAAE,CA+B/E"}
+{"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"}

package/dist/src/utils/linediff.js

@@ -1,47 +1,31 @@
 /**
  * linediff.ts — Line-level unified diff tool (no external dependencies)
  *
- * Implements the Longest Common Subsequence (LCS) algorithm,
+ * Uses the shared LCS algorithm from lcs.ts,
  * outputs human-readable unified diff format.
  */
-/** Build the LCS traceback table for two string arrays */
-function buildLcsTable(a, b) {
-    const m = a.length;
-    const n = b.length;
-    const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
-    for (let i = 1; i <= m; i++) {
-        for (let j = 1; j <= n; j++) {
-            dp[i][j] = a[i - 1] === b[j - 1]
-                ? (dp[i - 1][j - 1] + 1)
-                : Math.max(dp[i - 1][j], dp[i][j - 1]);
+import { buildLcsTable } from './lcs.js';
+/** Generate diff line list from the LCS traceback table (iterative to avoid stack overflow on large files) */
+function traceback(dp, a, b) {
+    const stack = [];
+    let i = a.length;
+    let j = b.length;
+    while (i > 0 || j > 0) {
+        if (i > 0 && j > 0 && a[i - 1] === b[j - 1]) {
+            stack.push({ type: 'context', content: a[i - 1] });
+            i--;
+            j--;
+        }
+        else if (i > 0 && (j === 0 || dp[i - 1][j] >= dp[i][j - 1])) {
+            stack.push({ type: 'removed', content: a[i - 1] });
+            i--;
+        }
+        else {
+            stack.push({ type: 'added', content: b[j - 1] });
+            j--;
         }
     }
-    return dp;
-}
-/** Generate diff line list from the LCS traceback table */
-function traceback(dp, a, b, i, j, out) {
-    if (i === 0 && j === 0)
-        return;
-    if (i === 0) {
-        traceback(dp, a, b, 0, j - 1, out);
-        out.push({ type: 'added', content: b[j - 1] });
-    }
-    else if (j === 0) {
-        traceback(dp, a, b, i - 1, 0, out);
-        out.push({ type: 'removed', content: a[i - 1] });
-    }
-    else if (a[i - 1] === b[j - 1]) {
-        traceback(dp, a, b, i - 1, j - 1, out);
-        out.push({ type: 'context', content: a[i - 1] });
-    }
-    else if (dp[i - 1][j] >= dp[i][j - 1]) {
-        traceback(dp, a, b, i - 1, j, out);
-        out.push({ type: 'removed', content: a[i - 1] });
-    }
-    else {
-        traceback(dp, a, b, i, j - 1, out);
-        out.push({ type: 'added', content: b[j - 1] });
-    }
+    return stack.reverse();
 }
 /**
  * Perform line-level diff on two texts, return a DiffLine list.
@@ -51,8 +35,7 @@ export function diffText(before, after, context = 3) {
     const a = before.split('\n');
     const b = after.split('\n');
     const dp = buildLcsTable(a, b);
-    const all = [];
-    traceback(dp, a, b, a.length, b.length, all);
+    const all = traceback(dp, a, b);
     // Trim large unchanged-context blocks in the middle, keeping only context lines
     const changed = all.map((l, i) => (l.type !== 'context' ? i : -1)).filter(i => i >= 0);
     if (changed.length === 0)

package/dist/src/utils/linediff.js.map

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

package/dist/test/merge.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * merge.test.ts — Three-way merge module unit tests
+ */
+export {};
+//# sourceMappingURL=merge.test.d.ts.map

package/dist/test/merge.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.test.d.ts","sourceRoot":"","sources":["../../test/merge.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/test/merge.test.js

@@ -0,0 +1,226 @@
+/**
+ * merge.test.ts — Three-way merge module unit tests
+ */
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { threeWayMerge } from '../src/core/merge.js';
+// ---------------------------------------------------------------------------
+// 1. Fast paths
+// ---------------------------------------------------------------------------
+describe('threeWayMerge fast paths', () => {
+    it('local === remote → returns local as-is, no conflicts', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nX\nc';
+        const remote = 'a\nX\nc';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.merged, local);
+        assert.equal(result.hasConflicts, false);
+    });
+    it('local === base → returns remote (only remote changed)', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nb\nc';
+        const remote = 'a\nB\nc';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.merged, remote);
+        assert.equal(result.hasConflicts, false);
+    });
+    it('remote === base → returns local (only local changed)', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nL\nc';
+        const remote = 'a\nb\nc';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.merged, local);
+        assert.equal(result.hasConflicts, false);
+    });
+    it('all three identical → returns as-is, no conflicts', () => {
+        const text = 'hello\nworld';
+        const result = threeWayMerge(text, text, text);
+        assert.equal(result.merged, text);
+        assert.equal(result.hasConflicts, false);
+    });
+});
+// ---------------------------------------------------------------------------
+// 2. Non-overlapping edits
+// ---------------------------------------------------------------------------
+describe('threeWayMerge non-overlapping edits', () => {
+    it('local edits top, remote edits bottom → clean merge', () => {
+        const base = 'a\nb\nc\nd\ne';
+        const local = 'A\nb\nc\nd\ne'; // changed line 1
+        const remote = 'a\nb\nc\nd\nE'; // changed line 5
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, 'A\nb\nc\nd\nE');
+    });
+    it('local inserts a line, remote edits a different line → clean merge', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nb\nINSERTED\nc'; // insertion between b and c
+        const remote = 'a\nB\nc'; // edit line 2
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        // Both changes should be present
+        assert.ok(result.merged.includes('B'));
+        assert.ok(result.merged.includes('INSERTED'));
+    });
+    it('local deletes a line, remote edits a different line → clean merge', () => {
+        const base = 'a\nb\nc\nd';
+        const local = 'a\nc\nd'; // deleted line 2 (b)
+        const remote = 'a\nb\nc\nD'; // edited line 4
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        assert.ok(!result.merged.includes('b'));
+        assert.ok(result.merged.includes('D'));
+    });
+});
+// ---------------------------------------------------------------------------
+// 3. Identical overlapping edits → auto-resolve
+// ---------------------------------------------------------------------------
+describe('threeWayMerge identical overlapping edits', () => {
+    it('both sides make the same edit → auto-resolved, no conflict', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nX\nc';
+        const remote = 'a\nX\nc';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, 'a\nX\nc');
+    });
+    it('both sides delete the same line → auto-resolved', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nc';
+        const remote = 'a\nc';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, 'a\nc');
+    });
+});
+// ---------------------------------------------------------------------------
+// 4. Conflicting edits → conflict markers
+// ---------------------------------------------------------------------------
+describe('threeWayMerge conflicting edits', () => {
+    it('both sides edit the same line differently → conflict markers', () => {
+        const base = 'a\nb\nc';
+        const local = 'a\nL\nc';
+        const remote = 'a\nR\nc';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, true);
+        assert.ok(result.merged.includes('<<<<<<< LOCAL'));
+        assert.ok(result.merged.includes('======='));
+        assert.ok(result.merged.includes('>>>>>>> REMOTE'));
+        assert.ok(result.merged.includes('L'));
+        assert.ok(result.merged.includes('R'));
+    });
+    it('conflict markers are properly structured', () => {
+        const base = 'x\ny\nz';
+        const local = 'x\nLOCAL_Y\nz';
+        const remote = 'x\nREMOTE_Y\nz';
+        const result = threeWayMerge(base, local, remote);
+        const lines = result.merged.split('\n');
+        const markerStart = lines.indexOf('<<<<<<< LOCAL');
+        const separator = lines.indexOf('=======');
+        const markerEnd = lines.indexOf('>>>>>>> REMOTE');
+        assert.ok(markerStart >= 0, 'should have LOCAL marker');
+        assert.ok(separator > markerStart, 'separator after LOCAL marker');
+        assert.ok(markerEnd > separator, 'REMOTE marker after separator');
+        // Local content between LOCAL marker and separator
+        const localContent = lines.slice(markerStart + 1, separator);
+        assert.ok(localContent.includes('LOCAL_Y'));
+        // Remote content between separator and REMOTE marker
+        const remoteContent = lines.slice(separator + 1, markerEnd);
+        assert.ok(remoteContent.includes('REMOTE_Y'));
+    });
+    it('surrounding unchanged lines are preserved around conflict', () => {
+        const base = 'first\nmiddle\nlast';
+        const local = 'first\nL\nlast';
+        const remote = 'first\nR\nlast';
+        const result = threeWayMerge(base, local, remote);
+        const lines = result.merged.split('\n');
+        assert.equal(lines[0], 'first');
+        assert.equal(lines[lines.length - 1], 'last');
+    });
+});
+// ---------------------------------------------------------------------------
+// 5. Empty inputs
+// ---------------------------------------------------------------------------
+describe('threeWayMerge empty inputs', () => {
+    it('all three empty → empty result, no conflicts', () => {
+        const result = threeWayMerge('', '', '');
+        assert.equal(result.merged, '');
+        assert.equal(result.hasConflicts, false);
+    });
+    it('base empty, local and remote add identical content → auto-resolve', () => {
+        const result = threeWayMerge('', 'new line', 'new line');
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, 'new line');
+    });
+    it('base empty, local and remote add different content → conflict', () => {
+        const result = threeWayMerge('', 'local line', 'remote line');
+        assert.equal(result.hasConflicts, true);
+        assert.ok(result.merged.includes('<<<<<<< LOCAL'));
+        assert.ok(result.merged.includes('>>>>>>> REMOTE'));
+    });
+    it('base has content, both local and remote are empty → auto-resolve (identical delete)', () => {
+        const result = threeWayMerge('some content', '', '');
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, '');
+    });
+    it('base has content, only local is empty → return local (remote unchanged)', () => {
+        const base = 'content';
+        const result = threeWayMerge(base, '', base);
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, '');
+    });
+});
+// ---------------------------------------------------------------------------
+// 6. Trailing newlines
+// ---------------------------------------------------------------------------
+describe('threeWayMerge trailing newlines', () => {
+    it('preserves trailing newline when present in both', () => {
+        const base = 'a\nb\n';
+        const local = 'a\nL\n';
+        const remote = 'a\nb\n';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, 'a\nL\n');
+    });
+    it('local adds trailing newline, remote unchanged → local wins', () => {
+        const base = 'a\nb';
+        const local = 'a\nb\n';
+        const remote = 'a\nb';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, false);
+        assert.equal(result.merged, 'a\nb\n');
+    });
+});
+// ---------------------------------------------------------------------------
+// 7. Multiple conflict regions in one merge
+// ---------------------------------------------------------------------------
+describe('threeWayMerge multiple conflict regions', () => {
+    it('two separate conflict regions produce two sets of markers', () => {
+        const base = 'a\nb\nc\nd\ne';
+        const local = 'L1\nb\nc\nd\nL2';
+        const remote = 'R1\nb\nc\nd\nR2';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, true);
+        const markers = result.merged.split('\n').filter(l => l === '<<<<<<< LOCAL');
+        assert.equal(markers.length, 2, 'should have two conflict regions');
+    });
+    it('mix of clean merge and conflict in one file', () => {
+        // Line layout: a / b / c / d / e / f / g
+        // local:  A / b / c / L / e / f / g   (edit a→A, edit d→L)
+        // remote: a / b / c / R / e / f / G   (edit d→R, edit g→G)
+        // Expected: A cleanly merged, d→conflict, G cleanly merged
+        const base = 'a\nb\nc\nd\ne\nf\ng';
+        const local = 'A\nb\nc\nL\ne\nf\ng';
+        const remote = 'a\nb\nc\nR\ne\nf\nG';
+        const result = threeWayMerge(base, local, remote);
+        assert.equal(result.hasConflicts, true);
+        const lines = result.merged.split('\n');
+        // a→A should be cleanly resolved
+        assert.equal(lines[0], 'A');
+        // g→G should be cleanly resolved
+        assert.equal(lines[lines.length - 1], 'G');
+        // Only one conflict region (for d)
+        const conflictCount = lines.filter(l => l === '<<<<<<< LOCAL').length;
+        assert.equal(conflictCount, 1);
+    });
+});
+//# sourceMappingURL=merge.test.js.map

package/dist/test/merge.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wangchuan",
-  "version": "5.0.0",
+  "version": "5.2.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/json-field.test.ts test/sync.test.ts test/sync-history.test.ts",
+    "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",
     "typecheck": "tsc --noEmit"
   },
   "keywords": [

package/skill/SKILL.md

@@ -7,17 +7,20 @@ OpenClaw Skill wrapper for the Wangchuan AI memory sync system. Invoke directly
 ## Command Reference
 
 ```
-wangchuan init     [--repo <url>] [--key <path>]           One-time setup (interactive if no --repo)
+wangchuan init     [--repo <url>] [--key <path>]           One-time setup — auto-detects agents, offers gh repo create, runs first sync
 wangchuan sync     [-a, --agent <name>] [-n, --dry-run]    Smart bidirectional sync (THE daily command)
+                   [-o, --only <patterns...>]              Filter: only sync files matching patterns
+                   [-x, --exclude <patterns...>]           Filter: exclude files matching patterns
 wangchuan status   [-v, --verbose]                         One-screen summary + health score
 wangchuan watch    [-i, --interval <min>]                  Background daemon for continuous sync
 wangchuan doctor   [--key-export|--key-rotate|--setup]     Diagnose + auto-fix everything
 wangchuan memory   list|show|copy|broadcast                Browse/copy memories between agents
 wangchuan env      list|create|switch|current|delete       Multi-environment management
+wangchuan snapshot save|list|restore|delete [name]         Manage sync snapshots
 wangchuan lang     [zh|en]                                 Switch CLI display language
 ```
 
-Aliases: `sync` → `s`, `status` → `st`
+Aliases: `sync` → `s`, `status` → `st`, `snapshot` → `snap`
 
 ## Invocation Examples
 
@@ -47,6 +50,10 @@ Aliases: `sync` → `s`, `status` → `st`
 
 > Broadcast a memory to all agents
 
+> Save a snapshot before making changes
+
+> Restore the last snapshot
+
 > Switch to English output
 
 ## Output Guide
@@ -67,6 +74,13 @@ Aliases: `sync` → `s`, `status` → `st`
 - Auto-creates safety snapshot before syncing
 - Pulls remote changes if any, then pushes local changes
 - Shows compact summary with files synced count
+- `--only` / `--exclude` for fine-grained file filtering (stale detection auto-skipped when filters active)
+
+### snapshot
+- `save [name]` — save a named snapshot (auto-named if omitted)
+- `list` — show all saved snapshots with timestamps
+- `restore <name>` — roll back to a previous snapshot
+- `delete <name>` — remove a snapshot
 
 ### watch
 - Runs as a background daemon with configurable interval
@@ -82,7 +96,7 @@ Aliases: `sync` → `s`, `status` → `st`
 
 ### memory
 - `list` — show all agent memories with summaries
-- `show <agent>` — display full memory content
+- `show <agent>` — list all files when no filename given; fuzzy/substring matching with suggestions on mismatch
 - `copy <from> <to>` — copy memory between agents
 - `broadcast <agent>` — distribute memory to all agents
 
@@ -106,6 +120,39 @@ When omitted, operates on all enabled agents plus the shared tier (skills/MCP/cu
 
 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.
 
+## Dynamic Agent Registration
+
+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`).
+
+## Sync Protocol for AI Agents (IMPORTANT — all agents must follow)
+
+When this skill is loaded by an AI agent, the agent MUST follow these rules:
+
+### After modifying skills or custom agents
+If you (the AI agent) create, modify, or delete any file under your `skills/` or `agents/` directory, you MUST immediately run:
+```bash
+wangchuan sync
+```
+This triggers cross-agent distribution with user confirmation — the user chooses which other agents receive the change.
+
+### After modifying memory or config
+If you update MEMORY.md, CLAUDE.md, settings.json, or any synced config file, run `wangchuan sync` to push changes to the cloud.
+
+### On session start
+Check if the watch daemon is running. If not, suggest starting it:
+```bash
+wangchuan watch
+```
+The watch daemon auto-detects file changes and triggers sync, serving as a safety net when the agent forgets to sync manually.
+
+### Rule summary
+| Event | Action |
+|-------|--------|
+| Created/modified/deleted a skill | Run `wangchuan sync` immediately |
+| Created/modified/deleted a custom agent | Run `wangchuan sync` immediately |
+| Updated memory or config | Run `wangchuan sync` |
+| Session start | Check `wangchuan status`, suggest `wangchuan watch` if not running |
+
 ## Prerequisites
 
 1. Node.js ≥ 18