wangchuan 5.7.1 → 5.8.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.
Files changed (23) hide show
  1. package/README.md +83 -64
  2. package/README.zh-CN.md +82 -63
  3. package/dist/bin/wangchuan.js +1 -1
  4. package/dist/src/commands/sync.d.ts.map +1 -1
  5. package/dist/src/commands/sync.js +16 -0
  6. package/dist/src/commands/sync.js.map +1 -1
  7. package/dist/src/commands/watch.d.ts +16 -4
  8. package/dist/src/commands/watch.d.ts.map +1 -1
  9. package/dist/src/commands/watch.js +85 -85
  10. package/dist/src/commands/watch.js.map +1 -1
  11. package/dist/src/core/sync.d.ts.map +1 -1
  12. package/dist/src/core/sync.js +13 -9
  13. package/dist/src/core/sync.js.map +1 -1
  14. package/dist/src/i18n.d.ts.map +1 -1
  15. package/dist/src/i18n.js +8 -10
  16. package/dist/src/i18n.js.map +1 -1
  17. package/package.json +1 -1
  18. package/skill/SKILL.md +84 -215
  19. package/skill/references/environment.md +198 -0
  20. package/skill/references/inspect-status.md +90 -0
  21. package/skill/references/install-setup.md +142 -0
  22. package/skill/references/resource-crud.md +153 -0
  23. package/skill/references/sync-conflict.md +69 -0
package/README.md CHANGED
@@ -8,28 +8,79 @@
8
8
 
9
9
  > In Chinese mythology, Wangchuan (忘川) is the River of Oblivion in the underworld — souls crossing it forget all memories of past lives. Wangchuan ensures your AI agent memories are never lost across environments.
10
10
 
11
- Wangchuan encrypts and syncs all your AI agents' configs, memories, and skills across machines and environments — switch laptops, change environments, and restore every agent's state with a single command.
11
+ **Wangchuan is a skill for AI agents.** Install once, and any AI agent (OpenClaw, Claude, Gemini, Codex, ...) gains the ability to sync its configs, memories, skills, and MCP servers across all your machines — encrypted, versioned, and conflict-aware.
12
12
 
13
13
  ---
14
14
 
15
- ## Quick Start
15
+ ## Why a Skill?
16
+
17
+ AI agents today run in isolated environments. When you switch machines, reset a container, or onboard a new laptop, every agent starts from zero — no memory, no skills, no MCP config.
18
+
19
+ Wangchuan solves this by **becoming part of your agent's brain**:
20
+
21
+ ```
22
+ You: "Initialize wangchuan"
23
+ Agent: (installs CLI, asks for repo URL, auto-detects all local agents,
24
+ syncs everything to cloud, starts background pull daemon)
25
+
26
+ You: "Create a new skill called xxx"
27
+ Agent: (creates skill, asks which agents to distribute to,
28
+ copies to selected agents, pushes to cloud)
29
+
30
+ You: "Switch to work environment"
31
+ Agent: (syncs current changes, switches branch, pulls work env data,
32
+ checks for conflicts, restarts background daemon)
33
+ ```
34
+
35
+ **The agent does everything.** You just talk to it. The skill file (`skill/SKILL.md`) teaches the agent exactly how to manage your memories — no manual CLI needed.
36
+
37
+ ### Skill Architecture
38
+
39
+ ```
40
+ skill/
41
+ ├── SKILL.md ← Agent loads this (~100 lines, routing table)
42
+ ├── references/
43
+ │ ├── resource-crud.md ← Skills/agents/MCP/memory CRUD procedures
44
+ │ ├── sync-conflict.md ← Push/pull/conflict resolution
45
+ │ ├── environment.md ← Environment management, rollback, snapshots
46
+ │ ├── inspect-status.md ← Resource inspection, health diagnostics
47
+ │ └── install-setup.md ← Initialization, key management
48
+ └── wangchuan-skill.sh ← OpenClaw shell wrapper
49
+ ```
50
+
51
+ The main SKILL.md is kept under 120 lines. When the agent encounters a specific task (e.g. "delete a skill"), it loads only the relevant reference file on demand — progressive disclosure, not a giant prompt dump.
52
+
53
+ ### Skill Benchmark
54
+
55
+ Every skill change is validated against **51 test cases** (`test/skill-benchmark.md`) covering:
56
+
57
+ - 29 user instructions (init, CRUD for 4 resource types, push/pull, rollback, env management)
58
+ - 4 environment isolation scenarios (cross-env pull, workspace leakage, env selection on restore, watch restart)
59
+ - Global rules (watch daemon auto-start, env-aware sync, non-TTY constraints)
60
+
61
+ ### Install the Skill
16
62
 
