@gird/ccli 2.13.2 → 2.15.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 +36 -2
- package/dist/agent/ai.js +63 -2
- package/dist/agent/ai.js.map +1 -1
- package/dist/cli/args/index.js +4 -0
- package/dist/cli/args/index.js.map +1 -1
- package/dist/cli/file-reference.js +23 -1
- package/dist/cli/file-reference.js.map +1 -1
- package/dist/cli/repl/index.js +49 -8
- package/dist/cli/repl/index.js.map +1 -1
- package/dist/cli/run/format.js +8 -2
- package/dist/cli/run/format.js.map +1 -1
- package/dist/cli/run/hooks.js +134 -0
- package/dist/cli/run/hooks.js.map +1 -0
- package/dist/cli/run/index.js +78 -6
- package/dist/cli/run/index.js.map +1 -1
- package/dist/cli/run/permissions.js +72 -10
- package/dist/cli/run/permissions.js.map +1 -1
- package/dist/cli/run/task.js +41 -6
- package/dist/cli/run/task.js.map +1 -1
- package/dist/cli/slash/mcp/mcp.js.map +1 -1
- package/dist/cli/slash/system/agent.js +2 -1
- package/dist/cli/slash/system/agent.js.map +1 -1
- package/dist/cli/slash/system/goal.js +2 -1
- package/dist/cli/slash/system/goal.js.map +1 -1
- package/dist/cli/slash/system/help.js +2 -0
- package/dist/cli/slash/system/help.js.map +1 -1
- package/dist/config/config.js +78 -19
- package/dist/config/config.js.map +1 -1
- package/dist/config/skills.js +253 -0
- package/dist/config/skills.js.map +1 -0
- package/dist/index.js +10 -1
- package/dist/index.js.map +1 -1
- package/dist/tools/bash-background.js +33 -1
- package/dist/tools/bash-background.js.map +1 -1
- package/dist/tools/bash.js +43 -3
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/edit-file.js +28 -2
- package/dist/tools/edit-file.js.map +1 -1
- package/dist/tools/glob.js +111 -0
- package/dist/tools/glob.js.map +1 -0
- package/dist/tools/index.js +25 -6
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/shared.js.map +1 -1
- package/dist/tools/skill-tool.js +69 -0
- package/dist/tools/skill-tool.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../src/config/skills.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -19,6 +19,9 @@ import { style } from './cli/style.js';
|
|
|
19
19
|
import { printConfig, loadConfig, getRolePrompt, DEFAULT_SYSTEM_PROMPT, resolveMaxStepsPerTurn, } from './config/config.js';
|
|
20
20
|
import { loadEnvFile } from './config/env.js';
|
|
21
21
|
import { loadMemories, appendMemories } from './config/memory.js';
|
|
22
|
+
import { loadSkills } from './config/skills.js';
|
|
23
|
+
import { registerTool } from './tools/index.js';
|
|
24
|
+
import { makeSkillTool } from './tools/skill-tool.js';
|
|
22
25
|
import { createAIClient } from './agent/ai.js';
|
|
23
26
|
import { McpClientManager } from './agent/mcp.js';
|
|
24
27
|
import { runOnce } from './cli/run/index.js';
|
|
@@ -36,6 +39,7 @@ const HELP = `${NAME} v${VERSION}
|
|
|
36
39
|
-h, --help 打印本帮助
|
|
37
40
|
-y, --yes 非交互式模式下自动确认破坏性工具调用
|
|
38
41
|
-r, --role <name> 非交互式模式下使用的系统提示词角色(默认 default)
|
|
42
|
+
--no-hooks 禁用所有生命周期钩子(忽略配置中的 hooks)
|
|
39
43
|
|
|
40
44
|
示例:
|
|
41
45
|
ccli 启动交互式对话
|
|
@@ -101,6 +105,10 @@ async function main() {
|
|
|
101
105
|
? getRolePrompt(args.role, config.roles)
|
|
102
106
|
: undefined;
|
|
103
107
|
const systemPrompt = appendMemories(rolePrompt ?? DEFAULT_SYSTEM_PROMPT, loadMemories(process.cwd()));
|
|
108
|
+
// 把可供模型调用的技能注册成 skill 工具(技能 v3)
|
|
109
|
+
const skillTool = makeSkillTool(loadSkills(process.cwd()));
|
|
110
|
+
if (skillTool)
|
|
111
|
+
registerTool(skillTool);
|
|
104
112
|
if (args.role &&
|
|
105
113
|
rolePrompt === undefined &&
|
|
106
114
|
args.role !== 'default') {
|
|
@@ -133,6 +141,7 @@ async function main() {
|
|
|
133
141
|
mcpManager: mcp ?? undefined,
|
|
134
142
|
systemPrompt,
|
|
135
143
|
configMaxSteps: resolveMaxStepsPerTurn(config),
|
|
144
|
+
hooks: args.noHooks ? undefined : config.hooks,
|
|
136
145
|
});
|
|
137
146
|
}
|
|
138
147
|
finally {
|
|
@@ -143,7 +152,7 @@ async function main() {
|
|
|
143
152
|
return;
|
|
144
153
|
}
|
|
145
154
|
// 无参数:进入交互式会话循环。
|
|
146
|
-
await startRepl();
|
|
155
|
+
await startRepl({ noHooks: args.noHooks });
|
|
147
156
|
}
|
|
148
157
|
main();
|
|
149
158
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACH,WAAW,EACX,UAAU,EACV,aAAa,EACb,qBAAqB,EACrB,sBAAsB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,IAAI,GAAG,GAAG,IAAI,KAAK,OAAO
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,17 @@
|
|
|
6
6
|
* 调用方可继续做事,随时用 bash_output 读取累计输出、查状态,用 kill_bash
|
|
7
7
|
* 主动终止。
|
|
8
8
|
*
|
|
9
|
-
*
|
|
9
|
+
* 进程表驻留在模块内存里(不持久化):运行中的进程随会话存续;已结束的进程
|
|
10
|
+
* 保留一小段供 bash_output 查看结果,之后按 TTL / 数量上限自动清理,避免
|
|
11
|
+
* 长会话下进程表无限增长。
|
|
10
12
|
*/
|
|
11
13
|
import { spawn } from 'node:child_process';
|
|
12
14
|
/** 单个进程 stdout/stderr 各自保留的尾部上限,避免长跑输出撑爆内存。 */
|
|
13
15
|
const MAX_BUF = 30_000;
|
|
16
|
+
/** 已结束进程的最大保留数量(超出时从最旧的开始丢弃)。 */
|
|
17
|
+
export const MAX_ENDED_PROCESSES = 20;
|
|
18
|
+
/** 已结束进程的保留时长(毫秒),超过即清理。 */
|
|
19
|
+
export const ENDED_PROCESS_TTL_MS = 10 * 60 * 1000;
|
|
14
20
|
/** 被信号终止时换算成的退出码(shell 惯例:128 + 信号序号)。 */
|
|
15
21
|
const SIGNAL_EXIT = {
|
|
16
22
|
SIGINT: 130,
|
|
@@ -36,8 +42,33 @@ function toInfo(p) {
|
|
|
36
42
|
endedAt: p.endedAt,
|
|
37
43
|
};
|
|
38
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* 清理已结束的进程记录:先丢超过 TTL 的,再按数量上限从最旧的开始丢。
|
|
47
|
+
* 运行中的进程永不清理。在 startBackground / listBackground 时触发,
|
|
48
|
+
* 保证长期 REPL 下进程表有界。
|
|
49
|
+
*/
|
|
50
|
+
function pruneEnded() {
|
|
51
|
+
const now = Date.now();
|
|
52
|
+
const ended = [...processes.values()]
|
|
53
|
+
.filter((p) => p.status !== 'running')
|
|
54
|
+
.sort((a, b) => (a.endedAt ?? 0) - (b.endedAt ?? 0));
|
|
55
|
+
const survivors = [];
|
|
56
|
+
for (const p of ended) {
|
|
57
|
+
if (p.endedAt !== null && now - p.endedAt > ENDED_PROCESS_TTL_MS) {
|
|
58
|
+
processes.delete(p.id);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
survivors.push(p);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
const overflow = survivors.length - MAX_ENDED_PROCESSES;
|
|
65
|
+
for (let i = 0; i < overflow; i++) {
|
|
66
|
+
processes.delete(survivors[i].id);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
39
69
|
/** 后台启动一条命令,立即返回进程快照(不等待结束)。 */
|
|
40
70
|
export function startBackground(command) {
|
|
71
|
+
pruneEnded();
|
|
41
72
|
const id = `bg_${++counter}`;
|
|
42
73
|
const shell = process.env.SHELL || '/bin/bash';
|
|
43
74
|
const child = spawn(shell, ['-c', command], {
|
|
@@ -80,6 +111,7 @@ export function getBackground(id) {
|
|
|
80
111
|
}
|
|
81
112
|
/** 列出全部后台进程快照。 */
|
|
82
113
|
export function listBackground() {
|
|
114
|
+
pruneEnded();
|
|
83
115
|
return [...processes.values()].map(toInfo);
|
|
84
116
|
}
|
|
85
117
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bash-background.js","sourceRoot":"","sources":["../../src/tools/bash-background.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"bash-background.js","sourceRoot":"","sources":["../../src/tools/bash-background.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/bash.js
CHANGED
|
@@ -5,13 +5,47 @@ const BASH_DEFAULT_TIMEOUT = 120_000;
|
|
|
5
5
|
const BASH_MAX_TIMEOUT = 600_000;
|
|
6
6
|
/** 命令输出上限,避免把海量输出塞进上下文。 */
|
|
7
7
|
const BASH_MAX_OUTPUT = 30_000;
|
|
8
|
+
/**
|
|
9
|
+
* 常驻/长跑命令的特征(服务器、watch、dev 等,永不自行退出)。
|
|
10
|
+
* 用于兜底:模型没显式设 background 时,自动把这类命令转后台,
|
|
11
|
+
* 避免前台同步等待直到超时被杀。
|
|
12
|
+
*/
|
|
13
|
+
const LONG_RUNNING_PATTERNS = [
|
|
14
|
+
// 静态 / 开发服务器
|
|
15
|
+
/\bhttp-server\b/,
|
|
16
|
+
/\blive-server\b/,
|
|
17
|
+
/\bserve\b/,
|
|
18
|
+
/\bvite\b/,
|
|
19
|
+
/\b(next|nuxt|astro|remix|gatsby)\s+dev\b/,
|
|
20
|
+
/\bwebpack(-dev-server)?\s+serve\b/,
|
|
21
|
+
/\bwebpack-dev-server\b/,
|
|
22
|
+
// 包管理器脚本约定:dev / start / serve / watch
|
|
23
|
+
/\b(npm|pnpm|yarn|bun)\s+(run\s+)?(dev|start|serve|watch)\b/,
|
|
24
|
+
// 文件监听 / 热重载
|
|
25
|
+
/\bnodemon\b/,
|
|
26
|
+
/\bts-node-dev\b/,
|
|
27
|
+
/\btsx\s+watch\b/,
|
|
28
|
+
/--watch(all)?\b/,
|
|
29
|
+
/\bvitest\b(?!\s+run)/, // vitest 默认 watch,vitest run 除外
|
|
30
|
+
/\btail\s+-f\b/,
|
|
31
|
+
// 其它语言的常见服务器
|
|
32
|
+
/\bpython3?\s+-m\s+http\.server\b/,
|
|
33
|
+
/\bphp\s+-S\b/,
|
|
34
|
+
/\b(flask\s+run|uvicorn|gunicorn)\b/,
|
|
35
|
+
/\brails\s+s(erver)?\b/,
|
|
36
|
+
];
|
|
37
|
+
/** 判断命令是否像「常驻/长跑」进程(服务器 / watch / dev)。 */
|
|
38
|
+
export function looksLongRunning(command) {
|
|
39
|
+
return LONG_RUNNING_PATTERNS.some((re) => re.test(command));
|
|
40
|
+
}
|
|
8
41
|
export const bashTool = {
|
|
9
42
|
name: 'bash',
|
|
10
43
|
description: '在当前工作目录执行 shell 命令。用于运行测试、构建、git、安装依赖等。' +
|
|
11
44
|
'不要用它读写文件——请用 read_file / write_file。避免交互式命令。' +
|
|
12
45
|
'执行前会请用户确认。' +
|
|
13
46
|
'设置 background: true 可在后台启动长跑进程(如 dev server),立即返回 id,' +
|
|
14
|
-
'之后用 bash_output 查看输出与状态。'
|
|
47
|
+
'之后用 bash_output 查看输出与状态。' +
|
|
48
|
+
'常驻命令(server / dev / watch 等)即使忘了设 background 也会被自动转后台。',
|
|
15
49
|
parameters: {
|
|
16
50
|
type: 'object',
|
|
17
51
|
properties: {
|
|
@@ -45,9 +79,15 @@ export const bashTool = {
|
|
|
45
79
|
const cmd = String(command || '');
|
|
46
80
|
if (!cmd)
|
|
47
81
|
return '错误:command 不能为空';
|
|
48
|
-
|
|
82
|
+
// 兜底:没显式指定 background 且命令像常驻进程时,自动转后台,
|
|
83
|
+
// 避免前台同步等待一个永不退出的服务器直到超时。显式 background:false 则尊重。
|
|
84
|
+
const autoBackground = background === undefined && looksLongRunning(cmd);
|
|
85
|
+
if (background || autoBackground) {
|
|
49
86
|
const proc = startBackground(cmd);
|
|
50
|
-
|
|
87
|
+
const prefix = autoBackground
|
|
88
|
+
? '检测到常驻命令,已自动在后台启动'
|
|
89
|
+
: '已在后台启动';
|
|
90
|
+
return (`${prefix}(id: ${proc.id})。\n` +
|
|
51
91
|
`用 bash_output({"id":"${proc.id}"}) 查看输出与状态;长跑进程不会被超时终止。`);
|
|
52
92
|
}
|
|
53
93
|
const limit = Math.min(Math.max(1, timeout ?? BASH_DEFAULT_TIMEOUT), BASH_MAX_TIMEOUT);
|
package/dist/tools/bash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,8BAA8B;AAC9B,MAAM,oBAAoB,GAAG,OAAO,CAAC;AACrC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AACjC,2BAA2B;AAC3B,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,CAAC,MAAM,QAAQ,GAAS;IAC1B,IAAI,EAAE,MAAM;IACZ,WAAW,EACP,yCAAyC;QACzC,8CAA8C;QAC9C,YAAY;QACZ,uDAAuD;QACvD,0BAA0B;
|
|
1
|
+
{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/edit-file.js
CHANGED
|
@@ -1,5 +1,32 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
|
+
function lineColumnOf(text, index) {
|
|
4
|
+
const before = text.slice(0, index);
|
|
5
|
+
const line = before.split('\n').length;
|
|
6
|
+
const lastLineBreak = before.lastIndexOf('\n');
|
|
7
|
+
const column = index - lastLineBreak;
|
|
8
|
+
return `${line}:${column}`;
|
|
9
|
+
}
|
|
10
|
+
function editNotFoundMessage(path, text, oldText) {
|
|
11
|
+
const trimmed = oldText.trim();
|
|
12
|
+
const hints = [
|
|
13
|
+
'错误:在文件中未找到 old_text,无法应用精确替换。',
|
|
14
|
+
`文件:${path}`,
|
|
15
|
+
'这通常是因为 old_text 与当前文件内容不完全一致(缩进、空格、换行或引号差异都会导致失败)。',
|
|
16
|
+
];
|
|
17
|
+
if (trimmed && trimmed !== oldText && text.includes(trimmed)) {
|
|
18
|
+
hints.push('提示:文件中能找到去掉首尾空白后的片段,可能是 old_text 首尾多了/少了换行或缩进。');
|
|
19
|
+
}
|
|
20
|
+
const firstLine = oldText.split(/\r?\n/, 1)[0]?.trim();
|
|
21
|
+
if (firstLine) {
|
|
22
|
+
const lineIndex = text.indexOf(firstLine);
|
|
23
|
+
if (lineIndex >= 0) {
|
|
24
|
+
hints.push(`提示:old_text 第一行可在 ${lineColumnOf(text, lineIndex)} 附近找到,但完整块不匹配;请 read_file 读取该位置附近内容后重试。`);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
hints.push('建议:先调用 read_file 获取目标区域的原文,复制完整连续片段作为 old_text;如果只知道关键词,可先用 grep/glob 定位文件和行号。');
|
|
28
|
+
return hints.join('\n');
|
|
29
|
+
}
|
|
3
30
|
export const editFileTool = {
|
|
4
31
|
name: 'edit_file',
|
|
5
32
|
description: '对已有文件做局部精确替换。old_text 必须在文件中唯一且精确匹配(含缩进/空白)。' +
|
|
@@ -51,8 +78,7 @@ export const editFileTool = {
|
|
|
51
78
|
}
|
|
52
79
|
const count = text.split(old_text).length - 1;
|
|
53
80
|
if (count === 0) {
|
|
54
|
-
return (
|
|
55
|
-
'请先 read_file 确认精确内容(含缩进和空白)。');
|
|
81
|
+
return editNotFoundMessage(path, text, old_text);
|
|
56
82
|
}
|
|
57
83
|
if (count > 1 && !replace_all) {
|
|
58
84
|
return `错误:old_text 出现了 ${count} 次,不唯一。请提供更多上下文,或设 replace_all=true。`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-file.js","sourceRoot":"","sources":["../../src/tools/edit-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,MAAM,CAAC,MAAM,YAAY,GAAS;IAC9B,IAAI,EAAE,WAAW;IACjB,WAAW,EACP,8CAA8C;QAC9C,qCAAqC;QACrC,YAAY;IAChB,UAAU,EAAE;QACR,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,IAAI,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,iBAAiB;aACjC;YACD,QAAQ,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,uBAAuB;aACvC;YACD,QAAQ,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,SAAS;aACzB;YACD,WAAW,EAAE;gBACT,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,oBAAoB;aACpC;SACJ;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC;KAC7C;IACD,YAAY,EAAE,IAAI;IAClB,OAAO,CAAC,EACJ,IAAI,EACJ,QAAQ,EACR,QAAQ,GAKX;QACG,OAAO;YACH,QAAQ,IAAI,EAAE;YACd,aAAa;YACb,QAAQ;YACR,aAAa;YACb,QAAQ;SACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,EACN,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,WAAW,GAMd;QACG,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC;YACD,IAAI,GAAG,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,aAAa,IAAI,IAAI,CAAC,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC;QACnD,CAAC;QAED,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxB,OAAO,gCAAgC,CAAC;QAC5C,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC9C,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YACd,OAAO,
|
|
1
|
+
{"version":3,"file":"edit-file.js","sourceRoot":"","sources":["../../src/tools/edit-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { readdirSync } from 'node:fs';
|
|
2
|
+
import { resolve, join, relative, sep } from 'node:path';
|
|
3
|
+
/** glob 最多返回多少条路径。 */
|
|
4
|
+
const MAX_RESULTS = 300;
|
|
5
|
+
/** 跳过的目录(与 grep 一致)。 */
|
|
6
|
+
const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', '.ccli']);
|
|
7
|
+
/**
|
|
8
|
+
* 把 glob 模式编译成正则(匹配以 / 分隔的相对路径)。
|
|
9
|
+
* 支持:`**`(跨任意层级)、`*`(单层内任意字符,不含 /)、`?`(单个非 / 字符)。
|
|
10
|
+
*/
|
|
11
|
+
export function globToRegExp(pattern) {
|
|
12
|
+
let re = '';
|
|
13
|
+
for (let i = 0; i < pattern.length; i++) {
|
|
14
|
+
const c = pattern[i];
|
|
15
|
+
if (c === '*') {
|
|
16
|
+
if (pattern[i + 1] === '*') {
|
|
17
|
+
// `**` → 任意层级;吃掉紧随的 `/`,让 `a/**/b` 也能匹配 `a/b`
|
|
18
|
+
i++;
|
|
19
|
+
if (pattern[i + 1] === '/')
|
|
20
|
+
i++;
|
|
21
|
+
re += '(?:.*/)?';
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
re += '[^/]*'; // 单层
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
else if (c === '?') {
|
|
28
|
+
re += '[^/]';
|
|
29
|
+
}
|
|
30
|
+
else if ('.+^${}()|[]\\'.includes(c)) {
|
|
31
|
+
re += '\\' + c; // 转义正则元字符
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
re += c;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return new RegExp('^' + re + '$');
|
|
38
|
+
}
|
|
39
|
+
/** 递归遍历目录下的所有文件(跳过 SKIP_DIRS),产出绝对路径。 */
|
|
40
|
+
function* walkFiles(dir) {
|
|
41
|
+
let entries;
|
|
42
|
+
try {
|
|
43
|
+
entries = readdirSync(dir, { withFileTypes: true });
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
for (const e of entries) {
|
|
49
|
+
const full = join(dir, e.name);
|
|
50
|
+
if (e.isDirectory()) {
|
|
51
|
+
if (!SKIP_DIRS.has(e.name))
|
|
52
|
+
yield* walkFiles(full);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
yield full;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
export const globTool = {
|
|
60
|
+
name: 'glob',
|
|
61
|
+
description: '按文件名/路径通配模式查找文件,返回匹配的文件路径列表。用于「按名字定位文件」' +
|
|
62
|
+
'(与按内容搜索的 grep 互补)。模式支持 `**`(任意层级目录)、`*`(单层任意字符)、' +
|
|
63
|
+
'`?`(单个字符),例如 `**/*.test.ts`、`src/**/*.tsx`。自动跳过 node_modules/.git/dist。',
|
|
64
|
+
parameters: {
|
|
65
|
+
type: 'object',
|
|
66
|
+
properties: {
|
|
67
|
+
pattern: {
|
|
68
|
+
type: 'string',
|
|
69
|
+
description: '通配模式,如 `**/*.ts`、`src/**/*.tsx`',
|
|
70
|
+
},
|
|
71
|
+
path: {
|
|
72
|
+
type: 'string',
|
|
73
|
+
description: '搜索根目录,默认当前目录(.)',
|
|
74
|
+
},
|
|
75
|
+
},
|
|
76
|
+
required: ['pattern'],
|
|
77
|
+
},
|
|
78
|
+
async run({ pattern, path = '.', }) {
|
|
79
|
+
const pat = String(pattern || '').trim();
|
|
80
|
+
if (!pat)
|
|
81
|
+
return '错误:pattern 不能为空';
|
|
82
|
+
let re;
|
|
83
|
+
try {
|
|
84
|
+
re = globToRegExp(pat);
|
|
85
|
+
}
|
|
86
|
+
catch (e) {
|
|
87
|
+
return `错误:非法模式 ${pat}(${e?.message})`;
|
|
88
|
+
}
|
|
89
|
+
const root = resolve(process.cwd(), path);
|
|
90
|
+
const matches = [];
|
|
91
|
+
let capped = false;
|
|
92
|
+
for (const file of walkFiles(root)) {
|
|
93
|
+
// 用相对根目录、正斜杠分隔的路径来匹配(跨平台一致)
|
|
94
|
+
const rel = relative(root, file).split(sep).join('/');
|
|
95
|
+
if (re.test(rel)) {
|
|
96
|
+
matches.push(relative(process.cwd(), file).split(sep).join('/'));
|
|
97
|
+
if (matches.length >= MAX_RESULTS) {
|
|
98
|
+
capped = true;
|
|
99
|
+
break;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
if (matches.length === 0)
|
|
104
|
+
return `没有匹配 “${pat}” 的文件。`;
|
|
105
|
+
matches.sort();
|
|
106
|
+
if (capped)
|
|
107
|
+
matches.push(`…(已达 ${MAX_RESULTS} 条上限,请缩小模式)`);
|
|
108
|
+
return matches.join('\n');
|
|
109
|
+
},
|
|
110
|
+
};
|
|
111
|
+
//# sourceMappingURL=glob.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../src/tools/glob.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/index.js
CHANGED
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
import { readFileTool } from './read-file.js';
|
|
15
15
|
import { listDirTool } from './list-dir.js';
|
|
16
16
|
import { grepTool } from './grep.js';
|
|
17
|
+
import { globTool } from './glob.js';
|
|
17
18
|
import { writeFileTool } from './write-file.js';
|
|
18
19
|
import { editFileTool } from './edit-file.js';
|
|
19
20
|
import { bashTool } from './bash.js';
|
|
@@ -25,6 +26,7 @@ const builtinTools = [
|
|
|
25
26
|
readFileTool,
|
|
26
27
|
listDirTool,
|
|
27
28
|
grepTool,
|
|
29
|
+
globTool,
|
|
28
30
|
writeFileTool,
|
|
29
31
|
editFileTool,
|
|
30
32
|
bashTool,
|
|
@@ -107,26 +109,43 @@ export function toolDefs(allowedNames) {
|
|
|
107
109
|
export function toolNames() {
|
|
108
110
|
return tools.map((t) => t.name);
|
|
109
111
|
}
|
|
112
|
+
function looksErrorOutput(output) {
|
|
113
|
+
const exitCode = output.match(/\[退出码 (\d+)\]/)?.[1];
|
|
114
|
+
if (exitCode !== undefined && exitCode !== '0')
|
|
115
|
+
return true;
|
|
116
|
+
return /^(错误|Error:|ERROR:|Tool ".*" failed|操作被 .* 拦截|用户拒绝执行)/.test(output.trimStart());
|
|
117
|
+
}
|
|
118
|
+
export function textToolResult(output, isError = looksErrorOutput(output)) {
|
|
119
|
+
return { output, isError };
|
|
120
|
+
}
|
|
121
|
+
function normalizeToolResult(result) {
|
|
122
|
+
if (typeof result === 'string')
|
|
123
|
+
return textToolResult(result);
|
|
124
|
+
return {
|
|
125
|
+
output: result.output ?? '',
|
|
126
|
+
isError: result.isError === true,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
110
129
|
/**
|
|
111
|
-
*
|
|
112
|
-
*
|
|
130
|
+
* 按名字执行工具,返回结构化结果。
|
|
131
|
+
* 任何错误都转成 ToolResult(让模型看到失败原因并自行决定下一步),而不是抛异常。
|
|
113
132
|
*/
|
|
114
133
|
export async function executeTool(name, argsJson, ctx) {
|
|
115
134
|
const tool = tools.find((t) => t.name === name);
|
|
116
135
|
if (!tool)
|
|
117
|
-
return `错误:未知工具 ${name}
|
|
136
|
+
return textToolResult(`错误:未知工具 ${name}`, true);
|
|
118
137
|
let args;
|
|
119
138
|
try {
|
|
120
139
|
args = JSON.parse(argsJson || '{}');
|
|
121
140
|
}
|
|
122
141
|
catch {
|
|
123
|
-
return `错误:参数不是合法 JSON:${argsJson}
|
|
142
|
+
return textToolResult(`错误:参数不是合法 JSON:${argsJson}`, true);
|
|
124
143
|
}
|
|
125
144
|
try {
|
|
126
|
-
return await tool.run(args, ctx);
|
|
145
|
+
return normalizeToolResult(await tool.run(args, ctx));
|
|
127
146
|
}
|
|
128
147
|
catch (e) {
|
|
129
|
-
return `错误:${e?.message ?? String(e)}
|
|
148
|
+
return textToolResult(`错误:${e?.message ?? String(e)}`, true);
|
|
130
149
|
}
|
|
131
150
|
}
|
|
132
151
|
//# sourceMappingURL=index.js.map
|
package/dist/tools/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/shared.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA;;GAEG;AA8DH,8BAA8B;AAC9B,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AAEnC,eAAe;AACf,MAAM,UAAU,SAAS,CAAC,IAAY;IAClC,OAAO,IAAI,CAAC,MAAM,GAAG,cAAc;QAC/B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG,YAAY;QAC9C,CAAC,CAAC,IAAI,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { getSkill, expandSkill } from '../config/skills.js';
|
|
2
|
+
/** 技能目录里单条描述的截断长度,防止一个技能撑大整个目录。 */
|
|
3
|
+
const CATALOG_DESC_MAX = 120;
|
|
4
|
+
/** 过滤出允许模型调用的技能。 */
|
|
5
|
+
export function modelInvocableSkills(skills) {
|
|
6
|
+
return skills.filter((s) => s.metadata.disableModelInvocation !== true);
|
|
7
|
+
}
|
|
8
|
+
function truncate(s, max) {
|
|
9
|
+
return s.length <= max ? s : s.slice(0, max - 1) + '…';
|
|
10
|
+
}
|
|
11
|
+
/** 生成给模型看的技能目录:只列顶层技能,描述截断,附 whenToUse。 */
|
|
12
|
+
function renderCatalog(topLevel) {
|
|
13
|
+
return topLevel
|
|
14
|
+
.map((s) => {
|
|
15
|
+
let line = `- ${s.name}:${truncate(s.description || '(无描述)', CATALOG_DESC_MAX)}`;
|
|
16
|
+
const whenToUse = s.metadata.whenToUse;
|
|
17
|
+
if (whenToUse) {
|
|
18
|
+
line += `\n 何时用:${truncate(whenToUse, CATALOG_DESC_MAX)}`;
|
|
19
|
+
}
|
|
20
|
+
return line;
|
|
21
|
+
})
|
|
22
|
+
.join('\n');
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* 用当前技能列表构造 skill 工具。返回 null 表示没有可供模型调用的技能。
|
|
26
|
+
* 目录只列**顶层技能**(子技能不入目录,避免规模化时膨胀,但仍可被调用);
|
|
27
|
+
* `name` 参数用 enum 约束(含子技能),避免模型瞎编技能名。
|
|
28
|
+
*/
|
|
29
|
+
export function makeSkillTool(skills) {
|
|
30
|
+
const invocable = modelInvocableSkills(skills);
|
|
31
|
+
if (invocable.length === 0)
|
|
32
|
+
return null;
|
|
33
|
+
// 目录只展示顶层技能;子技能由父技能引出,不占目录空间
|
|
34
|
+
const topLevel = invocable.filter((s) => !s.origin.isSubSkill);
|
|
35
|
+
const catalog = renderCatalog(topLevel.length > 0 ? topLevel : invocable);
|
|
36
|
+
return {
|
|
37
|
+
name: 'skill',
|
|
38
|
+
description: '调用一个预定义技能:技能是可复用的操作说明/流程模板,调用后会返回该技能的' +
|
|
39
|
+
'详细指令,你需要据此继续完成任务。当用户意图匹配某个技能时优先使用。\n' +
|
|
40
|
+
'可用技能:\n' +
|
|
41
|
+
catalog,
|
|
42
|
+
parameters: {
|
|
43
|
+
type: 'object',
|
|
44
|
+
properties: {
|
|
45
|
+
name: {
|
|
46
|
+
type: 'string',
|
|
47
|
+
enum: invocable.map((s) => s.name),
|
|
48
|
+
description: '要调用的技能名称',
|
|
49
|
+
},
|
|
50
|
+
input: {
|
|
51
|
+
type: 'string',
|
|
52
|
+
description: '传给技能的参数(代入技能正文的 $ARGUMENTS),可选',
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
required: ['name'],
|
|
56
|
+
},
|
|
57
|
+
async run({ name, input: args, }) {
|
|
58
|
+
if (!name)
|
|
59
|
+
return '错误:缺少 name 参数。';
|
|
60
|
+
const skill = getSkill(invocable, name);
|
|
61
|
+
if (!skill) {
|
|
62
|
+
const names = invocable.map((s) => s.name).join('、');
|
|
63
|
+
return `错误:未找到技能 ${name}。可用:${names}`;
|
|
64
|
+
}
|
|
65
|
+
return expandSkill(skill, args ?? '');
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=skill-tool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skill-tool.js","sourceRoot":"","sources":["../../src/tools/skill-tool.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gird/ccli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.15.0",
|
|
4
4
|
"description": "CCLI —— 一步一步从零实现的代理型(Agentic)终端 AI 编程助手",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"dev": "tsx src/index.ts",
|
|
18
18
|
"start": "node dist/index.js",
|
|
19
19
|
"typecheck": "tsc --noEmit -p tsconfig.json",
|
|
20
|
-
"test": "node --import tsx --test test
|
|
20
|
+
"test": "node --import tsx --test test/**/*.test.ts",
|
|
21
21
|
"smoke": "tsx scripts/smoke.ts",
|
|
22
22
|
"mcp:demo": "tsx examples/mcp-server/mcp-auth-server.ts",
|
|
23
23
|
"prepublishOnly": "npm run build"
|