wangchuan 1.0.2 → 2.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/.wangchuan/config.example.json +44 -19
- package/README.md +145 -91
- package/dist/bin/wangchuan.js +9 -0
- package/dist/bin/wangchuan.js.map +1 -1
- package/dist/src/commands/diff.d.ts.map +1 -1
- package/dist/src/commands/diff.js +3 -1
- package/dist/src/commands/diff.js.map +1 -1
- package/dist/src/commands/dump.d.ts +9 -0
- package/dist/src/commands/dump.d.ts.map +1 -0
- package/dist/src/commands/dump.js +68 -0
- package/dist/src/commands/dump.js.map +1 -0
- package/dist/src/commands/list.d.ts +1 -1
- package/dist/src/commands/list.d.ts.map +1 -1
- package/dist/src/commands/list.js +26 -12
- package/dist/src/commands/list.js.map +1 -1
- package/dist/src/commands/pull.d.ts.map +1 -1
- package/dist/src/commands/pull.js +11 -1
- package/dist/src/commands/pull.js.map +1 -1
- package/dist/src/commands/push.d.ts.map +1 -1
- package/dist/src/commands/push.js +13 -5
- package/dist/src/commands/push.js.map +1 -1
- package/dist/src/commands/status.d.ts.map +1 -1
- package/dist/src/commands/status.js +5 -2
- package/dist/src/commands/status.js.map +1 -1
- package/dist/src/core/config.d.ts +8 -1
- package/dist/src/core/config.d.ts.map +1 -1
- package/dist/src/core/config.js +54 -15
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/json-field.d.ts +17 -0
- package/dist/src/core/json-field.d.ts.map +1 -0
- package/dist/src/core/json-field.js +21 -0
- package/dist/src/core/json-field.js.map +1 -0
- package/dist/src/core/migrate.d.ts +22 -0
- package/dist/src/core/migrate.d.ts.map +1 -0
- package/dist/src/core/migrate.js +183 -0
- package/dist/src/core/migrate.js.map +1 -0
- package/dist/src/core/sync.d.ts +7 -0
- package/dist/src/core/sync.d.ts.map +1 -1
- package/dist/src/core/sync.js +423 -68
- package/dist/src/core/sync.js.map +1 -1
- package/dist/src/types.d.ts +62 -17
- package/dist/src/types.d.ts.map +1 -1
- package/dist/test/json-field.test.d.ts +5 -0
- package/dist/test/json-field.test.d.ts.map +1 -0
- package/dist/test/json-field.test.js +71 -0
- package/dist/test/json-field.test.js.map +1 -0
- package/dist/test/sync.test.d.ts +13 -0
- package/dist/test/sync.test.d.ts.map +1 -0
- package/dist/test/sync.test.js +477 -0
- package/dist/test/sync.test.js.map +1 -0
- package/package.json +2 -2
- package/skill/SKILL.md +52 -39
|
@@ -2,44 +2,58 @@
|
|
|
2
2
|
* list.ts — wangchuan list 命令
|
|
3
3
|
*
|
|
4
4
|
* 瞬间列出所有受管配置文件，不做任何 git/IO 操作。
|
|
5
|
-
* 支持 --agent
|
|
5
|
+
* 支持 --agent 过滤，按智能体和共享层分组展示。
|
|
6
6
|
*/
|
|
7
7
|
import fs from 'fs';
|
|
8
8
|
import { config } from '../core/config.js';
|
|
9
|
+
import { ensureMigrated } from '../core/migrate.js';
|
|
9
10
|
import { syncEngine } from '../core/sync.js';
|
|
10
11
|
import { validator } from '../utils/validator.js';
|
|
11
12
|
import { logger } from '../utils/logger.js';
|
|
12
13
|
import chalk from 'chalk';
|
|
13
|
-
const
|
|
14
|
+
const TIER_LABELS = {
|
|
14
15
|
openclaw: 'OpenClaw',
|
|
15
16
|
claude: 'Claude',
|
|
16
17
|
gemini: 'Gemini',
|
|
18
|
+
shared: 'Shared（跨 Agent 共享）',
|
|
17
19
|
};
|
|
18
20
|
export async function cmdList({ agent } = {}) {
|
|
19
21
|
logger.banner('忘川 · 配置清单');
|
|
20
|
-
|
|
22
|
+
let cfg = config.load();
|
|
21
23
|
validator.requireInit(cfg);
|
|
24
|
+
cfg = ensureMigrated(cfg);
|
|
22
25
|
const repoPath = syncEngine.expandHome(cfg.localRepoPath);
|
|
23
|
-
const
|
|
26
|
+
const entries = syncEngine.buildFileEntries(cfg, undefined, agent);
|
|
27
|
+
// 按 agentName 分组
|
|
28
|
+
const groups = new Map();
|
|
29
|
+
for (const e of entries) {
|
|
30
|
+
const tier = e.agentName;
|
|
31
|
+
if (!groups.has(tier))
|
|
32
|
+
groups.set(tier, []);
|
|
33
|
+
groups.get(tier).push(e);
|
|
34
|
+
}
|
|
24
35
|
let totalFiles = 0;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
36
|
+
// 先展示 shared，再展示各 agent
|
|
37
|
+
const order = ['shared', 'openclaw', 'claude', 'gemini'];
|
|
38
|
+
for (const tier of order) {
|
|
39
|
+
const group = groups.get(tier);
|
|
40
|
+
if (!group || group.length === 0)
|
|
28
41
|
continue;
|
|
29
|
-
console.log(chalk.bold.cyan(` ▸ ${
|
|
30
|
-
for (const e of
|
|
42
|
+
console.log(chalk.bold.cyan(` ▸ ${TIER_LABELS[tier]}`));
|
|
43
|
+
for (const e of group) {
|
|
31
44
|
const localExists = fs.existsSync(e.srcAbs);
|
|
32
45
|
const repoExists = fs.existsSync(`${repoPath}/${e.repoRel}`);
|
|
33
46
|
const localMark = localExists ? chalk.green('✔') : chalk.red('✖');
|
|
34
47
|
const repoMark = repoExists ? chalk.green('✔') : chalk.gray('·');
|
|
35
48
|
const encLabel = e.encrypt ? chalk.magenta('[enc]') : ' ';
|
|
36
|
-
|
|
49
|
+
const jsonLabel = e.jsonExtract ? chalk.yellow('[字段]') : ' ';
|
|
50
|
+
console.log(` ${localMark} 本地 ${repoMark} 仓库 ${encLabel} ${jsonLabel} ${chalk.white(e.repoRel)}`);
|
|
37
51
|
console.log(chalk.gray(` └─ ${e.srcAbs}`));
|
|
38
52
|
}
|
|
39
53
|
console.log();
|
|
40
|
-
totalFiles +=
|
|
54
|
+
totalFiles += group.length;
|
|
41
55
|
}
|
|
42
56
|
console.log(chalk.gray(` 共 ${totalFiles} 个配置文件`));
|
|
43
|
-
console.log(chalk.gray(` ✔ = 存在 · =
|
|
57
|
+
console.log(chalk.gray(` ✔ = 存在 · = 仓库中尚无 [enc] = 加密 [字段] = JSON 字段提取`));
|
|
44
58
|
}
|
|
45
59
|
//# sourceMappingURL=list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/list.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI9D,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAwDjF"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* pull.ts — wangchuan pull 命令
|
|
3
3
|
*/
|
|
4
4
|
import { config } from '../core/config.js';
|
|
5
|
+
import { ensureMigrated } from '../core/migrate.js';
|
|
5
6
|
import { gitEngine } from '../core/git.js';
|
|
6
7
|
import { syncEngine } from '../core/sync.js';
|
|
7
8
|
import { validator } from '../utils/validator.js';
|
|
@@ -10,8 +11,9 @@ import chalk from 'chalk';
|
|
|
10
11
|
import ora from 'ora';
|
|
11
12
|
export async function cmdPull({ agent } = {}) {
|
|
12
13
|
logger.banner('忘川 · 拉取配置');
|
|
13
|
-
|
|
14
|
+
let cfg = config.load();
|
|
14
15
|
validator.requireInit(cfg);
|
|
16
|
+
cfg = ensureMigrated(cfg);
|
|
15
17
|
const repoPath = syncEngine.expandHome(cfg.localRepoPath);
|
|
16
18
|
if (agent)
|
|
17
19
|
logger.info(`过滤智能体: ${chalk.cyan(agent)}`);
|
|
@@ -47,6 +49,14 @@ export async function cmdPull({ agent } = {}) {
|
|
|
47
49
|
if (result.skipped.length > 0) {
|
|
48
50
|
logger.info(`\n跳过（仓库中不存在）: ${result.skipped.length} 个文件`);
|
|
49
51
|
}
|
|
52
|
+
if (result.localOnly.length > 0) {
|
|
53
|
+
console.log();
|
|
54
|
+
logger.warn(`检测到 ${result.localOnly.length} 个本地文件在云端不存在：`);
|
|
55
|
+
for (const f of result.localOnly) {
|
|
56
|
+
logger.warn(` ${chalk.yellow(f)}`);
|
|
57
|
+
}
|
|
58
|
+
logger.info('如需同步到云端，请执行 wangchuan push');
|
|
59
|
+
}
|
|
50
60
|
logger.ok(`\n共同步 ${result.synced.length} 个文件（含 ${result.decrypted.length} 个加密文件，${result.conflicts.length} 个冲突）`);
|
|
51
61
|
return result;
|
|
52
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1E,MAAM,WAAW,iBAAkB,SAAQ,YAAY;IACrD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;CACpC;AAED,wBAAsB,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmE9F"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import os from 'os';
|
|
5
5
|
import { config } from '../core/config.js';
|
|
6
|
+
import { ensureMigrated } from '../core/migrate.js';
|
|
6
7
|
import { gitEngine } from '../core/git.js';
|
|
7
8
|
import { syncEngine } from '../core/sync.js';
|
|
8
9
|
import { validator } from '../utils/validator.js';
|
|
@@ -11,16 +12,17 @@ import chalk from 'chalk';
|
|
|
11
12
|
import ora from 'ora';
|
|
12
13
|
export async function cmdPush({ message, agent } = {}) {
|
|
13
14
|
logger.banner('忘川 · 推送配置');
|
|
14
|
-
|
|
15
|
+
let cfg = config.load();
|
|
15
16
|
validator.requireInit(cfg);
|
|
17
|
+
cfg = ensureMigrated(cfg);
|
|
16
18
|
const repoPath = syncEngine.expandHome(cfg.localRepoPath);
|
|
17
19
|
const hostname = cfg.hostname || os.hostname();
|
|
18
20
|
if (agent)
|
|
19
21
|
logger.info(`过滤智能体: ${chalk.cyan(agent)}`);
|
|
20
22
|
const agentTag = agent ? `[${agent}]` : '';
|
|
21
23
|
const msg = message
|
|
22
|
-
? `sync: ${message} ${agentTag}[${hostname}]`.trimEnd()
|
|
23
|
-
: `sync: update configs ${agentTag}[${hostname}]`.trimEnd();
|
|
24
|
+
? `sync: ${message} / update ${agentTag}[${hostname}]`.trimEnd()
|
|
25
|
+
: `sync: 更新配置 / update configs ${agentTag}[${hostname}]`.trimEnd();
|
|
24
26
|
// ── 1. 工作区 → 仓库目录 ────────────────────────────────────
|
|
25
27
|
let spinner = ora('加密并准备配置文件 …').start();
|
|
26
28
|
let stageResult;
|
|
@@ -32,7 +34,7 @@ export async function cmdPush({ message, agent } = {}) {
|
|
|
32
34
|
spinner.fail('暂存文件失败');
|
|
33
35
|
throw new Error(`准备文件失败: ${err.message}`);
|
|
34
36
|
}
|
|
35
|
-
if (stageResult.synced.length === 0) {
|
|
37
|
+
if (stageResult.synced.length === 0 && stageResult.deleted.length === 0) {
|
|
36
38
|
logger.info('没有找到任何可同步的文件，请检查工作区路径是否正确');
|
|
37
39
|
return { committed: false, pushed: false };
|
|
38
40
|
}
|
|
@@ -65,7 +67,13 @@ export async function cmdPush({ message, agent } = {}) {
|
|
|
65
67
|
const label = stageResult.encrypted.includes(f) ? chalk.gray('[已加密]') : '';
|
|
66
68
|
logger.ok(` ${chalk.green(f)} ${label}`);
|
|
67
69
|
}
|
|
68
|
-
|
|
70
|
+
for (const f of stageResult.deleted) {
|
|
71
|
+
logger.info(` ${chalk.red('✕ ' + f)} ${chalk.gray('[已清理]')}`);
|
|
72
|
+
}
|
|
73
|
+
const delTag = stageResult.deleted.length > 0
|
|
74
|
+
? `，清理 ${stageResult.deleted.length} 个过期文件`
|
|
75
|
+
: '';
|
|
76
|
+
logger.ok(`\n推送完成：${stageResult.synced.length} 个文件${delTag}，commit: ${pushResult.sha ?? '-'}`);
|
|
69
77
|
}
|
|
70
78
|
return { ...pushResult, stageResult };
|
|
71
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/status.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/status.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,wBAAsB,SAAS,CAAC,EAAE,KAAK,EAAE,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoF5E"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
import { config } from '../core/config.js';
|
|
6
|
+
import { ensureMigrated } from '../core/migrate.js';
|
|
6
7
|
import { gitEngine } from '../core/git.js';
|
|
7
8
|
import { syncEngine } from '../core/sync.js';
|
|
8
9
|
import { validator } from '../utils/validator.js';
|
|
@@ -10,8 +11,9 @@ import { logger } from '../utils/logger.js';
|
|
|
10
11
|
import chalk from 'chalk';
|
|
11
12
|
export async function cmdStatus({ agent } = {}) {
|
|
12
13
|
logger.banner('忘川 · 同步状态');
|
|
13
|
-
|
|
14
|
+
let cfg = config.load();
|
|
14
15
|
validator.requireInit(cfg);
|
|
16
|
+
cfg = ensureMigrated(cfg);
|
|
15
17
|
const repoPath = syncEngine.expandHome(cfg.localRepoPath);
|
|
16
18
|
console.log(chalk.bold(' 仓库地址：') + chalk.cyan(cfg.repo));
|
|
17
19
|
console.log(chalk.bold(' 本地路径：') + repoPath);
|
|
@@ -80,7 +82,8 @@ export async function cmdStatus({ agent } = {}) {
|
|
|
80
82
|
for (const e of entries) {
|
|
81
83
|
const mark = fs.existsSync(e.srcAbs) ? chalk.green('✔') : chalk.red('✖');
|
|
82
84
|
const encLabel = e.encrypt ? chalk.gray('[enc]') : '';
|
|
83
|
-
|
|
85
|
+
const jfLabel = e.jsonExtract ? chalk.blue('[字段]') : '';
|
|
86
|
+
console.log(` ${mark} ${e.repoRel} ${encLabel}${jfLabel}`);
|
|
84
87
|
}
|
|
85
88
|
}
|
|
86
89
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/status.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* 配置文件：~/.wangchuan/config.json
|
|
5
5
|
* 密钥文件：~/.wangchuan/master.key
|
|
6
6
|
*/
|
|
7
|
-
import type { WangchuanConfig } from '../types.js';
|
|
7
|
+
import type { WangchuanConfig, AgentProfiles, SharedConfig } from '../types.js';
|
|
8
|
+
export declare const CONFIG_VERSION = 2;
|
|
8
9
|
export declare const config: {
|
|
9
10
|
/** 读取配置，不存在时返回 null */
|
|
10
11
|
readonly load: () => WangchuanConfig | null;
|
|
@@ -16,6 +17,12 @@ export declare const config: {
|
|
|
16
17
|
readonly initialize: (repo: string) => Promise<WangchuanConfig>;
|
|
17
18
|
/** 浅合并两个配置（override 优先） */
|
|
18
19
|
readonly merge: (base: WangchuanConfig, override: Partial<WangchuanConfig>) => WangchuanConfig;
|
|
20
|
+
/** 默认配置（迁移时使用） */
|
|
21
|
+
readonly defaults: {
|
|
22
|
+
readonly profiles: AgentProfiles;
|
|
23
|
+
readonly shared: SharedConfig;
|
|
24
|
+
readonly version: 2;
|
|
25
|
+
};
|
|
19
26
|
/** 常用路径常量 */
|
|
20
27
|
readonly paths: {
|
|
21
28
|
readonly dir: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOhF,eAAO,MAAM,cAAc,IAAI,CAAC;AAoEhC,eAAO,MAAM,MAAM;IACjB,uBAAuB;yBACf,eAAe,GAAG,IAAI;IAU9B,cAAc;yBACJ,eAAe,KAAG,IAAI;IAMhC,kBAAkB;yCACc,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;IAaxD,2BAA2B;gCACJ,MAAM,KAAG,OAAO,CAAC,eAAe,CAAC;IAiBxD,2BAA2B;2BACf,eAAe,YAAY,OAAO,CAAC,eAAe,CAAC,KAAG,eAAe;IAIjF,kBAAkB;;;;;;IAOlB,aAAa;;;;;;;CAOL,CAAC"}
|
package/dist/src/core/config.js
CHANGED
|
@@ -13,7 +13,8 @@ const WANGCHUAN_DIR = path.join(os.homedir(), '.wangchuan');
|
|
|
13
13
|
const CONFIG_PATH = path.join(WANGCHUAN_DIR, 'config.json');
|
|
14
14
|
const KEY_PATH = path.join(WANGCHUAN_DIR, 'master.key');
|
|
15
15
|
const EXAMPLE_PATH = fileURLToPath(new URL('../../.wangchuan/config.example.json', import.meta.url));
|
|
16
|
-
|
|
16
|
+
export const CONFIG_VERSION = 2;
|
|
17
|
+
/** 默认配置骨架 v2 — 细粒度同步 */
|
|
17
18
|
const DEFAULT_PROFILES = {
|
|
18
19
|
openclaw: {
|
|
19
20
|
enabled: true,
|
|
@@ -22,31 +23,61 @@ const DEFAULT_PROFILES = {
|
|
|
22
23
|
{ src: 'MEMORY.md', encrypt: true },
|
|
23
24
|
{ src: 'AGENTS.md', encrypt: false },
|
|
24
25
|
{ src: 'SOUL.md', encrypt: false },
|
|
25
|
-
{ src: 'USER.md', encrypt: true },
|
|
26
|
-
{ src: 'TOOLS.md', encrypt: false },
|
|
27
|
-
{ src: 'config/mcporter.json', encrypt: true },
|
|
28
|
-
],
|
|
29
|
-
syncDirs: [
|
|
30
|
-
{ src: 'skills/', encrypt: false },
|
|
31
26
|
],
|
|
27
|
+
// skills/ 移至 shared tier
|
|
28
|
+
// USER.md（空模板）、TOOLS.md（环境特有）、config/mcporter.json（移至 shared MCP）已移除
|
|
32
29
|
},
|
|
33
30
|
claude: {
|
|
34
31
|
enabled: true,
|
|
35
|
-
workspacePath: path.join(os.homedir(), '.claude'),
|
|
32
|
+
workspacePath: path.join(os.homedir(), '.claude-internal'),
|
|
36
33
|
syncFiles: [
|
|
37
|
-
{ src: '.
|
|
34
|
+
{ src: 'CLAUDE.md', encrypt: false },
|
|
35
|
+
{ src: 'settings.json', encrypt: true },
|
|
36
|
+
],
|
|
37
|
+
// .claude.json 整文件不再同步，改用 jsonFields 提取 mcpServers
|
|
38
|
+
jsonFields: [
|
|
39
|
+
{
|
|
40
|
+
src: '.claude.json',
|
|
41
|
+
fields: ['mcpServers'],
|
|
42
|
+
repoName: 'mcpServers.json',
|
|
43
|
+
encrypt: true,
|
|
44
|
+
},
|
|
38
45
|
],
|
|
39
46
|
},
|
|
40
47
|
gemini: {
|
|
41
48
|
enabled: true,
|
|
42
49
|
workspacePath: path.join(os.homedir(), '.gemini'),
|
|
43
|
-
syncFiles: [
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
50
|
+
syncFiles: [],
|
|
51
|
+
// projects.json 和 trustedFolders.json 是环境特有路径，不再同步
|
|
52
|
+
// settings.internal.json 改用 jsonFields 仅提取有用字段
|
|
53
|
+
jsonFields: [
|
|
54
|
+
{
|
|
55
|
+
src: 'settings.internal.json',
|
|
56
|
+
fields: ['security', 'model'],
|
|
57
|
+
repoName: 'settings-sync.json',
|
|
58
|
+
encrypt: true,
|
|
59
|
+
},
|
|
47
60
|
],
|
|
48
61
|
},
|
|
49
62
|
};
|
|
63
|
+
/** 共享层默认配置 */
|
|
64
|
+
const DEFAULT_SHARED = {
|
|
65
|
+
skills: {
|
|
66
|
+
sources: [
|
|
67
|
+
{ agent: 'claude', dir: 'skills/' },
|
|
68
|
+
{ agent: 'openclaw', dir: 'skills/' },
|
|
69
|
+
],
|
|
70
|
+
},
|
|
71
|
+
mcp: {
|
|
72
|
+
sources: [
|
|
73
|
+
{ agent: 'claude', src: '.claude.json', field: 'mcpServers' },
|
|
74
|
+
{ agent: 'openclaw', src: 'config/mcporter.json', field: 'mcpServers' },
|
|
75
|
+
],
|
|
76
|
+
},
|
|
77
|
+
syncFiles: [
|
|
78
|
+
{ src: 'memory/SHARED.md', workspacePath: '~/.openclaw/workspace', encrypt: true },
|
|
79
|
+
],
|
|
80
|
+
};
|
|
50
81
|
export const config = {
|
|
51
82
|
/** 读取配置，不存在时返回 null */
|
|
52
83
|
load() {
|
|
@@ -74,10 +105,10 @@ export const config = {
|
|
|
74
105
|
encoding: 'utf-8'
|
|
75
106
|
});
|
|
76
107
|
const match = result.match(/ref: refs\/heads\/(\S+)\s+HEAD/);
|
|
77
|
-
return match?.[1] ?? 'main';
|
|
108
|
+
return match?.[1] ?? 'main';
|
|
78
109
|
}
|
|
79
110
|
catch {
|
|
80
|
-
return 'main';
|
|
111
|
+
return 'main';
|
|
81
112
|
}
|
|
82
113
|
},
|
|
83
114
|
/** 初始化目录和配置文件，返回新建的配置对象 */
|
|
@@ -90,7 +121,9 @@ export const config = {
|
|
|
90
121
|
localRepoPath: path.join(WANGCHUAN_DIR, 'repo'),
|
|
91
122
|
keyPath: KEY_PATH,
|
|
92
123
|
hostname: os.hostname(),
|
|
124
|
+
version: CONFIG_VERSION,
|
|
93
125
|
profiles: { default: DEFAULT_PROFILES },
|
|
126
|
+
shared: DEFAULT_SHARED,
|
|
94
127
|
};
|
|
95
128
|
this.save(cfg);
|
|
96
129
|
return cfg;
|
|
@@ -99,6 +132,12 @@ export const config = {
|
|
|
99
132
|
merge(base, override) {
|
|
100
133
|
return { ...base, ...override };
|
|
101
134
|
},
|
|
135
|
+
/** 默认配置（迁移时使用） */
|
|
136
|
+
defaults: {
|
|
137
|
+
profiles: DEFAULT_PROFILES,
|
|
138
|
+
shared: DEFAULT_SHARED,
|
|
139
|
+
version: CONFIG_VERSION,
|
|
140
|
+
},
|
|
102
141
|
/** 常用路径常量 */
|
|
103
142
|
paths: {
|
|
104
143
|
dir: WANGCHUAN_DIR,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAQ,IAAI,CAAC;AACtB,OAAO,EAAE,MAAQ,IAAI,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;AAC5D,MAAM,WAAW,GAAK,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAC9D,MAAM,QAAQ,GAAQ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;AAC7D,MAAM,YAAY,GAAI,aAAa,CAAC,IAAI,GAAG,CAAC,sCAAsC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEtG,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* json-field.ts — JSON 字段级提取与合并
|
|
3
|
+
*
|
|
4
|
+
* 支持从大 JSON 文件中 pick 指定顶层字段进行同步，
|
|
5
|
+
* pull 时 merge 回目标 JSON（不破坏其他字段）。
|
|
6
|
+
*/
|
|
7
|
+
type JsonObject = Record<string, unknown>;
|
|
8
|
+
/** 从对象中提取指定顶层字段 */
|
|
9
|
+
export declare function extractFields(obj: JsonObject, fields: readonly string[]): JsonObject;
|
|
10
|
+
/** 将提取的字段 shallow merge 回目标对象（仅覆盖提取字段，保留其余） */
|
|
11
|
+
export declare function mergeFields(target: JsonObject, partial: JsonObject): JsonObject;
|
|
12
|
+
export declare const jsonField: {
|
|
13
|
+
readonly extractFields: typeof extractFields;
|
|
14
|
+
readonly mergeFields: typeof mergeFields;
|
|
15
|
+
};
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=json-field.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-field.d.ts","sourceRoot":"","sources":["../../../src/core/json-field.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE1C,mBAAmB;AACnB,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAMpF;AAED,+CAA+C;AAC/C,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,UAAU,CAE/E;AAED,eAAO,MAAM,SAAS;;;CAA0C,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* json-field.ts — JSON 字段级提取与合并
|
|
3
|
+
*
|
|
4
|
+
* 支持从大 JSON 文件中 pick 指定顶层字段进行同步，
|
|
5
|
+
* pull 时 merge 回目标 JSON（不破坏其他字段）。
|
|
6
|
+
*/
|
|
7
|
+
/** 从对象中提取指定顶层字段 */
|
|
8
|
+
export function extractFields(obj, fields) {
|
|
9
|
+
const result = {};
|
|
10
|
+
for (const f of fields) {
|
|
11
|
+
if (f in obj)
|
|
12
|
+
result[f] = obj[f];
|
|
13
|
+
}
|
|
14
|
+
return result;
|
|
15
|
+
}
|
|
16
|
+
/** 将提取的字段 shallow merge 回目标对象（仅覆盖提取字段，保留其余） */
|
|
17
|
+
export function mergeFields(target, partial) {
|
|
18
|
+
return { ...target, ...partial };
|
|
19
|
+
}
|
|
20
|
+
export const jsonField = { extractFields, mergeFields };
|
|
21
|
+
//# sourceMappingURL=json-field.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-field.js","sourceRoot":"","sources":["../../../src/core/json-field.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,mBAAmB;AACnB,MAAM,UAAU,aAAa,CAAC,GAAe,EAAE,MAAyB;IACtE,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG;YAAE,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,WAAW,CAAC,MAAkB,EAAE,OAAmB;IACjE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,EAAE,aAAa,EAAE,WAAW,EAAW,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* migrate.ts — 配置版本迁移
|
|
3
|
+
*
|
|
4
|
+
* v1 → v2:
|
|
5
|
+
* - repo 结构从 <agent>/ 迁移到 agents/<agent>/
|
|
6
|
+
* - skills 合并到 shared/skills/
|
|
7
|
+
* - 移除不再同步的文件（repo 中的旧条目，不影响本地工作区）
|
|
8
|
+
* - config.json 升级到 v2 格式
|
|
9
|
+
*
|
|
10
|
+
* 安全措施：
|
|
11
|
+
* - 迁移前完整备份旧 repo 到 ~/.wangchuan/backup-v1/
|
|
12
|
+
* - 写入迁移状态标记防止中断后重复执行部分步骤
|
|
13
|
+
* - 迁移后校验关键目录结构
|
|
14
|
+
* - 失败时自动回滚到备份
|
|
15
|
+
*/
|
|
16
|
+
import type { WangchuanConfig } from '../types.js';
|
|
17
|
+
/**
|
|
18
|
+
* 检测并执行配置迁移，返回最新版本的配置。
|
|
19
|
+
* 在 config.load() 之后调用。
|
|
20
|
+
*/
|
|
21
|
+
export declare function ensureMigrated(cfg: WangchuanConfig): WangchuanConfig;
|
|
22
|
+
//# sourceMappingURL=migrate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/core/migrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAyJnD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,eAAe,GAAG,eAAe,CAepE"}
|