17
63
  ```bash
64
+ # Install CLI
18
65
  npm install -g wangchuan
19
66
 
20
- # 1. Initialize — auto-detects installed agents and runs first sync
21
- wangchuan init
22
-
23
- # 2. Start background daemon (optional)
24
- wangchuan watch
67
+ # The skill auto-distributes to all agents on first sync.
68
+ # Or manually copy to an agent:
69
+ cp -r skill/ ~/.claude/skills/wangchuan/
25
70
  ```
26
71
 
27
- On a new machine:
72
+ ---
73
+
74
+ ## Quick Start
28
75
 
29
76
  ```bash
77
+ npm install -g wangchuan
78
+
79
+ # Initialize — auto-detects installed agents, runs first sync
80
+ wangchuan init
81
+
82
+ # On a new machine (any Git hosting):
30
83
  wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
31
- # Also works with GitLab, Gitee, Bitbucket, Gitea, or any Git hosting:
32
- # wangchuan init --repo git@gitlab.com:you/brain.git --key wangchuan_<hex>
33
84
  ```
34
85
 
35
86
  ---
@@ -41,7 +92,7 @@ wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
41
92
  | `init` | — | One-time setup — auto-detects agents, auto-creates repo (GitHub CLI), runs first sync | `--repo`, `--key`, `--force` |
42
93
  | `sync` | `s` | Smart bidirectional sync — THE daily command | `-a, --agent`, `-n, --dry-run`, `-o, --only`, `-x, --exclude` |
43
94
  | `status` | `st` | One-screen summary + health score | `-v, --verbose` |
44
- | `watch` | — | Background daemon for continuous sync | `-i, --interval <min>` |
95
+ | `watch` | — | Pull-only background daemon for continuous cloud sync | `-i, --interval <min>` |
45
96
  | `doctor` | — | Diagnose + auto-fix everything | `--key-export`, `--key-rotate`, `--setup` |
46
97
  | `memory` | — | Browse/copy memories between agents | `list`, `show`, `copy`, `broadcast` |
47
98
  | `env` | — | Multi-environment management | `list`, `create`, `switch`, `current`, `delete` |
@@ -72,65 +123,33 @@ Agent paths are customizable in `~/.wangchuan/config.json`.
72
123
  - **AES-256-GCM** authenticated encryption — tamper-proof
73
124
  - Key stored locally at `~/.wangchuan/master.key` (never committed)
74
125
  - Ciphertext: `IV(12B) + AuthTag(16B) + CipherText` → Base64 → `.enc`
75
- - Auto-scan for leaked tokens before every sync
76
126
 
77
127
  ### Cross-Agent Sharing
78
128
  - Skills, MCP configs, and custom sub-agents auto-distributed to all agents
79
- - Custom agents in `agents/` directories synced across Claude/Cursor/CodeBuddy/WorkBuddy via `shared/agents/`
129
+ - MCP configs merged into one shared cloud file (`shared/mcp/mcpServers.json.enc`)
80
130
  - Delete propagation — removed from all agents → pruned from repo
81
- - Existing entries preserved (no overwrite)
82
-
83
- ### Snapshot Rollback
84
- - `wangchuan snapshot save [name]` — save a named snapshot before risky changes
85
- - `wangchuan snapshot list` — view all saved snapshots
86
- - `wangchuan snapshot restore <name>` — roll back to a previous snapshot
87
- - `wangchuan snapshot delete <name>` — remove a snapshot
88
-
89
- ### Custom Agent Registration
90
- - Define custom agents in `config.json` via `customAgents` field — no recompilation needed
91
- - Custom agents participate in sync just like built-in agents
92
131
 
93
- ### Extended Conflict Resolution
94
- - Three-way merge now supports `.json`, `.yaml`, `.yml` files in addition to `.md`/`.txt`
132
+ ### Three-Way Merge
133
+ - Automatic conflict resolution for `.md`, `.txt`, `.json`, `.yaml`, `.yml` files
134
+ - Non-overlapping edits → auto-merged silently
135
+ - Overlapping conflicts → conflict markers written for user resolution
136
+ - Watch daemon records unresolvable conflicts to `pending-conflicts.json` for next interactive session
95
137
 
