ccjk 15.2.0 → 15.3.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 +35 -6
- package/dist/cli.js +31 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/doctor.js +55 -5
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/mcp.js +150 -0
- package/dist/commands/mcp.js.map +1 -1
- package/dist/commands/menu.js +5 -3
- package/dist/commands/menu.js.map +1 -1
- package/dist/commands/rollback.js +101 -0
- package/dist/commands/rollback.js.map +1 -0
- package/dist/core/lint.js +48 -3
- package/dist/core/lint.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -19,8 +19,10 @@ ccjk # 交互菜单
|
|
|
19
19
|
ccjk init # 配置 API（同时存为 profile）
|
|
20
20
|
ccjk use # 一键切换已配过的 API
|
|
21
21
|
ccjk perms standard # 一键设权限档位（同时作用于 3 个工具）
|
|
22
|
-
ccjk
|
|
23
|
-
ccjk
|
|
22
|
+
ccjk doctor --fix # 体检并自动修复配置问题
|
|
23
|
+
ccjk mcp # 装 MCP 服务（预设勾选）
|
|
24
|
+
ccjk mcp-ls # 列已装的 MCP
|
|
25
|
+
ccjk rollback # 从备份还原 settings.json
|
|
24
26
|
```
|
|
25
27
|
|
|
26
28
|
## 命令一览
|
|
@@ -30,13 +32,16 @@ ccjk doctor # 检查 settings.json
|
|
|
30
32
|
| `ccjk` | 交互菜单（默认） |
|
|
31
33
|
| `ccjk init` | 配置 API：写 `~/.claude/settings.json` 的 env，并保存为 profile |
|
|
32
34
|
| `ccjk use [name]` | **快速切换 profile**（不带参=交互选择） |
|
|
33
|
-
| `ccjk profile ls` |
|
|
34
|
-
| `ccjk profile show [name]` | 查看 profile 详情（不带参=当前） |
|
|
35
|
-
| `ccjk profile rm [name]` | 删除 profile |
|
|
35
|
+
| `ccjk profile ls/show/rm` | profile 列表 / 详情 / 删除 |
|
|
36
36
|
| `ccjk perms [tier]` | **一键设权限档位**（safe/standard/yolo），同时作用于 clavue/claude-code/codex |
|
|
37
37
|
| `ccjk perms-show` | 查看三个工具当前的权限状态 |
|
|
38
|
-
| `ccjk mcp` | 选装预设 MCP
|
|
38
|
+
| `ccjk mcp` | 选装预设 MCP 服务（交互勾选） |
|
|
39
|
+
| `ccjk mcp-ls` | 列出已安装的 MCP |
|
|
40
|
+
| `ccjk mcp-add [name]` | 添加自定义 MCP 服务 |
|
|
41
|
+
| `ccjk mcp-rm [name]` | 卸载 MCP 服务 |
|
|
39
42
|
| `ccjk doctor` | 检查 settings.json 中的常见配置问题 |
|
|
43
|
+
| `ccjk doctor --fix` | **自动修复**能修的问题（修改前备份） |
|
|
44
|
+
| `ccjk rollback` | **从备份还原** settings.json / config.toml |
|
|
40
45
|
| `ccjk detect` | 列出已安装的代码工具 |
|
|
41
46
|
| `ccjk git-install` | 安装 `/ccjk:git-commit` 等 slash 命令模板 |
|
|
42
47
|
|
|
@@ -85,9 +90,33 @@ ccjk perms-show # 看三个工具当前各是哪档
|
|
|
85
90
|
ccjk init -t clavue -p glm --api-key sk-xxx --profile work -y
|
|
86
91
|
ccjk perms standard -y
|
|
87
92
|
ccjk mcp -s context7 serena -y
|
|
93
|
+
ccjk mcp-add my-server --command npx --args "-y @scope/pkg" -y
|
|
94
|
+
ccjk doctor --fix -y
|
|
88
95
|
ccjk git-install --scope user -y
|
|
89
96
|
```
|
|
90
97
|
|
|
98
|
+
### Doctor：体检 + 自动修复
|
|
99
|
+
|
|
100
|
+
```bash
|
|
101
|
+
ccjk doctor # 列出问题，标记哪些可自动修
|
|
102
|
+
ccjk doctor --fix # 自动修可修的（修改前备份）
|
|
103
|
+
ccjk doctor --fix -y # 跳过确认
|
|
104
|
+
```
|
|
105
|
+
|
|
106
|
+
可自动修复：`model-overrides-env`（删顶层 model）、`duplicate-auth`（保留 AUTH_TOKEN，删 API_KEY）。
|
|
107
|
+
不可自动修：`missing-credentials`、`invalid-base-url`（需要正确的 URL/Key，跑 `ccjk init`）。
|
|
108
|
+
|
|
109
|
+
### Rollback：从备份还原
|
|
110
|
+
|
|
111
|
+
每次 `init` / `mcp` / `perms` / `doctor --fix` 写入前都会自动备份到 `xxx.bak-<ISO时间戳>`。
|
|
112
|
+
|
|
113
|
+
```bash
|
|
114
|
+
ccjk rollback # 列所有备份，按时间倒序
|
|
115
|
+
ccjk rollback -t clavue # 只看一个工具的备份
|
|
116
|
+
```
|
|
117
|
+
|
|
118
|
+
还原前会再备份一份当前状态，所以**还原本身也可还原**。
|
|
119
|
+
|
|
91
120
|
## 支持
|
|
92
121
|
|
|
93
122
|
| 工具 | 配置目标 | 状态 |
|
package/dist/cli.js
CHANGED
|
@@ -5,13 +5,14 @@ import { fileURLToPath } from 'node:url';
|
|
|
5
5
|
import { Command } from 'commander';
|
|
6
6
|
import ansis from 'ansis';
|
|
7
7
|
import { initCommand } from './commands/init.js';
|
|
8
|
-
import { mcpCommand } from './commands/mcp.js';
|
|
8
|
+
import { mcpAddCommand, mcpCommand, mcpListCommand, mcpRmCommand } from './commands/mcp.js';
|
|
9
9
|
import { doctorCommand } from './commands/doctor.js';
|
|
10
10
|
import { detectCommand } from './commands/detect.js';
|
|
11
11
|
import { gitInstallCommand } from './commands/git-install.js';
|
|
12
12
|
import { menuCommand } from './commands/menu.js';
|
|
13
13
|
import { profileListCommand, profileRmCommand, profileShowCommand, profileUseCommand, } from './commands/profile.js';
|
|
14
14
|
import { permsCommand, permsShowCommand } from './commands/perms.js';
|
|
15
|
+
import { rollbackCommand } from './commands/rollback.js';
|
|
15
16
|
const pkgPath = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
|
|
16
17
|
const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
|
|
17
18
|
const program = new Command();
|
|
@@ -59,11 +60,31 @@ profile
|
|
|
59
60
|
.action((name) => profileShowCommand(name));
|
|
60
61
|
program
|
|
61
62
|
.command('mcp')
|
|
62
|
-
.description('配置 MCP
|
|
63
|
+
.description('配置 MCP 服务（预设清单 / 交互勾选）')
|
|
63
64
|
.option('-t, --tool <tool>', '目标工具', 'clavue')
|
|
64
65
|
.option('-s, --services <ids...>', '直接指定服务 id')
|
|
65
66
|
.option('-y, --yes', '跳过确认')
|
|
66
67
|
.action((opts) => mcpCommand(opts));
|
|
68
|
+
program
|
|
69
|
+
.command('mcp-ls')
|
|
70
|
+
.description('列出已安装的 MCP 服务')
|
|
71
|
+
.option('-t, --tool <tool>', '目标工具', 'clavue')
|
|
72
|
+
.action((opts) => mcpListCommand(opts));
|
|
73
|
+
program
|
|
74
|
+
.command('mcp-add [name]')
|
|
75
|
+
.description('添加自定义 MCP 服务')
|
|
76
|
+
.option('-t, --tool <tool>', '目标工具', 'clavue')
|
|
77
|
+
.option('--command <cmd>', '启动命令（如 npx, uvx）')
|
|
78
|
+
.option('--args <args>', '参数（空格分隔）')
|
|
79
|
+
.option('--env <kv>', '环境变量（K=V,K2=V2）')
|
|
80
|
+
.option('-y, --yes', '跳过确认')
|
|
81
|
+
.action((name, opts) => mcpAddCommand(name, opts));
|
|
82
|
+
program
|
|
83
|
+
.command('mcp-rm [name]')
|
|
84
|
+
.description('卸载已安装的 MCP 服务')
|
|
85
|
+
.option('-t, --tool <tool>', '目标工具', 'clavue')
|
|
86
|
+
.option('-y, --yes', '跳过确认')
|
|
87
|
+
.action((name, opts) => mcpRmCommand(name, opts));
|
|
67
88
|
program
|
|
68
89
|
.command('perms [tier]')
|
|
69
90
|
.description('一键设置权限档位（safe | standard | yolo），同时作用于 clavue/claude-code/codex')
|
|
@@ -78,7 +99,15 @@ program
|
|
|
78
99
|
program
|
|
79
100
|
.command('doctor')
|
|
80
101
|
.description('检查 settings.json 中的常见配置问题')
|
|
102
|
+
.option('--fix', '自动修复可修的项目（修改前会备份）')
|
|
103
|
+
.option('-y, --yes', '跳过确认')
|
|
81
104
|
.action(doctorCommand);
|
|
105
|
+
program
|
|
106
|
+
.command('rollback')
|
|
107
|
+
.description('从备份还原 settings.json / config.toml')
|
|
108
|
+
.option('-t, --tool <tool>', '只看一个工具的备份')
|
|
109
|
+
.option('-y, --yes', '跳过确认')
|
|
110
|
+
.action((opts) => rollbackCommand(opts));
|
|
82
111
|
program
|
|
83
112
|
.command('detect')
|
|
84
113
|
.description('检测已安装的代码工具')
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/doctor.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import inquirer from 'inquirer';
|
|
1
2
|
import ansis from 'ansis';
|
|
2
|
-
import { lintSettings } from '../core/lint.js';
|
|
3
|
-
import { readSettings } from '../core/settings.js';
|
|
3
|
+
import { autoFix, lintSettings } from '../core/lint.js';
|
|
4
|
+
import { readSettings, writeSettings } from '../core/settings.js';
|
|
4
5
|
import { TOOLS } from '../core/tools.js';
|
|
5
6
|
import { detectAll } from '../core/detect.js';
|
|
6
7
|
const COLOR = {
|
|
@@ -13,7 +14,7 @@ const ICON = {
|
|
|
13
14
|
warn: '!',
|
|
14
15
|
info: 'i',
|
|
15
16
|
};
|
|
16
|
-
export async function doctorCommand() {
|
|
17
|
+
export async function doctorCommand(opts = {}) {
|
|
17
18
|
const detected = detectAll();
|
|
18
19
|
const targets = detected
|
|
19
20
|
.filter(d => d.configExists && d.tool !== 'codex')
|
|
@@ -24,6 +25,7 @@ export async function doctorCommand() {
|
|
|
24
25
|
}
|
|
25
26
|
let totalErrors = 0;
|
|
26
27
|
let totalWarns = 0;
|
|
28
|
+
let totalFixable = 0;
|
|
27
29
|
for (const tool of targets) {
|
|
28
30
|
const meta = TOOLS[tool];
|
|
29
31
|
console.log(ansis.bold(`\n[${meta.displayName}] ${meta.settingsFile}`));
|
|
@@ -42,27 +44,75 @@ export async function doctorCommand() {
|
|
|
42
44
|
continue;
|
|
43
45
|
}
|
|
44
46
|
for (const f of findings) {
|
|
47
|
+
const fixable = f.fix ? ansis.dim(' [可自动修]') : '';
|
|
45
48
|
const tag = COLOR[f.severity](`${ICON[f.severity]} [${f.rule}]`);
|
|
46
|
-
console.log(` ${tag} ${f.message}`);
|
|
49
|
+
console.log(` ${tag} ${f.message}${fixable}`);
|
|
47
50
|
if (f.fixHint)
|
|
48
51
|
console.log(` ${ansis.dim('→')} ${ansis.dim(f.fixHint)}`);
|
|
49
52
|
if (f.severity === 'error')
|
|
50
53
|
totalErrors++;
|
|
51
54
|
else if (f.severity === 'warn')
|
|
52
55
|
totalWarns++;
|
|
56
|
+
if (f.fix)
|
|
57
|
+
totalFixable++;
|
|
53
58
|
}
|
|
54
59
|
}
|
|
55
60
|
console.log('');
|
|
56
61
|
if (totalErrors > 0) {
|
|
57
62
|
console.log(ansis.red(`✗ ${totalErrors} error${totalErrors > 1 ? 's' : ''}`) + (totalWarns > 0 ? `, ${ansis.yellow(`${totalWarns} warning${totalWarns > 1 ? 's' : ''}`)}` : ''));
|
|
58
|
-
|
|
63
|
+
if (!opts.fix)
|
|
64
|
+
process.exitCode = 1;
|
|
59
65
|
}
|
|
60
66
|
else if (totalWarns > 0) {
|
|
61
67
|
console.log(ansis.yellow(`! ${totalWarns} warning${totalWarns > 1 ? 's' : ''}`));
|
|
62
68
|
}
|
|
63
69
|
else {
|
|
64
70
|
console.log(ansis.green('✓ 全部通过'));
|
|
71
|
+
console.log('');
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
if (totalFixable > 0 && !opts.fix) {
|
|
75
|
+
console.log(ansis.dim(` ${totalFixable} 项可自动修复 — 运行 \`ccjk doctor --fix\``));
|
|
76
|
+
}
|
|
77
|
+
if (opts.fix && totalFixable > 0) {
|
|
78
|
+
if (!opts.yes) {
|
|
79
|
+
const { ok } = await inquirer.prompt([{
|
|
80
|
+
type: 'confirm',
|
|
81
|
+
name: 'ok',
|
|
82
|
+
message: `自动修复 ${totalFixable} 项？（修改前会备份）`,
|
|
83
|
+
default: true,
|
|
84
|
+
}]);
|
|
85
|
+
if (!ok) {
|
|
86
|
+
console.log(ansis.gray('已跳过 fix。\n'));
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
await runFix(targets);
|
|
65
91
|
}
|
|
66
92
|
console.log('');
|
|
67
93
|
}
|
|
94
|
+
async function runFix(targets) {
|
|
95
|
+
let fixedCount = 0;
|
|
96
|
+
process.exitCode = 0;
|
|
97
|
+
for (const tool of targets) {
|
|
98
|
+
const meta = TOOLS[tool];
|
|
99
|
+
const settings = await readSettings(meta.settingsFile);
|
|
100
|
+
const { fixed, unfixable } = autoFix(settings);
|
|
101
|
+
if (fixed.length === 0 && unfixable.length === 0)
|
|
102
|
+
continue;
|
|
103
|
+
if (fixed.length > 0) {
|
|
104
|
+
const backup = await writeSettings(meta.settingsFile, settings);
|
|
105
|
+
console.log(ansis.green(`\n ✔ [${meta.displayName}] 修复 ${fixed.length} 项: ${fixed.join(', ')}`));
|
|
106
|
+
if (backup)
|
|
107
|
+
console.log(ansis.dim(` 备份: ${backup}`));
|
|
108
|
+
fixedCount += fixed.length;
|
|
109
|
+
}
|
|
110
|
+
if (unfixable.length > 0) {
|
|
111
|
+
console.log(ansis.yellow(` ! [${meta.displayName}] ${unfixable.length} 项需人工: ${unfixable.join(', ')}`));
|
|
112
|
+
process.exitCode = 1;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
if (fixedCount > 0)
|
|
116
|
+
console.log(ansis.green(`\n✔ 共修复 ${fixedCount} 项`));
|
|
117
|
+
}
|
|
68
118
|
//# sourceMappingURL=doctor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/mcp.js
CHANGED
|
@@ -63,4 +63,154 @@ export function applyMcpToSettings(settings, ids) {
|
|
|
63
63
|
}
|
|
64
64
|
return installed;
|
|
65
65
|
}
|
|
66
|
+
export async function mcpListCommand(opts = {}) {
|
|
67
|
+
const tool = opts.tool ?? 'clavue';
|
|
68
|
+
if (tool === 'codex') {
|
|
69
|
+
console.log(ansis.yellow('\nCodex 的 MCP 配置在 ~/.codex/config.toml 中手动管理。\n'));
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const meta = TOOLS[tool];
|
|
73
|
+
const settings = await readSettings(meta.settingsFile);
|
|
74
|
+
const servers = settings.mcpServers ?? {};
|
|
75
|
+
const names = Object.keys(servers);
|
|
76
|
+
if (names.length === 0) {
|
|
77
|
+
console.log(ansis.gray(`\n[${meta.displayName}] 未安装任何 MCP 服务。\n`));
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
console.log(ansis.bold(`\n[${meta.displayName}] 已安装的 MCP（${names.length}）:\n`));
|
|
81
|
+
for (const name of names.sort()) {
|
|
82
|
+
const e = servers[name];
|
|
83
|
+
const argsStr = e.args && e.args.length > 0 ? ansis.dim(` ${e.args.join(' ')}`) : '';
|
|
84
|
+
const isPreset = MCP_SERVICES.some(s => s.id === name) ? ansis.green(' (预设)') : '';
|
|
85
|
+
console.log(` ${ansis.cyan(name)}${isPreset}`);
|
|
86
|
+
console.log(` ${ansis.dim(e.command)}${argsStr}`);
|
|
87
|
+
}
|
|
88
|
+
console.log();
|
|
89
|
+
}
|
|
90
|
+
export async function mcpRmCommand(name, opts = {}) {
|
|
91
|
+
const tool = opts.tool ?? 'clavue';
|
|
92
|
+
if (tool === 'codex') {
|
|
93
|
+
console.log(ansis.yellow('\nCodex 不支持此命令。\n'));
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
const meta = TOOLS[tool];
|
|
97
|
+
const settings = await readSettings(meta.settingsFile);
|
|
98
|
+
const servers = settings.mcpServers ?? {};
|
|
99
|
+
const installed = Object.keys(servers);
|
|
100
|
+
if (installed.length === 0) {
|
|
101
|
+
console.log(ansis.gray('\n没有已安装的 MCP 服务。\n'));
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const target = name ?? await pickInstalled(installed, '选择要卸载的 MCP');
|
|
105
|
+
if (!target)
|
|
106
|
+
return;
|
|
107
|
+
if (!installed.includes(target)) {
|
|
108
|
+
throw new Error(`MCP "${target}" 未安装。已装: ${installed.join(', ')}`);
|
|
109
|
+
}
|
|
110
|
+
if (!opts.yes) {
|
|
111
|
+
const { ok } = await inquirer.prompt([{
|
|
112
|
+
type: 'confirm',
|
|
113
|
+
name: 'ok',
|
|
114
|
+
message: `确认卸载 MCP "${target}"？`,
|
|
115
|
+
default: true,
|
|
116
|
+
}]);
|
|
117
|
+
if (!ok) {
|
|
118
|
+
console.log(ansis.gray('已取消。'));
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
delete servers[target];
|
|
123
|
+
settings.mcpServers = servers;
|
|
124
|
+
const backup = await writeSettings(meta.settingsFile, settings);
|
|
125
|
+
console.log(ansis.green(`\n✔ 已卸载 ${target}`));
|
|
126
|
+
if (backup)
|
|
127
|
+
console.log(ansis.dim(` 备份: ${backup}\n`));
|
|
128
|
+
}
|
|
129
|
+
export async function mcpAddCommand(name, opts = {}) {
|
|
130
|
+
const tool = opts.tool ?? 'clavue';
|
|
131
|
+
if (tool === 'codex') {
|
|
132
|
+
console.log(ansis.yellow('\nCodex 不支持此命令。\n'));
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
const meta = TOOLS[tool];
|
|
136
|
+
if (!name) {
|
|
137
|
+
const { v } = await inquirer.prompt([{
|
|
138
|
+
type: 'input', name: 'v', message: 'MCP 名称', validate: (s) => /^[a-zA-Z0-9_-]+$/.test(s.trim()) || '只允许字母数字下划线-',
|
|
139
|
+
}]);
|
|
140
|
+
name = v.trim();
|
|
141
|
+
}
|
|
142
|
+
validateMcpName(name);
|
|
143
|
+
const command = opts.command ?? await askInput('启动命令（如 npx, uvx, python）');
|
|
144
|
+
const argsRaw = opts.args ?? await askInput('参数（空格分隔，如 "-y @scope/pkg"）', '');
|
|
145
|
+
const args = argsRaw.split(/\s+/).filter(Boolean);
|
|
146
|
+
const envEntries = parseKv(opts.env);
|
|
147
|
+
const entry = { command, args };
|
|
148
|
+
if (Object.keys(envEntries).length > 0)
|
|
149
|
+
entry.env = envEntries;
|
|
150
|
+
console.log(ansis.dim(`\n→ 目标: ${meta.settingsFile}`));
|
|
151
|
+
console.log(ansis.dim(`→ ${name}: ${command} ${args.join(' ')}`));
|
|
152
|
+
if (entry.env)
|
|
153
|
+
console.log(ansis.dim(`→ env: ${Object.keys(entry.env).join(', ')}`));
|
|
154
|
+
if (!opts.yes) {
|
|
155
|
+
const { ok } = await inquirer.prompt([{
|
|
156
|
+
type: 'confirm', name: 'ok', message: '确认添加？', default: true,
|
|
157
|
+
}]);
|
|
158
|
+
if (!ok) {
|
|
159
|
+
console.log(ansis.gray('已取消。'));
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
const settings = await readSettings(meta.settingsFile);
|
|
164
|
+
settings.mcpServers = settings.mcpServers ?? {};
|
|
165
|
+
if (settings.mcpServers[name] && !opts.yes) {
|
|
166
|
+
const { overwrite } = await inquirer.prompt([{
|
|
167
|
+
type: 'confirm', name: 'overwrite', message: `"${name}" 已存在，覆盖？`, default: false,
|
|
168
|
+
}]);
|
|
169
|
+
if (!overwrite) {
|
|
170
|
+
console.log(ansis.gray('已取消。'));
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
settings.mcpServers[name] = entry;
|
|
175
|
+
const backup = await writeSettings(meta.settingsFile, settings);
|
|
176
|
+
console.log(ansis.green(`\n✔ 已添加 MCP "${name}"`));
|
|
177
|
+
if (backup)
|
|
178
|
+
console.log(ansis.dim(` 备份: ${backup}\n`));
|
|
179
|
+
}
|
|
180
|
+
function validateMcpName(name) {
|
|
181
|
+
if (!/^[a-zA-Z0-9_-]+$/.test(name)) {
|
|
182
|
+
throw new Error(`MCP 名称非法："${name}"（只允许字母数字 _ -）`);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
async function pickInstalled(names, message) {
|
|
186
|
+
const { name } = await inquirer.prompt([{
|
|
187
|
+
type: 'list', name: 'name', message, choices: names.sort(),
|
|
188
|
+
}]);
|
|
189
|
+
return name;
|
|
190
|
+
}
|
|
191
|
+
async function askInput(message, defaultValue) {
|
|
192
|
+
const { v } = await inquirer.prompt([{
|
|
193
|
+
type: 'input',
|
|
194
|
+
name: 'v',
|
|
195
|
+
message,
|
|
196
|
+
default: defaultValue,
|
|
197
|
+
validate: (s) => (defaultValue !== undefined || s.trim().length > 0) || '不能为空',
|
|
198
|
+
}]);
|
|
199
|
+
return v.trim();
|
|
200
|
+
}
|
|
201
|
+
function parseKv(raw) {
|
|
202
|
+
if (!raw)
|
|
203
|
+
return {};
|
|
204
|
+
const out = {};
|
|
205
|
+
for (const part of raw.split(',')) {
|
|
206
|
+
const eq = part.indexOf('=');
|
|
207
|
+
if (eq < 0)
|
|
208
|
+
continue;
|
|
209
|
+
const k = part.slice(0, eq).trim();
|
|
210
|
+
const v = part.slice(eq + 1).trim();
|
|
211
|
+
if (k)
|
|
212
|
+
out[k] = v;
|
|
213
|
+
}
|
|
214
|
+
return out;
|
|
215
|
+
}
|
|
66
216
|
//# sourceMappingURL=mcp.js.map
|
package/dist/commands/mcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/menu.js
CHANGED
|
@@ -7,6 +7,7 @@ import { doctorCommand } from './doctor.js';
|
|
|
7
7
|
import { gitInstallCommand } from './git-install.js';
|
|
8
8
|
import { profileUseCommand } from './profile.js';
|
|
9
9
|
import { permsCommand } from './perms.js';
|
|
10
|
+
import { rollbackCommand } from './rollback.js';
|
|
10
11
|
import { listProfiles, readState } from '../core/profiles.js';
|
|
11
12
|
const ITEMS = [
|
|
12
13
|
{ key: '1', label: '配置 API（init）', run: () => initCommand() },
|
|
@@ -14,8 +15,9 @@ const ITEMS = [
|
|
|
14
15
|
{ key: '3', label: '一键设权限档位（safe/standard/yolo）', run: () => permsCommand(undefined) },
|
|
15
16
|
{ key: '4', label: '配置 MCP 服务', run: () => mcpCommand() },
|
|
16
17
|
{ key: '5', label: '体检（doctor）', run: () => doctorCommand() },
|
|
17
|
-
{ key: '6', label: '
|
|
18
|
-
{ key: '7', label: '
|
|
18
|
+
{ key: '6', label: '从备份还原（rollback）', run: () => rollbackCommand() },
|
|
19
|
+
{ key: '7', label: '安装 Git 命令模板', run: () => gitInstallCommand() },
|
|
20
|
+
{ key: '8', label: '检测已安装的工具', run: async () => detectCommand() },
|
|
19
21
|
];
|
|
20
22
|
export async function menuCommand() {
|
|
21
23
|
console.log(ansis.bold('\nccjk - Clavue/Claude Code 配置助手\n'));
|
|
@@ -33,7 +35,7 @@ export async function menuCommand() {
|
|
|
33
35
|
type: 'input',
|
|
34
36
|
name: 'choice',
|
|
35
37
|
message: '\n选择',
|
|
36
|
-
validate: (v) => /^[1-
|
|
38
|
+
validate: (v) => /^[1-8q]$/.test(v.trim()) || '输入 1-8 或 q',
|
|
37
39
|
}]);
|
|
38
40
|
if (choice.trim() === 'q')
|
|
39
41
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/commands/menu.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/commands/menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import { existsSync } from 'node:fs';
|
|
2
|
+
import { copyFile, readdir, stat } from 'node:fs/promises';
|
|
3
|
+
import { dirname, join } from 'node:path';
|
|
4
|
+
import inquirer from 'inquirer';
|
|
5
|
+
import ansis from 'ansis';
|
|
6
|
+
import { TOOLS } from '../core/tools.js';
|
|
7
|
+
import { expandHome } from '../core/paths.js';
|
|
8
|
+
export async function rollbackCommand(opts = {}) {
|
|
9
|
+
const tools = opts.tool ? [opts.tool] : ['clavue', 'claude-code', 'codex'];
|
|
10
|
+
const all = [];
|
|
11
|
+
for (const t of tools) {
|
|
12
|
+
all.push(...await collectBackupsFor(t));
|
|
13
|
+
}
|
|
14
|
+
if (all.length === 0) {
|
|
15
|
+
console.log(ansis.gray('\n没有找到任何备份（settings.json.bak-* / config.toml.bak-*）。\n'));
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
all.sort((a, b) => b.ts.getTime() - a.ts.getTime());
|
|
19
|
+
const { idx } = await inquirer.prompt([{
|
|
20
|
+
type: 'list',
|
|
21
|
+
name: 'idx',
|
|
22
|
+
message: '选择要还原的备份',
|
|
23
|
+
pageSize: Math.min(15, all.length + 2),
|
|
24
|
+
choices: [
|
|
25
|
+
...all.map((b, i) => ({
|
|
26
|
+
name: `${ansis.bold(TOOLS[b.tool].displayName.padEnd(12))} ${formatTs(b.ts).padEnd(20)} ${ansis.dim(b.backupPath.split('/').pop() ?? '')}`,
|
|
27
|
+
value: i,
|
|
28
|
+
})),
|
|
29
|
+
new inquirer.Separator(),
|
|
30
|
+
{ name: ansis.gray('取消'), value: -1 },
|
|
31
|
+
],
|
|
32
|
+
}]);
|
|
33
|
+
if (idx < 0) {
|
|
34
|
+
console.log(ansis.gray('已取消。'));
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const target = all[idx];
|
|
38
|
+
if (!opts.yes) {
|
|
39
|
+
const { ok } = await inquirer.prompt([{
|
|
40
|
+
type: 'confirm',
|
|
41
|
+
name: 'ok',
|
|
42
|
+
message: `还原 ${TOOLS[target.tool].displayName}\n ${target.backupPath}\n → ${target.origin}\n（当前文件会备份后被覆盖）`,
|
|
43
|
+
default: false,
|
|
44
|
+
}]);
|
|
45
|
+
if (!ok) {
|
|
46
|
+
console.log(ansis.gray('已取消。'));
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
let safetyBackup = '';
|
|
51
|
+
if (existsSync(target.origin)) {
|
|
52
|
+
const ts = new Date().toISOString().replace(/[:.]/g, '-');
|
|
53
|
+
safetyBackup = `${target.origin}.bak-${ts}`;
|
|
54
|
+
await copyFile(target.origin, safetyBackup);
|
|
55
|
+
}
|
|
56
|
+
await copyFile(target.backupPath, target.origin);
|
|
57
|
+
console.log(ansis.green(`\n✔ 已还原 ${TOOLS[target.tool].displayName}`));
|
|
58
|
+
console.log(ansis.dim(` 来源: ${target.backupPath}`));
|
|
59
|
+
console.log(ansis.dim(` 目标: ${target.origin}`));
|
|
60
|
+
if (safetyBackup)
|
|
61
|
+
console.log(ansis.dim(` 覆盖前的当前版本已存到: ${safetyBackup}`));
|
|
62
|
+
console.log();
|
|
63
|
+
}
|
|
64
|
+
async function collectBackupsFor(tool) {
|
|
65
|
+
const meta = TOOLS[tool];
|
|
66
|
+
const origin = expandHome(meta.settingsFile);
|
|
67
|
+
const dir = dirname(origin);
|
|
68
|
+
if (!existsSync(dir))
|
|
69
|
+
return [];
|
|
70
|
+
const baseName = origin.split('/').pop() ?? '';
|
|
71
|
+
const prefix = `${baseName}.bak-`;
|
|
72
|
+
const files = await readdir(dir);
|
|
73
|
+
const out = [];
|
|
74
|
+
for (const f of files) {
|
|
75
|
+
if (!f.startsWith(prefix))
|
|
76
|
+
continue;
|
|
77
|
+
const fullPath = join(dir, f);
|
|
78
|
+
let ts;
|
|
79
|
+
const m = /\.bak-(.+)$/.exec(f);
|
|
80
|
+
if (m) {
|
|
81
|
+
const restored = m[1].replace(/^(\d{4}-\d{2}-\d{2}T\d{2})-(\d{2})-(\d{2})-(\d+)Z$/, '$1:$2:$3.$4Z');
|
|
82
|
+
const d = new Date(restored);
|
|
83
|
+
ts = isNaN(d.getTime()) ? (await stat(fullPath)).mtime : d;
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
ts = (await stat(fullPath)).mtime;
|
|
87
|
+
}
|
|
88
|
+
out.push({ tool, origin, backupPath: fullPath, ts });
|
|
89
|
+
}
|
|
90
|
+
return out;
|
|
91
|
+
}
|
|
92
|
+
function formatTs(d) {
|
|
93
|
+
const y = d.getFullYear();
|
|
94
|
+
const m = String(d.getMonth() + 1).padStart(2, '0');
|
|
95
|
+
const day = String(d.getDate()).padStart(2, '0');
|
|
96
|
+
const h = String(d.getHours()).padStart(2, '0');
|
|
97
|
+
const mi = String(d.getMinutes()).padStart(2, '0');
|
|
98
|
+
const s = String(d.getSeconds()).padStart(2, '0');
|
|
99
|
+
return `${y}-${m}-${day} ${h}:${mi}:${s}`;
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=rollback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../src/commands/rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAc9C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAwB,EAAE;IAC9D,MAAM,KAAK,GAAe,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAgB,CAAC;IACvG,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC,CAAC;QAClF,OAAO;IACT,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAkB,CAAC;YACtD,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,UAAU;YACnB,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;YACtC,OAAO,EAAE;gBACP,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBACpB,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE;oBAC1I,KAAK,EAAE,CAAC;iBACT,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,SAAS,EAAE;gBACxB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE;aACtC;SACF,CAAC,CAAC,CAAC;IACJ,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAChC,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAExB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAkB,CAAC;gBACrD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,OAAO,MAAM,CAAC,UAAU,UAAU,MAAM,CAAC,MAAM,iBAAiB;gBAC7G,OAAO,EAAE,KAAK;aACf,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAChC,OAAO;QACT,CAAC;IACH,CAAC;IAED,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC1D,YAAY,GAAG,GAAG,MAAM,CAAC,MAAM,QAAQ,EAAE,EAAE,CAAC;QAC5C,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACjD,IAAI,YAAY;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,YAAY,EAAE,CAAC,CAAC,CAAC;IAC3E,OAAO,CAAC,GAAG,EAAE,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAc;IAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,GAAG,QAAQ,OAAO,CAAC;IAClC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,SAAS;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9B,IAAI,EAAQ,CAAC;QACb,MAAM,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,EAAE,CAAC;YACN,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,oDAAoD,EAAE,cAAc,CAAC,CAAC;YACpG,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;aACI,CAAC;YACJ,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;QACpC,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,QAAQ,CAAC,CAAO;IACvB,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACnD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAClD,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;AAC5C,CAAC"}
|
package/dist/core/lint.js
CHANGED
|
@@ -6,7 +6,14 @@ export function lintSettings(settings) {
|
|
|
6
6
|
severity: 'error',
|
|
7
7
|
rule: 'model-overrides-env',
|
|
8
8
|
message: '顶层 settings.model 会覆盖 env.ANTHROPIC_MODEL，导致自定义 provider 失效',
|
|
9
|
-
fixHint: '删除 settings.model
|
|
9
|
+
fixHint: '删除 settings.model 字段',
|
|
10
|
+
fix: (s) => {
|
|
11
|
+
if ('model' in s) {
|
|
12
|
+
delete s.model;
|
|
13
|
+
return true;
|
|
14
|
+
}
|
|
15
|
+
return false;
|
|
16
|
+
},
|
|
10
17
|
});
|
|
11
18
|
}
|
|
12
19
|
if (env.ANTHROPIC_API_KEY && env.ANTHROPIC_AUTH_TOKEN) {
|
|
@@ -14,7 +21,14 @@ export function lintSettings(settings) {
|
|
|
14
21
|
severity: 'warn',
|
|
15
22
|
rule: 'duplicate-auth',
|
|
16
23
|
message: '同时存在 ANTHROPIC_API_KEY 和 ANTHROPIC_AUTH_TOKEN，行为不确定',
|
|
17
|
-
fixHint: '
|
|
24
|
+
fixHint: '保留 ANTHROPIC_AUTH_TOKEN（多数第三方 provider 使用此凭证），删除 ANTHROPIC_API_KEY',
|
|
25
|
+
fix: (s) => {
|
|
26
|
+
if (s.env?.ANTHROPIC_API_KEY && s.env?.ANTHROPIC_AUTH_TOKEN) {
|
|
27
|
+
delete s.env.ANTHROPIC_API_KEY;
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
return false;
|
|
31
|
+
},
|
|
18
32
|
});
|
|
19
33
|
}
|
|
20
34
|
if (env.ANTHROPIC_BASE_URL && !env.ANTHROPIC_API_KEY && !env.ANTHROPIC_AUTH_TOKEN) {
|
|
@@ -22,7 +36,7 @@ export function lintSettings(settings) {
|
|
|
22
36
|
severity: 'error',
|
|
23
37
|
rule: 'missing-credentials',
|
|
24
38
|
message: '已设置 ANTHROPIC_BASE_URL 但缺凭证（ANTHROPIC_AUTH_TOKEN 或 ANTHROPIC_API_KEY）',
|
|
25
|
-
fixHint: '运行 `ccjk init`
|
|
39
|
+
fixHint: '运行 `ccjk init` 配置凭证（此项 --fix 无法修复，需要 API key）',
|
|
26
40
|
});
|
|
27
41
|
}
|
|
28
42
|
if (env.ANTHROPIC_BASE_URL && !/^https?:\/\//.test(env.ANTHROPIC_BASE_URL)) {
|
|
@@ -30,6 +44,7 @@ export function lintSettings(settings) {
|
|
|
30
44
|
severity: 'error',
|
|
31
45
|
rule: 'invalid-base-url',
|
|
32
46
|
message: `ANTHROPIC_BASE_URL "${env.ANTHROPIC_BASE_URL}" 不是有效 URL`,
|
|
47
|
+
fixHint: '运行 `ccjk init` 重新配置（此项 --fix 无法修复，需要正确 URL）',
|
|
33
48
|
});
|
|
34
49
|
}
|
|
35
50
|
const hooks = settings.hooks;
|
|
@@ -40,10 +55,40 @@ export function lintSettings(settings) {
|
|
|
40
55
|
severity: 'warn',
|
|
41
56
|
rule: 'hook-bloat',
|
|
42
57
|
message: `hooks.${name} 注册了 ${value.length} 个处理器，可能拖慢每次工具调用`,
|
|
58
|
+
fixHint: '人工审查并精简 hook（自动 fix 不安全：hook 行为各不相同）',
|
|
43
59
|
});
|
|
44
60
|
}
|
|
45
61
|
}
|
|
46
62
|
}
|
|
47
63
|
return findings;
|
|
48
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* 跑所有可自动修复的规则。返回每条已修复的规则名。
|
|
67
|
+
* 不可修复的（如 missing-credentials）跳过。
|
|
68
|
+
*/
|
|
69
|
+
export function autoFix(settings) {
|
|
70
|
+
const fixed = [];
|
|
71
|
+
const unfixable = [];
|
|
72
|
+
// 反复跑直到稳定（修一条可能解锁/消除另一条，比如删 API_KEY 后双 auth 没了）
|
|
73
|
+
for (let i = 0; i < 5; i++) {
|
|
74
|
+
const findings = lintSettings(settings);
|
|
75
|
+
if (findings.length === 0)
|
|
76
|
+
break;
|
|
77
|
+
let changed = false;
|
|
78
|
+
for (const f of findings) {
|
|
79
|
+
if (f.fix && f.fix(settings)) {
|
|
80
|
+
if (!fixed.includes(f.rule))
|
|
81
|
+
fixed.push(f.rule);
|
|
82
|
+
changed = true;
|
|
83
|
+
}
|
|
84
|
+
else if (!f.fix) {
|
|
85
|
+
if (!unfixable.includes(f.rule))
|
|
86
|
+
unfixable.push(f.rule);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
if (!changed)
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
return { fixed, unfixable };
|
|
93
|
+
}
|
|
49
94
|
//# sourceMappingURL=lint.js.map
|
package/dist/core/lint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/core/lint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/core/lint.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,YAAY,CAAC,QAAwB;IACnD,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtE,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,6DAA6D;YACtE,OAAO,EAAE,sBAAsB;YAC/B,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;gBACT,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;oBACjB,OAAO,CAAC,CAAC,KAAK,CAAC;oBACf,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACtD,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,qDAAqD;YAC9D,OAAO,EAAE,oEAAoE;YAC7E,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;gBACT,IAAI,CAAC,CAAC,GAAG,EAAE,iBAAiB,IAAI,CAAC,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;oBAC5D,OAAO,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC;oBAC/B,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,kBAAkB,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAClF,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,uEAAuE;YAChF,OAAO,EAAE,+CAA+C;SACzD,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,kBAAkB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC3E,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,uBAAuB,GAAG,CAAC,kBAAkB,YAAY;YAClE,OAAO,EAAE,6CAA6C;SACvD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,KAA4C,CAAC;IACpE,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7C,QAAQ,CAAC,IAAI,CAAC;oBACZ,QAAQ,EAAE,MAAM;oBAChB,IAAI,EAAE,YAAY;oBAClB,OAAO,EAAE,SAAS,IAAI,QAAQ,KAAK,CAAC,MAAM,kBAAkB;oBAC5D,OAAO,EAAE,sCAAsC;iBAChD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,OAAO,CAAC,QAAwB;IAC9C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,gDAAgD;IAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM;QACjC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAChD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;iBACI,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;gBAChB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;oBAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QACD,IAAI,CAAC,OAAO;YAAE,MAAM;IACtB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC9B,CAAC"}
|