@gird/ccli 2.2.0 → 2.4.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 +28 -3
- package/dist/agent/mcp.js +128 -0
- package/dist/agent/mcp.js.map +1 -0
- package/dist/cli/args.js +5 -0
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/repl.js +26 -108
- package/dist/cli/repl.js.map +1 -1
- package/dist/cli/run.js +109 -0
- package/dist/cli/run.js.map +1 -0
- package/dist/cli/slash.js +21 -1
- package/dist/cli/slash.js.map +1 -1
- package/dist/config/config.js +7 -0
- package/dist/config/config.js.map +1 -1
- package/dist/index.js +78 -13
- package/dist/index.js.map +1 -1
- package/dist/tools/index.js +36 -2
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/shared.js +1 -1
- package/dist/tools/shared.js.map +1 -1
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -17,9 +17,12 @@ npm install -g @gird/ccli
|
|
|
17
17
|
## 用法
|
|
18
18
|
|
|
19
19
|
```bash
|
|
20
|
-
ccli
|
|
21
|
-
ccli --version
|
|
22
|
-
ccli --help
|
|
20
|
+
ccli # 进入交互式对话
|
|
21
|
+
ccli --version # 打印版本号
|
|
22
|
+
ccli --help # 打印帮助
|
|
23
|
+
ccli "用一句话介绍 CCLI" # 非交互式单次调用
|
|
24
|
+
cat file.ts | ccli "给这段代码加注释" # 从 stdin 读取内容作为上下文
|
|
25
|
+
ccli --yes "在当前目录创建 test.txt" # 自动确认破坏性工具调用
|
|
23
26
|
```
|
|
24
27
|
|
|
25
28
|
进入对话后：
|
|
@@ -28,9 +31,11 @@ ccli --help # 打印帮助
|
|
|
28
31
|
- 模型可调用的工具：读文件、列目录、搜索代码、写文件、局部编辑文件、执行 shell 命令（写入/编辑/执行操作会请你确认）。
|
|
29
32
|
- `/help` 查看可用命令，`/clear` 清空历史，`/undo [n]` 撤销最近 n 轮对话。
|
|
30
33
|
- `/save [name]` 保存当前会话，`/load <name>` 加载会话（按 `Tab` 补全/列出候选），`/sessions` 列出已保存会话。
|
|
34
|
+
- `/resume` 手动恢复上次退出时自动保存的会话。
|
|
31
35
|
- `/stats` 查看当前会话累计 token 消耗与上下文占比（估算值）。
|
|
32
36
|
- 按 `↑` / `↓` recalled 之前输入过的 prompt / 命令，历史自动保存到 `~/.ccli/history`。
|
|
33
37
|
- 粘贴多行文本时会自动合并成一条消息发送，不会被截断。
|
|
38
|
+
- 支持 MCP (Model Context Protocol) 扩展：在 `~/.ccli/config.json` 配置 `mcpServers` 即可接入外部 server 的工具。
|
|
34
39
|
- 退出时自动保存 `last` 恢复点；下次启动会询问是否恢复上次会话。
|
|
35
40
|
- `/exit` 或 `/quit` 退出，也可按 Ctrl-C / Ctrl-D。
|
|
36
41
|
|
|
@@ -55,6 +60,26 @@ export ANTHROPIC_MODEL=claude-sonnet-4-5
|
|
|
55
60
|
# 可选：ANTHROPIC_BASE_URL
|
|
56
61
|
```
|
|
57
62
|
|
|
63
|
+
**MCP 扩展**
|
|
64
|
+
|
|
65
|
+
在 `~/.ccli/config.json` 中配置 `mcpServers`，即可接入外部 MCP server 的工具：
|
|
66
|
+
|
|
67
|
+
```json
|
|
68
|
+
{
|
|
69
|
+
"provider": "openai",
|
|
70
|
+
"model": "qwen-plus",
|
|
71
|
+
"apiKey": "sk-...",
|
|
72
|
+
"mcpServers": {
|
|
73
|
+
"filesystem": {
|
|
74
|
+
"command": "npx",
|
|
75
|
+
"args": ["-y", "@modelcontextprotocol/server-filesystem", "/Users/grid/Desktop"]
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
```
|
|
80
|
+
|
|
81
|
+
配置后，MCP server 提供的工具会以 `mcp__<server>__<tool>` 的形式供模型调用。
|
|
82
|
+
|
|
58
83
|
## 许可
|
|
59
84
|
|
|
60
85
|
[MIT](./LICENSE)
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* MCP (Model Context Protocol) 客户端封装。
|
|
3
|
+
*
|
|
4
|
+
* 负责连接配置中声明的 stdio MCP server，把它们的 tools 汇总给 CCLI 使用，
|
|
5
|
+
* 并在调用时按 tool 名前缀路由到对应 server。
|
|
6
|
+
*/
|
|
7
|
+
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
8
|
+
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
9
|
+
const MCP_TOOL_PREFIX = 'mcp__';
|
|
10
|
+
/** 把 server 内的 tool 名映射为 CCLI 全局唯一名。 */
|
|
11
|
+
export function mcpToolName(serverName, originalName) {
|
|
12
|
+
return `${MCP_TOOL_PREFIX}${serverName}__${originalName}`;
|
|
13
|
+
}
|
|
14
|
+
/** 解析 CCLI tool 名，返回 server 名和原始 tool 名。 */
|
|
15
|
+
export function parseMcpToolName(name) {
|
|
16
|
+
if (!name.startsWith(MCP_TOOL_PREFIX))
|
|
17
|
+
return null;
|
|
18
|
+
const rest = name.slice(MCP_TOOL_PREFIX.length);
|
|
19
|
+
const sepIndex = rest.indexOf('__');
|
|
20
|
+
if (sepIndex === -1)
|
|
21
|
+
return null;
|
|
22
|
+
return {
|
|
23
|
+
serverName: rest.slice(0, sepIndex),
|
|
24
|
+
originalName: rest.slice(sepIndex + 2),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
/** MCP client 管理器：连接、列工具、调用、关闭。 */
|
|
28
|
+
export class McpClientManager {
|
|
29
|
+
serversConfig;
|
|
30
|
+
clientInfo;
|
|
31
|
+
servers = [];
|
|
32
|
+
constructor(serversConfig, clientInfo) {
|
|
33
|
+
this.serversConfig = serversConfig;
|
|
34
|
+
this.clientInfo = clientInfo;
|
|
35
|
+
}
|
|
36
|
+
/** 启动所有配置的 MCP server。失败的服务会记录但不会阻塞其他服务。 */
|
|
37
|
+
async connectAll() {
|
|
38
|
+
const errors = [];
|
|
39
|
+
for (const [name, cfg] of Object.entries(this.serversConfig)) {
|
|
40
|
+
try {
|
|
41
|
+
const client = new Client({ name: this.clientInfo.name, version: this.clientInfo.version }, { capabilities: {} });
|
|
42
|
+
const transport = new StdioClientTransport({
|
|
43
|
+
command: cfg.command,
|
|
44
|
+
args: cfg.args ?? [],
|
|
45
|
+
env: cfg.env,
|
|
46
|
+
});
|
|
47
|
+
await client.connect(transport);
|
|
48
|
+
this.servers.push({ name, client, transport });
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
errors.push(`[${name}] ${e?.message ?? String(e)}`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return errors;
|
|
55
|
+
}
|
|
56
|
+
/** 列出所有已连接 server 提供的 tools。 */
|
|
57
|
+
async listTools() {
|
|
58
|
+
const tools = [];
|
|
59
|
+
for (const server of this.servers) {
|
|
60
|
+
try {
|
|
61
|
+
const response = await server.client.listTools();
|
|
62
|
+
for (const tool of response.tools) {
|
|
63
|
+
tools.push({
|
|
64
|
+
name: mcpToolName(server.name, tool.name),
|
|
65
|
+
description: `[${server.name}] ${tool.description ?? ''}`.trim(),
|
|
66
|
+
parameters: tool.inputSchema,
|
|
67
|
+
serverName: server.name,
|
|
68
|
+
originalName: tool.name,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
// 单个 server 列工具失败不影响其他
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return tools;
|
|
77
|
+
}
|
|
78
|
+
/** 调用指定 CCLI tool 名对应的 MCP tool。 */
|
|
79
|
+
async callTool(name, argsJson) {
|
|
80
|
+
const parsed = parseMcpToolName(name);
|
|
81
|
+
if (!parsed) {
|
|
82
|
+
return `错误：${name} 不是有效的 MCP tool 名。`;
|
|
83
|
+
}
|
|
84
|
+
const { serverName, originalName } = parsed;
|
|
85
|
+
const server = this.servers.find((s) => s.name === serverName);
|
|
86
|
+
if (!server) {
|
|
87
|
+
return `错误：MCP server "${serverName}" 未连接。`;
|
|
88
|
+
}
|
|
89
|
+
let args;
|
|
90
|
+
try {
|
|
91
|
+
args = JSON.parse(argsJson || '{}');
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
return `错误：tool 参数不是合法 JSON。`;
|
|
95
|
+
}
|
|
96
|
+
try {
|
|
97
|
+
const result = await server.client.callTool({
|
|
98
|
+
name: originalName,
|
|
99
|
+
arguments: args,
|
|
100
|
+
});
|
|
101
|
+
return mcpResultToString(result.content);
|
|
102
|
+
}
|
|
103
|
+
catch (e) {
|
|
104
|
+
return `错误：${e?.message ?? String(e)}`;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
/** 关闭所有 MCP server 连接。 */
|
|
108
|
+
async closeAll() {
|
|
109
|
+
for (const server of this.servers) {
|
|
110
|
+
try {
|
|
111
|
+
await server.client.close();
|
|
112
|
+
}
|
|
113
|
+
catch {
|
|
114
|
+
// 忽略关闭失败
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
this.servers = [];
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
/** 把 MCP tool 返回的 content 数组转成字符串。 */
|
|
121
|
+
function mcpResultToString(content) {
|
|
122
|
+
if (!content || content.length === 0)
|
|
123
|
+
return '';
|
|
124
|
+
return content
|
|
125
|
+
.map((item) => (item.type === 'text' ? item.text ?? '' : JSON.stringify(item)))
|
|
126
|
+
.join('\n');
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=mcp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/agent/mcp.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/args.js
CHANGED
|
@@ -8,6 +8,7 @@ export function parseArgs(argv) {
|
|
|
8
8
|
const result = {
|
|
9
9
|
version: false,
|
|
10
10
|
help: false,
|
|
11
|
+
yes: false,
|
|
11
12
|
unknown: [],
|
|
12
13
|
positionals: [],
|
|
13
14
|
};
|
|
@@ -21,6 +22,10 @@ export function parseArgs(argv) {
|
|
|
21
22
|
case '--help':
|
|
22
23
|
result.help = true;
|
|
23
24
|
break;
|
|
25
|
+
case '-y':
|
|
26
|
+
case '--yes':
|
|
27
|
+
result.yes = true;
|
|
28
|
+
break;
|
|
24
29
|
default:
|
|
25
30
|
if (arg.startsWith('-')) {
|
|
26
31
|
result.unknown.push(arg);
|
package/dist/cli/args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,MAAM,UAAU,SAAS,CAAC,IAAc;IACpC,MAAM,MAAM,GAAe;QACvB,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,EAAE;KAClB,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,QAAQ,GAAG,EAAE,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,WAAW;gBACZ,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,MAAM;YACV,KAAK,IAAI,CAAC;YACV,KAAK,QAAQ;gBACT,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;gBACnB,MAAM;YACV,KAAK,IAAI,CAAC;YACV,KAAK,OAAO;gBACR,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;gBAClB,MAAM;YACV;gBACI,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC7B,CAAC;qBAAM,CAAC;oBACJ,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjC,CAAC;QACT,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
package/dist/cli/repl.js
CHANGED
|
@@ -10,11 +10,13 @@ import { NAME, VERSION } from '../version.js';
|
|
|
10
10
|
import { loadConfig, maskKey } from '../config/config.js';
|
|
11
11
|
import { createAIClient } from '../agent/ai.js';
|
|
12
12
|
import { handleSlash, slashCompleter } from './slash.js';
|
|
13
|
-
import {
|
|
14
|
-
import { hasLastSession, loadLastSession, saveLastSession, clearLastSession, } from './session.js';
|
|
13
|
+
import { saveLastSession } from './session.js';
|
|
15
14
|
import { appendHistory, loadHistory } from './history.js';
|
|
16
15
|
import { InputBuffer } from './input.js';
|
|
17
|
-
import {
|
|
16
|
+
import { McpClientManager } from '../agent/mcp.js';
|
|
17
|
+
import { registerMcpTools, resetTools } from '../tools/index.js';
|
|
18
|
+
import { emptyStats, formatStats, } from './stats.js';
|
|
19
|
+
import { runAgentTurn } from './run.js';
|
|
18
20
|
const PROMPT = '› ';
|
|
19
21
|
const SYSTEM_PROMPT = '你是 CCLI，一个运行在终端里的 AI 助手。回答简洁、准确，使用中文。' +
|
|
20
22
|
'你可以调用工具读文件、列目录、搜索（read_file / list_dir / grep），' +
|
|
@@ -22,90 +24,6 @@ const SYSTEM_PROMPT = '你是 CCLI，一个运行在终端里的 AI 助手。回
|
|
|
22
24
|
'需要查看或修改文件、运行测试/构建/命令时请调用工具，不要凭空猜测。';
|
|
23
25
|
/** 单个用户回合内，最多允许模型连续调用工具的轮数，防止失控循环。 */
|
|
24
26
|
const MAX_TOOL_ROUNDS = 10;
|
|
25
|
-
/** 用 readline 提一个问题，返回用户输入。 */
|
|
26
|
-
function question(rl, prompt) {
|
|
27
|
-
return new Promise((resolve) => {
|
|
28
|
-
rl.question(prompt, (ans) => resolve(ans));
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
/**
|
|
32
|
-
* 解析工具参数用于预览；失败则返回空对象（真正执行时 executeTool 会再报错）。
|
|
33
|
-
*/
|
|
34
|
-
function safeParse(argsJson) {
|
|
35
|
-
try {
|
|
36
|
-
return JSON.parse(argsJson || '{}');
|
|
37
|
-
}
|
|
38
|
-
catch {
|
|
39
|
-
return {};
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
/**
|
|
43
|
-
* 驱动一个用户回合：请求模型 → 若它要调用工具则（必要时确认后）执行并回传 → 再请求 …
|
|
44
|
-
* 直到模型不再调用工具（给出最终回答）或达到轮数上限。
|
|
45
|
-
*/
|
|
46
|
-
async function runAgentTurn(ai, history, confirm, stats) {
|
|
47
|
-
for (let round = 0; round < MAX_TOOL_ROUNDS; round++) {
|
|
48
|
-
const turn = await ai.chat(history, (delta) => process.stdout.write(delta));
|
|
49
|
-
// 优先使用后端返回的真实 usage；不支持时降级为字符估算
|
|
50
|
-
if (turn.usage) {
|
|
51
|
-
stats.promptTokens += turn.usage.promptTokens;
|
|
52
|
-
stats.completionTokens += turn.usage.completionTokens;
|
|
53
|
-
stats.totalTokens += turn.usage.totalTokens;
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
const promptTokens = estimatePromptTokens(history);
|
|
57
|
-
const completionTokens = estimateTokens(turn.content);
|
|
58
|
-
stats.promptTokens += promptTokens;
|
|
59
|
-
stats.completionTokens += completionTokens;
|
|
60
|
-
stats.totalTokens += promptTokens + completionTokens;
|
|
61
|
-
}
|
|
62
|
-
// 没有工具调用 → 这是最终回答，收尾退出
|
|
63
|
-
if (turn.toolCalls.length === 0) {
|
|
64
|
-
process.stdout.write('\n');
|
|
65
|
-
history.push({ role: 'assistant', content: turn.content });
|
|
66
|
-
return;
|
|
67
|
-
}
|
|
68
|
-
// 有工具调用：先把带 tool_calls 的 assistant 消息入历史
|
|
69
|
-
history.push({
|
|
70
|
-
role: 'assistant',
|
|
71
|
-
content: turn.content || null,
|
|
72
|
-
tool_calls: turn.toolCalls.map((tc) => ({
|
|
73
|
-
id: tc.id,
|
|
74
|
-
type: 'function',
|
|
75
|
-
function: { name: tc.name, arguments: tc.arguments },
|
|
76
|
-
})),
|
|
77
|
-
});
|
|
78
|
-
// 逐个执行工具，结果以 role:'tool' 消息回传
|
|
79
|
-
for (const tc of turn.toolCalls) {
|
|
80
|
-
const tool = getTool(tc.name);
|
|
81
|
-
// 破坏性工具：执行前展示预览并请用户确认
|
|
82
|
-
if (tool?.needsConfirm) {
|
|
83
|
-
const preview = tool.preview
|
|
84
|
-
? tool.preview(safeParse(tc.arguments))
|
|
85
|
-
: `${tc.name}(${tc.arguments})`;
|
|
86
|
-
const approved = await confirm(preview);
|
|
87
|
-
if (!approved) {
|
|
88
|
-
console.log('已取消。');
|
|
89
|
-
history.push({
|
|
90
|
-
role: 'tool',
|
|
91
|
-
tool_call_id: tc.id,
|
|
92
|
-
content: '用户拒绝执行此操作。请勿重试，可询问用户希望如何继续。',
|
|
93
|
-
});
|
|
94
|
-
continue; // 不执行，继续下一个工具调用
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
console.log(`\n⚙ ${tc.name}(${tc.arguments})`);
|
|
98
|
-
const result = await executeTool(tc.name, tc.arguments);
|
|
99
|
-
history.push({
|
|
100
|
-
role: 'tool',
|
|
101
|
-
tool_call_id: tc.id,
|
|
102
|
-
content: result,
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
// 继续下一轮，让模型基于工具结果接着回答
|
|
106
|
-
}
|
|
107
|
-
console.log('\n（已达到工具调用轮数上限）');
|
|
108
|
-
}
|
|
109
27
|
export async function startRepl() {
|
|
110
28
|
// 启动即解析配置：缺失就明确报错退出，不进入循环
|
|
111
29
|
const result = loadConfig();
|
|
@@ -114,6 +32,22 @@ export async function startRepl() {
|
|
|
114
32
|
process.exit(1);
|
|
115
33
|
}
|
|
116
34
|
const { config } = result;
|
|
35
|
+
// 连接配置的 MCP server，把它们的 tools 注册到 CCLI
|
|
36
|
+
let mcp = null;
|
|
37
|
+
if (config.mcpServers && Object.keys(config.mcpServers).length > 0) {
|
|
38
|
+
resetTools();
|
|
39
|
+
mcp = new McpClientManager(config.mcpServers, {
|
|
40
|
+
name: NAME,
|
|
41
|
+
version: VERSION,
|
|
42
|
+
});
|
|
43
|
+
const errors = await mcp.connectAll();
|
|
44
|
+
if (errors.length > 0) {
|
|
45
|
+
console.error('部分 MCP server 连接失败：');
|
|
46
|
+
for (const e of errors)
|
|
47
|
+
console.error(` ${e}`);
|
|
48
|
+
}
|
|
49
|
+
await registerMcpTools(mcp);
|
|
50
|
+
}
|
|
117
51
|
const ai = createAIClient(config);
|
|
118
52
|
// 对话历史：以 system 提示词开场，之后累积 user / assistant 轮次
|
|
119
53
|
const history = [{ role: 'system', content: SYSTEM_PROMPT }];
|
|
@@ -128,25 +62,6 @@ export async function startRepl() {
|
|
|
128
62
|
});
|
|
129
63
|
console.log(`${NAME} v${VERSION}`);
|
|
130
64
|
console.log(`后端: ${config.provider} 模型: ${config.model} 密钥: ${maskKey(config.apiKey)}`);
|
|
131
|
-
// 如果有上次会话，询问是否恢复
|
|
132
|
-
if (hasLastSession()) {
|
|
133
|
-
const restore = await question(rl, '发现上次会话，是否恢复？(y/N) ');
|
|
134
|
-
if (restore.trim().toLowerCase() === 'y' || restore.trim() === 'yes') {
|
|
135
|
-
const loaded = loadLastSession();
|
|
136
|
-
if (loaded.ok) {
|
|
137
|
-
history.length = 0;
|
|
138
|
-
history.push(...loaded.history);
|
|
139
|
-
console.log(`已恢复上次会话（${loaded.history.length} 条消息）。`);
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
console.log(`恢复失败：${loaded.message}`);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
else {
|
|
146
|
-
clearLastSession();
|
|
147
|
-
console.log('已清空上次会话，开始新对话。');
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
65
|
console.log('进入交互式会话。输入 /help 查看命令，/exit 退出。\n');
|
|
151
66
|
rl.prompt();
|
|
152
67
|
// 请用户确认破坏性操作：展示预览 + 读一行 y/N（默认 N，更安全）
|
|
@@ -187,7 +102,7 @@ export async function startRepl() {
|
|
|
187
102
|
const mark = history.length; // 出错时回滚到这里，避免半截上下文
|
|
188
103
|
history.push({ role: 'user', content: input });
|
|
189
104
|
try {
|
|
190
|
-
await runAgentTurn(ai, history, confirm, stats);
|
|
105
|
+
await runAgentTurn({ ai, history, confirm, stats });
|
|
191
106
|
// 本回合结束，显示本次 token 消耗
|
|
192
107
|
console.log(`\n${formatStats(stats, ai.getModel())}`);
|
|
193
108
|
}
|
|
@@ -213,8 +128,11 @@ export async function startRepl() {
|
|
|
213
128
|
inputBuffer.push(line);
|
|
214
129
|
});
|
|
215
130
|
// Ctrl-D（EOF）或 rl.close() 触发
|
|
216
|
-
rl.on('close', () => {
|
|
131
|
+
rl.on('close', async () => {
|
|
217
132
|
saveLastSession(history);
|
|
133
|
+
if (mcp) {
|
|
134
|
+
await mcp.closeAll();
|
|
135
|
+
}
|
|
218
136
|
console.log('\n再见 👋');
|
|
219
137
|
process.exit(0);
|
|
220
138
|
});
|
package/dist/cli/repl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repl.js","sourceRoot":"","sources":["../../src/cli/repl.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"repl.js","sourceRoot":"","sources":["../../src/cli/repl.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/run.js
ADDED
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import { executeTool, getTool, registerMcpTools } from '../tools/index.js';
|
|
2
|
+
import { estimatePromptTokens, estimateTokens, } from './stats.js';
|
|
3
|
+
/** 单个用户回合内，最多允许模型连续调用工具的轮数，防止失控循环。 */
|
|
4
|
+
const MAX_TOOL_ROUNDS = 10;
|
|
5
|
+
/**
|
|
6
|
+
* 解析工具参数用于预览；失败则返回空对象（真正执行时 executeTool 会再报错）。
|
|
7
|
+
*/
|
|
8
|
+
function safeParse(argsJson) {
|
|
9
|
+
try {
|
|
10
|
+
return JSON.parse(argsJson || '{}');
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
return {};
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* 驱动一个用户回合：请求模型 → 若它要调用工具则（必要时确认后）执行并回传 → 再请求 …
|
|
18
|
+
* 直到模型不再调用工具（给出最终回答）或达到轮数上限。
|
|
19
|
+
*/
|
|
20
|
+
export async function runAgentTurn(options) {
|
|
21
|
+
const { ai, history, confirm, stats, print = process.stdout.write.bind(process.stdout) } = options;
|
|
22
|
+
for (let round = 0; round < MAX_TOOL_ROUNDS; round++) {
|
|
23
|
+
const turn = await ai.chat(history, (delta) => print(delta));
|
|
24
|
+
// 优先使用后端返回的真实 usage；不支持时降级为字符估算
|
|
25
|
+
if (turn.usage) {
|
|
26
|
+
stats.promptTokens += turn.usage.promptTokens;
|
|
27
|
+
stats.completionTokens += turn.usage.completionTokens;
|
|
28
|
+
stats.totalTokens += turn.usage.totalTokens;
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
const promptTokens = estimatePromptTokens(history);
|
|
32
|
+
const completionTokens = estimateTokens(turn.content);
|
|
33
|
+
stats.promptTokens += promptTokens;
|
|
34
|
+
stats.completionTokens += completionTokens;
|
|
35
|
+
stats.totalTokens += promptTokens + completionTokens;
|
|
36
|
+
}
|
|
37
|
+
// 没有工具调用 → 这是最终回答，收尾退出
|
|
38
|
+
if (turn.toolCalls.length === 0) {
|
|
39
|
+
print('\n');
|
|
40
|
+
history.push({ role: 'assistant', content: turn.content });
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
// 有工具调用：先把带 tool_calls 的 assistant 消息入历史
|
|
44
|
+
history.push({
|
|
45
|
+
role: 'assistant',
|
|
46
|
+
content: turn.content || null,
|
|
47
|
+
tool_calls: turn.toolCalls.map((tc) => ({
|
|
48
|
+
id: tc.id,
|
|
49
|
+
type: 'function',
|
|
50
|
+
function: { name: tc.name, arguments: tc.arguments },
|
|
51
|
+
})),
|
|
52
|
+
});
|
|
53
|
+
// 逐个执行工具，结果以 role:'tool' 消息回传
|
|
54
|
+
for (const tc of turn.toolCalls) {
|
|
55
|
+
const tool = getTool(tc.name);
|
|
56
|
+
// 破坏性工具：执行前展示预览并请用户确认
|
|
57
|
+
if (tool?.needsConfirm) {
|
|
58
|
+
const preview = tool.preview
|
|
59
|
+
? tool.preview(safeParse(tc.arguments))
|
|
60
|
+
: `${tc.name}(${tc.arguments})`;
|
|
61
|
+
const approved = await confirm(preview);
|
|
62
|
+
if (!approved) {
|
|
63
|
+
print('\n已取消。\n');
|
|
64
|
+
history.push({
|
|
65
|
+
role: 'tool',
|
|
66
|
+
tool_call_id: tc.id,
|
|
67
|
+
content: '用户拒绝执行此操作。请勿重试，可询问用户希望如何继续。',
|
|
68
|
+
});
|
|
69
|
+
continue; // 不执行，继续下一个工具调用
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
print(`\n⚙ ${tc.name}(${tc.arguments})\n`);
|
|
73
|
+
const result = await executeTool(tc.name, tc.arguments);
|
|
74
|
+
history.push({
|
|
75
|
+
role: 'tool',
|
|
76
|
+
tool_call_id: tc.id,
|
|
77
|
+
content: result,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
// 继续下一轮，让模型基于工具结果接着回答
|
|
81
|
+
}
|
|
82
|
+
print('\n（已达到工具调用轮数上限）\n');
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* 非交互式单次调用。
|
|
86
|
+
* 以 systemPrompt 开场，把 prompt 作为 user 消息发送，执行一轮后返回。
|
|
87
|
+
*/
|
|
88
|
+
export async function runOnce(options) {
|
|
89
|
+
const { ai, prompt, confirm, print = process.stdout.write.bind(process.stdout), systemPrompt = '你是 CCLI，一个运行在终端里的 AI 助手。回答简洁、准确，使用中文。', mcpManager, } = options;
|
|
90
|
+
if (mcpManager) {
|
|
91
|
+
await registerMcpTools(mcpManager);
|
|
92
|
+
}
|
|
93
|
+
const history = [{ role: 'system', content: systemPrompt }];
|
|
94
|
+
history.push({ role: 'user', content: prompt });
|
|
95
|
+
let output = '';
|
|
96
|
+
const capturePrint = (chunk) => {
|
|
97
|
+
output += chunk;
|
|
98
|
+
print(chunk);
|
|
99
|
+
};
|
|
100
|
+
await runAgentTurn({
|
|
101
|
+
ai,
|
|
102
|
+
history,
|
|
103
|
+
confirm,
|
|
104
|
+
stats: { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
|
|
105
|
+
print: capturePrint,
|
|
106
|
+
});
|
|
107
|
+
return output;
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACH,oBAAoB,EACpB,cAAc,GAEjB,MAAM,YAAY,CAAC;AAEpB,sCAAsC;AACtC,MAAM,eAAe,GAAG,EAAE,CAAC;AAQ3B;;GAEG;AACH,SAAS,SAAS,CAAC,QAAgB;IAC/B,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAUD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,OAA4B;IAE5B,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC;IAEnG,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,eAAe,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,gCAAgC;QAChC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YAC9C,KAAK,CAAC,gBAAgB,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACtD,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;QAChD,CAAC;aAAM,CAAC;YACJ,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;YACnD,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtD,KAAK,CAAC,YAAY,IAAI,YAAY,CAAC;YACnC,KAAK,CAAC,gBAAgB,IAAI,gBAAgB,CAAC;YAC3C,KAAK,CAAC,WAAW,IAAI,YAAY,GAAG,gBAAgB,CAAC;QACzD,CAAC;QAED,uBAAuB;QACvB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3D,OAAO;QACX,CAAC;QAED,yCAAyC;QACzC,OAAO,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;YAC7B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACpC,EAAE,EAAE,EAAE,CAAC,EAAE;gBACT,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE;aACvD,CAAC,CAAC;SACN,CAAC,CAAC;QAEH,8BAA8B;QAC9B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE9B,sBAAsB;YACtB,IAAI,IAAI,EAAE,YAAY,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO;oBACxB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;oBACvC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,SAAS,GAAG,CAAC;gBACpC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;gBACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,KAAK,CAAC,UAAU,CAAC,CAAC;oBAClB,OAAO,CAAC,IAAI,CAAC;wBACT,IAAI,EAAE,MAAM;wBACZ,YAAY,EAAE,EAAE,CAAC,EAAE;wBACnB,OAAO,EAAE,6BAA6B;qBACzC,CAAC,CAAC;oBACH,SAAS,CAAC,gBAAgB;gBAC9B,CAAC;YACL,CAAC;YAED,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;YACxD,OAAO,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,EAAE,CAAC,EAAE;gBACnB,OAAO,EAAE,MAAM;aAClB,CAAC,CAAC;QACP,CAAC;QACD,sBAAsB;IAC1B,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAC/B,CAAC;AAWD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAuB;IACjD,MAAM,EACF,EAAE,EACF,MAAM,EACN,OAAO,EACP,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EACjD,YAAY,GAAG,uCAAuC,EACtD,UAAU,GACb,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,OAAO,GAAkB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3E,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,YAAY,GAAU,CAAC,KAAK,EAAE,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC;QAChB,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,YAAY,CAAC;QACf,EAAE;QACF,OAAO;QACP,OAAO;QACP,KAAK,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;QAC/D,KAAK,EAAE,YAAY;KACtB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
package/dist/cli/slash.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { saveSession, loadSession, listSessions, searchSessions } from './session.js';
|
|
1
|
+
import { saveSession, loadSession, listSessions, searchSessions, loadLastSession, hasLastSession, } from './session.js';
|
|
2
2
|
import { formatStats, resetStats } from './stats.js';
|
|
3
3
|
/** 命令清单：名称 → 说明，供 /help 展示，单一数据源。 */
|
|
4
4
|
const COMMANDS = [
|
|
@@ -10,6 +10,7 @@ const COMMANDS = [
|
|
|
10
10
|
['/load <name>', '加载会话；不完整时列出候选'],
|
|
11
11
|
['/sessions', '列出已保存的会话'],
|
|
12
12
|
['/stats', '查看本次会话 token 统计'],
|
|
13
|
+
['/resume', '恢复上次自动保存的会话'],
|
|
13
14
|
['/exit, /quit', '退出会话'],
|
|
14
15
|
];
|
|
15
16
|
/** /model 搜索时最多列出多少个候选，避免刷屏。 */
|
|
@@ -76,6 +77,9 @@ export async function handleSlash(input, ctx) {
|
|
|
76
77
|
case 'stats':
|
|
77
78
|
handleStats(ctx);
|
|
78
79
|
return true;
|
|
80
|
+
case 'resume':
|
|
81
|
+
handleResume(ctx);
|
|
82
|
+
return true;
|
|
79
83
|
case 'exit':
|
|
80
84
|
case 'quit':
|
|
81
85
|
ctx.requestExit();
|
|
@@ -244,6 +248,22 @@ function handleSessions() {
|
|
|
244
248
|
function handleStats(ctx) {
|
|
245
249
|
console.log(formatStats(ctx.stats, ctx.ai.getModel()));
|
|
246
250
|
}
|
|
251
|
+
/** /resume：手动恢复上次自动保存的会话。 */
|
|
252
|
+
function handleResume(ctx) {
|
|
253
|
+
if (!hasLastSession()) {
|
|
254
|
+
console.log('没有可恢复的 last 会话。');
|
|
255
|
+
return;
|
|
256
|
+
}
|
|
257
|
+
const loaded = loadLastSession();
|
|
258
|
+
if (loaded.ok) {
|
|
259
|
+
ctx.history.length = 0;
|
|
260
|
+
ctx.history.push(...loaded.history);
|
|
261
|
+
console.log(`已恢复上次会话（${loaded.history.length} 条消息）。`);
|
|
262
|
+
}
|
|
263
|
+
else {
|
|
264
|
+
console.log(`恢复失败：${loaded.message}`);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
247
267
|
function printHelp() {
|
|
248
268
|
console.log('可用命令：');
|
|
249
269
|
for (const [cmd, desc] of COMMANDS) {
|
package/dist/cli/slash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slash.js","sourceRoot":"","sources":["../../src/cli/slash.ts"],"names":[],"mappings":"AAOA,OAAO,
|
|
1
|
+
{"version":3,"file":"slash.js","sourceRoot":"","sources":["../../src/cli/slash.ts"],"names":[],"mappings":"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"}
|
package/dist/config/config.js
CHANGED
|
@@ -29,6 +29,7 @@ function loadGlobalConfig() {
|
|
|
29
29
|
apiKey: raw.apiKey,
|
|
30
30
|
baseURL: raw.baseURL,
|
|
31
31
|
model: raw.model,
|
|
32
|
+
mcpServers: raw.mcpServers,
|
|
32
33
|
};
|
|
33
34
|
}
|
|
34
35
|
catch {
|
|
@@ -60,6 +61,7 @@ export function loadConfig(cwd = process.cwd()) {
|
|
|
60
61
|
model: get('ANTHROPIC_MODEL') ??
|
|
61
62
|
get('CCLI_MODEL') ??
|
|
62
63
|
DEFAULT_MODEL.anthropic,
|
|
64
|
+
mcpServers: global.mcpServers,
|
|
63
65
|
},
|
|
64
66
|
};
|
|
65
67
|
}
|
|
@@ -74,6 +76,7 @@ export function loadConfig(cwd = process.cwd()) {
|
|
|
74
76
|
apiKey: qwenKey,
|
|
75
77
|
baseURL: get('QWEN_BASE_URL'),
|
|
76
78
|
model: get('QWEN_MODEL') ?? DEFAULT_MODEL.openai,
|
|
79
|
+
mcpServers: global.mcpServers,
|
|
77
80
|
},
|
|
78
81
|
};
|
|
79
82
|
}
|
|
@@ -90,6 +93,7 @@ export function loadConfig(cwd = process.cwd()) {
|
|
|
90
93
|
model: get('OPENAI_MODEL') ??
|
|
91
94
|
get('CCLI_MODEL') ??
|
|
92
95
|
DEFAULT_MODEL.openai,
|
|
96
|
+
mcpServers: global.mcpServers,
|
|
93
97
|
},
|
|
94
98
|
};
|
|
95
99
|
}
|
|
@@ -103,6 +107,7 @@ export function loadConfig(cwd = process.cwd()) {
|
|
|
103
107
|
apiKey: global.apiKey,
|
|
104
108
|
baseURL: global.baseURL,
|
|
105
109
|
model: global.model ?? DEFAULT_MODEL[global.provider],
|
|
110
|
+
mcpServers: global.mcpServers,
|
|
106
111
|
},
|
|
107
112
|
};
|
|
108
113
|
}
|
|
@@ -141,6 +146,8 @@ export function printConfig(cwd = process.cwd()) {
|
|
|
141
146
|
console.log(` 地址 (baseURL): ${config.baseURL ?? '（默认）'}`);
|
|
142
147
|
console.log(` 密钥 (apiKey): ${maskKey(config.apiKey)}`);
|
|
143
148
|
console.log(` 来源 (source): ${source}`);
|
|
149
|
+
const mcpNames = config.mcpServers ? Object.keys(config.mcpServers) : [];
|
|
150
|
+
console.log(` MCP servers: ${mcpNames.length > 0 ? mcpNames.join(', ') : '（未配置）'}`);
|
|
144
151
|
return 0;
|
|
145
152
|
}
|
|
146
153
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -2,16 +2,22 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* CCLI 入口。
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
* ccli --version / -v
|
|
7
|
-
* ccli --help / -h
|
|
8
|
-
* ccli
|
|
9
|
-
* ccli
|
|
5
|
+
* 支持三种模式：
|
|
6
|
+
* ccli --version / -v 打印版本号
|
|
7
|
+
* ccli --help / -h 打印本帮助
|
|
8
|
+
* ccli config 打印当前解析出的配置（诊断用，密钥打码）
|
|
9
|
+
* ccli "prompt" 非交互式单次调用
|
|
10
|
+
* echo xxx | ccli "prompt" 从 stdin 读取内容作为上下文
|
|
11
|
+
* ccli --yes "prompt" 非交互式下自动确认破坏性工具
|
|
12
|
+
* ccli 启动交互式会话
|
|
10
13
|
*/
|
|
11
14
|
import { parseArgs } from './cli/args.js';
|
|
12
15
|
import { NAME, VERSION } from './version.js';
|
|
13
16
|
import { startRepl } from './cli/repl.js';
|
|
14
|
-
import { printConfig } from './config/config.js';
|
|
17
|
+
import { printConfig, loadConfig } from './config/config.js';
|
|
18
|
+
import { createAIClient } from './agent/ai.js';
|
|
19
|
+
import { McpClientManager } from './agent/mcp.js';
|
|
20
|
+
import { runOnce } from './cli/run.js';
|
|
15
21
|
const HELP = `${NAME} v${VERSION}
|
|
16
22
|
|
|
17
23
|
用法:
|
|
@@ -23,12 +29,34 @@ const HELP = `${NAME} v${VERSION}
|
|
|
23
29
|
选项:
|
|
24
30
|
-v, --version 打印版本号
|
|
25
31
|
-h, --help 打印本帮助
|
|
32
|
+
-y, --yes 非交互式模式下自动确认破坏性工具调用
|
|
26
33
|
|
|
27
34
|
示例:
|
|
28
|
-
ccli
|
|
29
|
-
ccli config
|
|
30
|
-
ccli --version
|
|
35
|
+
ccli 启动交互式对话
|
|
36
|
+
ccli config 查看当前生效的后端 / 模型 / 密钥来源
|
|
37
|
+
ccli --version 查看版本
|
|
38
|
+
ccli "解释这段报错" 非交互式单次调用
|
|
39
|
+
cat file.ts | ccli "给这段代码加注释" 从 stdin 读取上下文
|
|
40
|
+
ccli --yes "在当前目录创建 test.txt" 自动确认工具调用
|
|
31
41
|
`;
|
|
42
|
+
/** 从 stdin 读取全部内容；若 stdin 是 TTY 则返回空字符串。 */
|
|
43
|
+
async function readStdin() {
|
|
44
|
+
if (process.stdin.isTTY) {
|
|
45
|
+
return '';
|
|
46
|
+
}
|
|
47
|
+
const chunks = [];
|
|
48
|
+
for await (const chunk of process.stdin) {
|
|
49
|
+
chunks.push(chunk);
|
|
50
|
+
}
|
|
51
|
+
return Buffer.concat(chunks).toString('utf8');
|
|
52
|
+
}
|
|
53
|
+
/** 把命令行 prompt 和 stdin 内容合并成最终 prompt。 */
|
|
54
|
+
function buildPrompt(promptFromArgs, stdinText) {
|
|
55
|
+
if (promptFromArgs && stdinText) {
|
|
56
|
+
return `${promptFromArgs}\n\n---\n${stdinText}`;
|
|
57
|
+
}
|
|
58
|
+
return promptFromArgs || stdinText;
|
|
59
|
+
}
|
|
32
60
|
async function main() {
|
|
33
61
|
// argv 前两个是 node 路径和脚本路径，从第 3 个起才是用户输入
|
|
34
62
|
const args = parseArgs(process.argv.slice(2));
|
|
@@ -50,10 +78,47 @@ async function main() {
|
|
|
50
78
|
if (command === 'config') {
|
|
51
79
|
process.exit(printConfig());
|
|
52
80
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
81
|
+
const promptFromArgs = args.positionals.join(' ').trim();
|
|
82
|
+
const stdinText = (await readStdin()).trim();
|
|
83
|
+
const prompt = buildPrompt(promptFromArgs, stdinText);
|
|
84
|
+
// 有 prompt 或 stdin 时，走非交互式单次调用
|
|
85
|
+
if (prompt) {
|
|
86
|
+
const result = loadConfig();
|
|
87
|
+
if (!result.ok) {
|
|
88
|
+
console.error(result.message);
|
|
89
|
+
process.exit(1);
|
|
90
|
+
}
|
|
91
|
+
const { config } = result;
|
|
92
|
+
const ai = createAIClient(config);
|
|
93
|
+
// 连接 MCP server
|
|
94
|
+
let mcp = null;
|
|
95
|
+
if (config.mcpServers && Object.keys(config.mcpServers).length > 0) {
|
|
96
|
+
mcp = new McpClientManager(config.mcpServers, {
|
|
97
|
+
name: NAME,
|
|
98
|
+
version: VERSION,
|
|
99
|
+
});
|
|
100
|
+
const errors = await mcp.connectAll();
|
|
101
|
+
if (errors.length > 0) {
|
|
102
|
+
console.error('部分 MCP server 连接失败：');
|
|
103
|
+
for (const e of errors)
|
|
104
|
+
console.error(` ${e}`);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
const confirm = args.yes
|
|
108
|
+
? () => Promise.resolve(true)
|
|
109
|
+
: async (preview) => {
|
|
110
|
+
console.error(`\n[非交互式模式] 需要确认以下操作，请添加 --yes 自动批准：\n${preview}`);
|
|
111
|
+
return false;
|
|
112
|
+
};
|
|
113
|
+
try {
|
|
114
|
+
await runOnce({ ai, prompt, confirm, mcpManager: mcp ?? undefined });
|
|
115
|
+
}
|
|
116
|
+
finally {
|
|
117
|
+
if (mcp) {
|
|
118
|
+
await mcp.closeAll();
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return;
|
|
57
122
|
}
|
|
58
123
|
// 无参数：进入交互式会话循环。
|
|
59
124
|
await startRepl();
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/index.js
CHANGED
|
@@ -7,6 +7,8 @@
|
|
|
7
7
|
* 工具分两类：
|
|
8
8
|
* 只读勘探（无副作用，直接放行）：read_file / list_dir / grep
|
|
9
9
|
* 有副作用（执行前需用户确认）：write_file / edit_file / bash
|
|
10
|
+
*
|
|
11
|
+
* 此外，通过 MCP (Model Context Protocol) 接入的外部工具名以 `mcp__` 开头。
|
|
10
12
|
*/
|
|
11
13
|
import { readFileTool } from './read-file.js';
|
|
12
14
|
import { listDirTool } from './list-dir.js';
|
|
@@ -14,8 +16,8 @@ import { grepTool } from './grep.js';
|
|
|
14
16
|
import { writeFileTool } from './write-file.js';
|
|
15
17
|
import { editFileTool } from './edit-file.js';
|
|
16
18
|
import { bashTool } from './bash.js';
|
|
17
|
-
/**
|
|
18
|
-
|
|
19
|
+
/** 内置工具集合。 */
|
|
20
|
+
const builtinTools = [
|
|
19
21
|
readFileTool,
|
|
20
22
|
listDirTool,
|
|
21
23
|
grepTool,
|
|
@@ -23,6 +25,38 @@ export const tools = [
|
|
|
23
25
|
editFileTool,
|
|
24
26
|
bashTool,
|
|
25
27
|
];
|
|
28
|
+
/** 当前已注册的工具（内置 + MCP）。 */
|
|
29
|
+
let tools = [...builtinTools];
|
|
30
|
+
/** 当前使用的 MCP client manager，用于执行 MCP tool。 */
|
|
31
|
+
let mcpManager = null;
|
|
32
|
+
/** 重新初始化工具表（可用于测试）。 */
|
|
33
|
+
export function resetTools() {
|
|
34
|
+
tools = [...builtinTools];
|
|
35
|
+
mcpManager = null;
|
|
36
|
+
}
|
|
37
|
+
/** 从 MCP manager 拉取 tools 并注册。 */
|
|
38
|
+
export async function registerMcpTools(manager) {
|
|
39
|
+
mcpManager = manager;
|
|
40
|
+
const mcpTools = await manager.listTools();
|
|
41
|
+
for (const t of mcpTools) {
|
|
42
|
+
const mcpTool = {
|
|
43
|
+
name: t.name,
|
|
44
|
+
description: t.description,
|
|
45
|
+
parameters: t.parameters,
|
|
46
|
+
needsConfirm: true, // MCP 工具默认需要确认，保护用户
|
|
47
|
+
preview: (args) => {
|
|
48
|
+
return `[${t.serverName}] ${t.originalName}\n参数：${JSON.stringify(args, null, 2)}`;
|
|
49
|
+
},
|
|
50
|
+
run: async (args) => {
|
|
51
|
+
if (!mcpManager) {
|
|
52
|
+
return `错误：MCP manager 未初始化。`;
|
|
53
|
+
}
|
|
54
|
+
return mcpManager.callTool(t.name, JSON.stringify(args));
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
tools.push(mcpTool);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
26
60
|
/** 按名字取工具（供代理循环做「是否需确认」判断）。 */
|
|
27
61
|
export function getTool(name) {
|
|
28
62
|
return tools.find((t) => t.name === name);
|
package/dist/tools/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/shared.js
CHANGED
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;AAiBH,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gird/ccli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"description": "CCLI —— 一步一步从零实现的代理型（Agentic）终端 AI 编程助手",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -49,6 +49,7 @@
|
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"@anthropic-ai/sdk": "^0.110.0",
|
|
52
|
+
"@modelcontextprotocol/sdk": "^1.29.0",
|
|
52
53
|
"openai": "^6.45.0"
|
|
53
54
|
}
|
|
54
55
|
}
|