96
138
  ### Multi-Environment
97
139
  - Create isolated environments: `wangchuan env create work`
98
140
  - Switch instantly: `wangchuan env switch work`
99
- - Each environment has its own agent configs
100
-
101
- ### Watch Daemon
102
- - `wangchuan watch` runs continuous background sync
103
- - Configurable interval: `wangchuan watch -i 10`
104
- - PID singleton — only one instance per machine
105
-
106
- ### Memory Browsing
107
- - `wangchuan memory list` — overview of all agent memories
108
- - `wangchuan memory show <agent>` — list all files; fuzzy/substring matching with suggestions on mismatch
109
- - `wangchuan memory copy openclaw claude` — transfer memories
110
- - `wangchuan memory broadcast claude` — share to all agents
111
-
112
- ### Doctor
113
- - Auto-discovers installed agents
114
- - Detects stale/phantom files
115
- - `--key-export` / `--key-rotate` for key management
116
- - `--setup` generates a migration one-liner for new machines
117
-
118
- ---
119
-
120
- ## Supported Git Hosting
121
-
122
- Wangchuan works with **any Git hosting** that supports SSH or HTTPS:
141
+ - Git-branch-level isolation; shared local workspace with leakage detection
123
142
 
124
- | Platform | Example Repo URL |
125
- |----------|-----------------|
126
- | **GitHub** | `git@github.com:you/brain.git` |
127
- | **GitLab** | `git@gitlab.com:you/brain.git` |
128
- | **Gitee** | `git@gitee.com:you/brain.git` |
129
- | **Bitbucket** | `git@bitbucket.org:you/brain.git` |
130
- | **Gitea** | `git@gitea.example.com:you/brain.git` |
131
- | **Self-hosted** | Any SSH/HTTPS Git URL |
143
+ ### Watch Daemon (Pull-Only)
144
+ - `wangchuan watch` continuously pulls cloud changes in the background
145
+ - Does **not** push — users must `wangchuan sync` to push manually
146
+ - Auto-started by the skill after every interaction
147
+ - Restarts automatically on environment switch
132
148
 
133
- > **Tip**: If GitHub CLI (`gh`) is installed and authenticated, `wangchuan init` offers one-command repo creation. For other platforms, create a private repo first, then pass its URL to `wangchuan init --repo <url>`.
149
+ ### Snapshot Rollback
150
+ - Auto-snapshots before every sync (safety net)
151
+ - Named snapshots: `wangchuan snapshot save before-refactor`
152
+ - Restore: `wangchuan snapshot restore <name>` (auto-pushes to cloud)
134
153
 
135
154
  ---
136
155
 
@@ -147,7 +166,7 @@ Wangchuan works with **any Git hosting** that supports SSH or HTTPS:
147
166
  | **Gitea** | `git@gitea.example.com:you/brain.git` |
148
167
  | **Self-hosted** | Any SSH/HTTPS Git URL |
149
168
 
150
- > **Tip**: If GitHub CLI (`gh`) is installed and authenticated, `wangchuan init` offers one-command repo creation. For other platforms, create a private repo first, then pass its URL to `wangchuan init --repo <url>`.
169
+ > **Tip**: If GitHub CLI (`gh`) is installed, `wangchuan init` offers one-command repo creation.
151
170
 
152
171
  ---
153
172
 
@@ -157,7 +176,7 @@ Config at `~/.wangchuan/config.json`:
157
176
 
158
177
  ```jsonc
159
178
  {
160
- "repo": "git@github.com:you/brain.git", // or any Git hosting URL // or any Git hosting URL
179
+ "repo": "git@github.com:you/brain.git",
161
180
  "branch": "main",
162
181
  "localRepoPath": "~/.wangchuan/repo",
163
182
  "keyPath": "~/.wangchuan/master.key",
@@ -181,10 +200,10 @@ Config at `~/.wangchuan/config.json`:
181
200
 
182
201
  ## Security
183
202
 
184
- 1. `master.key` is in `.gitignore` — never accidentally committed
185
- 2. Auto-scan for plaintext tokens (`api_key`, `sk-xxx`, `password`) before sync
203
+ 1. `master.key` is in `.gitignore` — never committed
204
+ 2. Auto-scan for plaintext tokens before sync
186
205
  3. Transfer keys via encrypted channels only
187
- 4. ⚠️ **Losing `master.key` means losing access to all encrypted history — back it up!**
206
+ 4. ⚠️ **Losing `master.key` = losing all encrypted history — back it up!**
188
207
 
189
208
  ---
190
209
 
package/README.zh-CN.md CHANGED
@@ -8,28 +8,79 @@
8
8
 
9
9
  > 忘川是中国神话中冥界的遗忘之河，亡魂渡河饮水即忘前世一切记忆。 而 **忘川** 让你的 AI 智能体记忆在环境切换时永不遗失。
10
10
 
11
- 忘川加密同步你所有 AI 智能体的配置、记忆和技能，跨机器、跨环境无缝迁移——换电脑、切环境，一条命令恢复全部 Agent 状态。
11
+ **忘川是一个 AI 智能体技能。** 安装一次，任何 AI 智能体（OpenClaw、Claude、Gemini、Codex……）都能跨机器同步配置、记忆、技能和 MCP 服务 —— 加密、版本化、冲突感知。
12
12
 
13
13
  ---
14
14
 
15
- ## 快速开始
15
+ ## 为什么是技能？
16
+
17
+ 今天的 AI 智能体运行在孤立的环境里。换台电脑、重置容器、拿到新笔记本，每个 Agent 都要从零开始 —— 没记忆、没技能、没 MCP 配置。
18
+
19
+ 忘川的解法是**融入 Agent 的大脑**：
20
+
21
+ ```
22
+ 用户: "初始化忘川"
23
+ Agent: (安装 CLI, 询问仓库地址, 自动探测本地全部 Agent,
24
+ 全量同步到云端, 启动后台拉取守护)
25
+
26
+ 用户: "新增 xxx 技能"
27
+ Agent: (创建技能, 询问分发到哪些 Agent,
28
+ 复制到选中的 Agent, 推送到云端)
29
+
30
+ 用户: "切换到 work 环境"
31
+ Agent: (同步当前变更, 切换分支, 拉取 work 环境数据,
32
+ 检查冲突, 重启后台守护)
33
+ ```
34
+
35
+ **Agent 负责一切。** 你只需要对话。技能文件（`skill/SKILL.md`）教会 Agent 如何管理你的记忆 —— 不需要手动敲 CLI。
36
+
37
+ ### 技能架构
38
+
39
+ ```
40
+ skill/
41
+ ├── SKILL.md ← Agent 加载此文件（~100 行，路由表）
42
+ ├── references/
43
+ │ ├── resource-crud.md ← 技能/Agent/MCP/记忆 增删改查
44
+ │ ├── sync-conflict.md ← 推送/拉取/冲突解决
45
+ │ ├── environment.md ← 环境管理、回退、快照
46
+ │ ├── inspect-status.md ← 资源查看、健康诊断
47
+ │ └── install-setup.md ← 初始化、密钥管理
48
+ └── wangchuan-skill.sh ← OpenClaw Shell 包装器
49
+ ```
50
+
51
+ 主文件 SKILL.md 控制在 120 行以内。Agent 遇到具体任务（如"删除技能"）时，按需加载对应的参考文件 —— 渐进式加载，不是一股脑灌 prompt。
52
+
53
+ ### 技能基准测试
54
+
55
+ 每次技能变更都经过 **51 个测试用例**（`test/skill-benchmark.md`）验证：
56
+
57
+ - 29 条用户指令（初始化、4 种资源的增删改查、推送/拉取、回退、环境管理）
58
+ - 4 个环境隔离场景（跨环境拉取、工作空间泄漏、恢复时环境选择、watch 重启）
59
+ - 全局规则（watch 自动启动、环境感知同步、非 TTY 约束）
60
+
61
+ ### 安装技能
16
62
 
17
63
  ```bash
64
+ # 安装 CLI
18
65
  npm install -g wangchuan
19
66
 
20
- # 1. 初始化 — 自动检测已安装的智能体并执行首次同步
21
- wangchuan init
22
-
23
- # 2. 启动后台守护进程（可选）
24
- wangchuan watch
67
+ # 首次同步后技能自动分发到所有 Agent
68
+ # 或手动复制到某个 Agent：
69
+ cp -r skill/ ~/.claude/skills/wangchuan/
25
70
  ```
26
71
 
27
- 在新机器上：
72
+ ---
73
+
74
+ ## 快速开始
28
75
 
29
76
  ```bash
77
+ npm install -g wangchuan
78
+
79
+ # 初始化 — 自动检测已安装的智能体并执行首次同步
80
+ wangchuan init
81
+
82
+ # 在新机器上（支持任意 Git 托管）：
30
83
  wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
31
- # 也支持 GitLab、Gitee、Bitbucket、Gitea 等任意 Git 托管：
32
- # wangchuan init --repo git@gitlab.com:you/brain.git --key wangchuan_<hex>
33
84
  ```
34
85
 
35
86
  ---
@@ -41,7 +92,7 @@ wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
41
92
  | `init` | — | 首次初始化 — 自动检测智能体，支持一键创建仓库（GitHub CLI），执行首次同步 | `--repo`、`--key`、`--force` |
42
93
  | `sync` | `s` | 智能双向同步 — 日常唯一命令 | `-a, --agent`、`-n, --dry-run`、`-o, --only`、`-x, --exclude` |
43
94
  | `status` | `st` | 一屏总览 + 健康评分 | `-v, --verbose` |
44
- | `watch` | — | 后台守护进程，持续自动同步 | `-i, --interval <分钟>` |
95
+ | `watch` | — | 仅拉取的后台守护进程，持续同步云端变更 | `-i, --interval <分钟>` |
45
96
  | `doctor` | — | 诊断 + 自动修复所有问题 | `--key-export`、`--key-rotate`、`--setup` |
46
97
  | `memory` | — | 浏览/复制智能体记忆 | `list`、`show`、`copy`、`broadcast` |
47
98
  | `env` | — | 多环境管理 | `list`、`create`、`switch`、`current`、`delete` |
@@ -72,65 +123,33 @@ wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
72
123
  - **AES-256-GCM** 认证加密 — 防篡改
73
124
  - 密钥存储在本地 `~/.wangchuan/master.key`（永不提交）
74
125
  - 密文格式：`IV(12B) + AuthTag(16B) + CipherText` → Base64 → `.enc`
75
- - 每次同步前自动扫描泄露的 token
76
126
 
77
127
  ### 跨智能体共享
78
- - Skills、MCP 配置和自定义子智能体自动分发到所有智能体
79
- - `agents/` 目录中的自定义子智能体通过 `shared/agents/` 在 Claude/Cursor/CodeBuddy/WorkBuddy 间同步
128
+ - 技能、MCP 配置和自定义子智能体自动分发到所有智能体
129
+ - MCP 配置合并为一份共享云端文件（`shared/mcp/mcpServers.json.enc`）
80
130
  - 删除传播 — 所有智能体都删除后自动从仓库清理
81
- - 已有条目不会被覆盖
82
-
83
- ### 快照回滚
84
- - `wangchuan snapshot save [name]` — 在危险操作前保存命名快照
85
- - `wangchuan snapshot list` — 查看所有已保存的快照
86
- - `wangchuan snapshot restore <name>` — 回滚到指定快照
87
- - `wangchuan snapshot delete <name>` — 删除快照
88
-
89
- ### 自定义智能体注册
90
- - 在 `config.json` 中通过 `customAgents` 字段定义自定义智能体，无需重新编译
91
- - 自定义智能体与内置智能体一样参与同步
92
131
 
93
- ### 扩展冲突解决
94
- - 三方合并现在支持 `.json`、`.yaml`、`.yml` 文件（除 `.md`/`.txt` 外）
132
+ ### 三路合并
133
+ - 自动冲突解决，支持 `.md`、`.txt`、`.json`、`.yaml`、`.yml`
134
+ - 不重叠编辑 → 静默合并
135
+ - 重叠冲突 → 写入冲突标记供用户解决
136
+ - Watch 守护记录无法自动解决的冲突到 `pending-conflicts.json`，下次交互时提示
95
137
 
96
138
  ### 多环境管理
97
139
  - 创建隔离环境：`wangchuan env create work`
98
140
  - 即时切换：`wangchuan env switch work`
99
- - 每个环境拥有独立的智能体配置
100
-
101
- ### Watch 守护进程
102
- - `wangchuan watch` 持续后台同步
103
- - 可配置间隔：`wangchuan watch -i 10`
104
- - PID 单例 — 每台机器只运行一个实例
105
-
106
- ### 记忆浏览
107
- - `wangchuan memory list` — 查看所有智能体记忆概览
108
- - `wangchuan memory show <agent>` — 列出所有文件；支持模糊/子串匹配，不匹配时给出建议
109
- - `wangchuan memory copy openclaw claude` — 在智能体间传输记忆
110
- - `wangchuan memory broadcast claude` — 将记忆广播到所有智能体
111
-
112
- ### 诊断修复
113
- - 自动发现已安装的智能体
114
- - 检测残留/幻影文件
115
- - `--key-export` / `--key-rotate` 密钥管理
116
- - `--setup` 生成新机器迁移命令
117
-
118
- ---
119
-
120
- ## 支持的 Git 托管
121
-
122
- 忘川支持**任意 Git 托管**，只要支持 SSH 或 HTTPS 协议：
141
+ - Git 分支级隔离；共享本地工作空间，自动检测泄漏
123
142
 
124
- | 平台 | 仓库地址示例 |
125
- |------|------------|
126
- | **GitHub** | `git@github.com:you/brain.git` |
127
- | **GitLab** | `git@gitlab.com:you/brain.git` |
128
- | **Gitee（码云）** | `git@gitee.com:you/brain.git` |
129
- | **Bitbucket** | `git@bitbucket.org:you/brain.git` |
130
- | **Gitea** | `git@gitea.example.com:you/brain.git` |
131
- | **自建服务** | 任意 SSH/HTTPS Git 地址 |
143
+ ### Watch 守护进程（仅拉取）
144
+ - `wangchuan watch` 持续在后台拉取云端变更
145
+ - **不会推送** — 用户需手动 `wangchuan sync` 推送
146
+ - 技能每次交互后自动启动
147
+ - 环境切换时自动重启
132
148
 
133
- > **提示**：已安装 GitHub CLI（`gh`）时，`wangchuan init` 可一键创建私有仓库。其他平台请先创建私有仓库，然后 `wangchuan init --repo <url>` 传入地址即可。
149
+ ### 快照回滚
150
+ - 每次同步前自动创建快照（安全网）
151
+ - 命名快照：`wangchuan snapshot save before-refactor`
152
+ - 恢复：`wangchuan snapshot restore <name>`（自动推送到云端）
134
153
 
135
154
  ---
136
155
 
@@ -147,7 +166,7 @@ wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
147
166
  | **Gitea** | `git@gitea.example.com:you/brain.git` |
148
167
  | **自建服务** | 任意 SSH/HTTPS Git 地址 |
149
168
 
150
- > **提示**：已安装 GitHub CLI（`gh`）时，`wangchuan init` 可一键创建私有仓库。其他平台请先创建私有仓库，然后 `wangchuan init --repo <url>` 传入地址即可。
169
+ > **提示**：已安装 GitHub CLI（`gh`）时，`wangchuan init` 可一键创建私有仓库。
151
170
 
152
171
  ---
153
172
 
@@ -157,7 +176,7 @@ wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
157
176
 
158
177
  ```jsonc
159
178
  {
160
- "repo": "git@github.com:you/brain.git", // 或任意 Git 托管地址 // 或任意 Git 托管地址
179
+ "repo": "git@github.com:you/brain.git",
161
180
  "branch": "main",
162
181
  "localRepoPath": "~/.wangchuan/repo",
163
182
  "keyPath": "~/.wangchuan/master.key",
@@ -182,7 +201,7 @@ wangchuan init --repo git@github.com:you/brain.git --key wangchuan_<hex>
182
201
  ## 安全规范
183
202
 
184
203
  1. `master.key` 已加入 `.gitignore`，不会意外提交
185
- 2. 同步前自动扫描明文 token（`api_key`、`sk-xxx`、`password` 等）
204
+ 2. 同步前自动扫描明文 token
186
205
  3. 迁移密钥请用加密方式传输
187
206
  4. ⚠️ **master.key 丢失将无法解密历史配置，请做好备份！**
188
207
 
package/dist/bin/wangchuan.js CHANGED
@@ -45,7 +45,7 @@ const program = new Command();
45
45
  program
46
46
  .name('wangchuan')
47
47
  .description(t('cli.description'))
48
- .version('5.7.1');
48
+ .version('5.8.0');
49
49
  // ── init ────────────────────────────────────────────────────────
50
50
  program
51
51
  .command('init')
package/dist/src/commands/sync.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkBH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAiB,MAAM,aAAa,CAAC;AAmCxG,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,GAAG;QAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC;CACvG;AAED,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAqE7H"}
1
+ {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkBH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAiB,MAAM,aAAa,CAAC;AAmCxG,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,GAAG;QAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC;CACvG;AAED,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAoF7H"}
package/dist/src/commands/sync.js CHANGED
@@ -77,6 +77,22 @@ export async function cmdSync({ agent, dryRun, only, exclude, yes, skipShared }
77
77
  const { processPendingDistributions } = await import('../core/sync.js');
78
78
  await processPendingDistributions(cfg, yes);
79
79
  }
80
+ // ── Check for pending conflicts from watch daemon ──────────────
81
+ if (!skipShared && (process.stdin.isTTY || yes)) {
82
+ const { loadPendingConflicts, clearPendingConflicts } = await import('./watch.js');
83
+ const conflicts = loadPendingConflicts();
84
+ if (conflicts.length > 0) {
85
+ logger.warn(t('sync.pendingConflicts', { count: conflicts.length }));
86
+ for (const c of conflicts) {
87
+ logger.warn(` ${c.file} (${t('sync.pendingConflictDetectedAt', { time: c.detectedAt })})`);
88
+ if (c.localSnippet)
89
+ logger.info(` ${t('sync.pendingConflictLocal')}: ${c.localSnippet.slice(0, 80)}…`);
90
+ if (c.remoteSnippet)
91
+ logger.info(` ${t('sync.pendingConflictRemote')}: ${c.remoteSnippet.slice(0, 80)}…`);
92
+ }
93
+ clearPendingConflicts();
94
+ }
95
+ }
80
96
  // ── Check for pending deletions from previous non-interactive sync ──
81
97
  if (!skipShared && (process.stdin.isTTY || yes)) {
82
98
  const { loadPendingDeletions, clearPendingDeletions } = await import('../core/sync.js');
package/dist/src/commands/sync.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"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"}
package/dist/src/commands/watch.d.ts CHANGED
@@ -1,11 +1,23 @@
1
1
  /**
2
- * watch.ts — wangchuan watch command (long-running daemon)
2
+ * watch.ts — wangchuan watch command (pull-only daemon)
3
3
  *
4
- * Monitors enabled agents' workspace directories for file changes.
5
- * Debounces changes then auto-triggers sync. Also periodically polls
6
- * remote for new commits.
4
+ * Periodically polls the remote for new commits and pulls changes
5
+ * to local agent workspaces. Does NOT push local changes — users
6
+ * must run `wangchuan sync` manually to push.
7
+ *
8
+ * Conflicts that cannot be auto-merged are recorded to
9
+ * ~/.wangchuan/pending-conflicts.json for the next interactive session.
7
10
  */
8
11
  import type { WatchOptions } from '../types.js';
12
+ export interface PendingConflict {
13
+ readonly file: string;
14
+ readonly detectedAt: string;
15
+ readonly localSnippet: string;
16
+ readonly remoteSnippet: string;
17
+ }
18
+ export declare function savePendingConflicts(conflicts: readonly PendingConflict[]): void;
19
+ export declare function loadPendingConflicts(): PendingConflict[];
20
+ export declare function clearPendingConflicts(): void;
9
21
  /** Check if watch daemon is running (reads PID file + checks process) */
10
22
  export declare function isWatchRunning(): boolean;
11
23
  /** Return the PID of the running watch daemon, or null if not running */
package/dist/src/commands/watch.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/commands/watch.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAcH,OAAO,KAAK,EAAE,YAAY,EAA8B,MAAM,aAAa,CAAC;AA6C5E,yEAAyE;AACzE,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,yEAAyE;AACzE,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAY3C;AAED,wBAAsB,QAAQ,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyGpF"}
1
+ {"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/commands/watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAaH,OAAO,KAAK,EAAE,YAAY,EAA8B,MAAM,aAAa,CAAC;AAS5E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,GAAG,IAAI,CAQhF;AAED,wBAAgB,oBAAoB,IAAI,eAAe,EAAE,CAKxD;AAED,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAaD,yEAAyE;AACzE,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,yEAAyE;AACzE,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAY3C;AAMD,wBAAsB,QAAQ,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmFpF"}