wangchuan 5.1.0 → 5.2.1

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.1.0",
+  "version": "5.2.1",
   "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,7 +7,7 @@ OpenClaw Skill wrapper for the Wangchuan AI memory sync system. Invoke directly
 ## Command Reference
 
 ```
-wangchuan init     [--repo <url>] [--key <path>]           One-time setup — auto-detects agents, runs first sync
+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
@@ -92,11 +92,17 @@ Aliases: `sync` → `s`, `status` → `st`, `snapshot` → `snap`
 - Auto-discovers installed agents and enables them
 - Detects stale/phantom files
 - `--key-export` / `--key-rotate` for key management
+- Validates key fingerprint against repo — detects wrong master.key before sync
 - `--setup` generates migration one-liner
 
+**Key mismatch error handling**: If `⛔ Key mismatch!` appears during sync, the local `master.key` does not match the repo. Guide the user to:
+1. Run `wangchuan doctor --key-export` on the machine that last pushed
+2. Copy the key hex to the current machine
+3. Run `wangchuan init --key <hex>` or write to `~/.wangchuan/master.key`
+
 ### 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
 
@@ -120,6 +126,10 @@ 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: