@gird/ccli 2.8.0 → 2.10.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 +9 -0
- package/dist/cli/confirm-select.js +36 -13
- package/dist/cli/confirm-select.js.map +1 -1
- package/dist/cli/repl/index.js +45 -14
- package/dist/cli/repl/index.js.map +1 -1
- package/dist/cli/run/index.js +3 -2
- package/dist/cli/run/index.js.map +1 -1
- package/dist/cli/slash/index.js +9 -4
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/mcp/mcp.js +20 -19
- package/dist/cli/slash/mcp/mcp.js.map +1 -1
- package/dist/cli/slash/system/agent.js +16 -15
- package/dist/cli/slash/system/agent.js.map +1 -1
- package/dist/cli/slash/system/compact.js +11 -10
- package/dist/cli/slash/system/compact.js.map +1 -1
- package/dist/cli/slash/system/goal.js +14 -13
- package/dist/cli/slash/system/goal.js.map +1 -1
- package/dist/cli/slash/system/help.js +1 -0
- package/dist/cli/slash/system/help.js.map +1 -1
- package/dist/cli/slash/system/memories.js +44 -0
- package/dist/cli/slash/system/memories.js.map +1 -0
- package/dist/cli/style.js +53 -0
- package/dist/cli/style.js.map +1 -0
- package/dist/config/memory.js +139 -0
- package/dist/config/memory.js.map +1 -0
- package/dist/index.js +10 -8
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -26,6 +26,14 @@ ccli --yes "在当前目录创建 test.txt" # 自动确认破坏性工具调
|
|
|
26
26
|
ccli --role coder "review 这段代码" # 使用 coding 角色单次调用
|
|
27
27
|
```
|
|
28
28
|
|
|
29
|
+
**记忆**：CCLI 启动时会自动读取记忆文件并注入到系统提示，让它「懂你、也懂这个项目」——无需每次手动交代背景与约定。分三层，按「全局 → 项目根 → 子目录」顺序注入（越靠近当前目录越具体，权重越高）：
|
|
30
|
+
|
|
31
|
+
- **全局记忆** `~/.ccli/CCLI.md`（或 `AGENTS.md`）：跨所有项目的个人偏好。
|
|
32
|
+
- **项目记忆** 仓库根目录的 `CCLI.md`（或 `AGENTS.md`）：整个项目的说明与约定。
|
|
33
|
+
- **子目录记忆** 从 git 仓库根一路向下到当前目录，各级目录的 `CCLI.md`（或 `AGENTS.md`）会逐层叠加，适合 monorepo / 分层目录（例如在 `packages/web/` 里启动，会叠加「仓库根 `CCLI.md`」+「`packages/web/CCLI.md`」）。
|
|
34
|
+
|
|
35
|
+
对话里输入以 `#` 开头的一行，可把内容**追加进项目 `CCLI.md` 并立即生效**（不发给 AI），下次启动自动带上，例如 `# 本项目用 pnpm`。输入 `/memories` 可查看当前会话实际注入了哪些记忆（按层级列出）。
|
|
36
|
+
|
|
29
37
|
进入对话后：
|
|
30
38
|
|
|
31
39
|
- 直接输入即与 AI 对话，模型会记住上文（多轮对话）。
|
|
@@ -43,6 +51,7 @@ ccli --role coder "review 这段代码" # 使用 coding 角色单次调用
|
|
|
43
51
|
- `/role [name]` 切换或查看系统提示词角色（内置 `default`、`coder`，配置文件中可自定义）。
|
|
44
52
|
- 按 `↑` / `↓` recalled 之前输入过的 prompt / 命令，历史自动保存到 `~/.ccli/history`。
|
|
45
53
|
- 粘贴多行文本时会自动合并成一条消息发送，不会被截断。
|
|
54
|
+
- 终端输出使用统一的语义化颜色（标签、警告、错误、Agent/Goal 进度等）；设置 `NO_COLOR=1` 可关闭颜色，设置 `FORCE_COLOR=1` 可强制上色。
|
|
46
55
|
- 支持 MCP (Model Context Protocol) 扩展：在 `~/.ccli/config.json` 配置 `mcpServers` 即可接入外部 server 的工具。
|
|
47
56
|
- 退出时自动保存 `last` 恢复点；下次启动会询问是否恢复上次会话。
|
|
48
57
|
- `/exit` 或 `/quit` 退出，也可按 Ctrl-C / Ctrl-D。
|
|
@@ -5,18 +5,22 @@
|
|
|
5
5
|
* 非 TTY 环境降级为文字输入 y/N。
|
|
6
6
|
*/
|
|
7
7
|
import { emitKeypressEvents } from 'node:readline';
|
|
8
|
+
import { style } from './style.js';
|
|
9
|
+
function highlightOption(option, selected, highlight) {
|
|
10
|
+
return selected && highlight ? style.selected(option) : option;
|
|
11
|
+
}
|
|
8
12
|
/** 生成当前状态的显示字符串。 */
|
|
9
13
|
export function renderConfirmState(options) {
|
|
10
|
-
const { prompt, confirmed, confirmLabel, cancelLabel } = options;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
+
const { prompt, confirmed, confirmLabel, cancelLabel, highlight = false, } = options;
|
|
15
|
+
const confirmOption = confirmed ? `[${confirmLabel}]` : confirmLabel;
|
|
16
|
+
const cancelOption = confirmed ? cancelLabel : `[${cancelLabel}]`;
|
|
17
|
+
return `${prompt} ${highlightOption(confirmOption, confirmed, highlight)} ${highlightOption(cancelOption, !confirmed, highlight)}`;
|
|
14
18
|
}
|
|
15
19
|
/** 非 TTY 环境下使用的文字确认。 */
|
|
16
|
-
function fallbackTextConfirm(prompt) {
|
|
20
|
+
function fallbackTextConfirm(prompt, stdin, stdout) {
|
|
17
21
|
return new Promise((resolve) => {
|
|
18
|
-
|
|
19
|
-
|
|
22
|
+
stdout.write(`${prompt} (y/N) `);
|
|
23
|
+
stdin.once('data', (data) => {
|
|
20
24
|
const answer = data.toString().trim().toLowerCase();
|
|
21
25
|
resolve(answer === 'y' || answer === 'yes');
|
|
22
26
|
});
|
|
@@ -25,37 +29,56 @@ function fallbackTextConfirm(prompt) {
|
|
|
25
29
|
/**
|
|
26
30
|
* 用方向键选择确认/取消。
|
|
27
31
|
*
|
|
28
|
-
*
|
|
32
|
+
* 组件会临时接管 keypress 事件：接管前移除已有的 keypress 监听（例如 readline），
|
|
33
|
+
* 结束后再恢复，避免按键被多个消费者重复处理；若输入流此前被暂停，会临时恢复。
|
|
29
34
|
*/
|
|
30
35
|
export async function confirmSelect(options) {
|
|
31
|
-
const { prompt, defaultConfirm = false, confirmLabel = '执行', cancelLabel = '取消', } = options;
|
|
32
|
-
const stdin =
|
|
33
|
-
const stdout =
|
|
36
|
+
const { prompt, defaultConfirm = false, confirmLabel = '执行', cancelLabel = '取消', input = process.stdin, output = process.stdout, } = options;
|
|
37
|
+
const stdin = input;
|
|
38
|
+
const stdout = output;
|
|
34
39
|
if (!stdin.isTTY || !stdout.isTTY) {
|
|
35
|
-
return fallbackTextConfirm(prompt);
|
|
40
|
+
return fallbackTextConfirm(prompt, stdin, stdout);
|
|
36
41
|
}
|
|
37
42
|
return new Promise((resolve) => {
|
|
38
43
|
let confirmed = defaultConfirm;
|
|
39
44
|
const originalRawMode = stdin.isRaw;
|
|
45
|
+
const wasPaused = typeof stdin.isPaused === 'function'
|
|
46
|
+
? stdin.isPaused()
|
|
47
|
+
: false;
|
|
48
|
+
const existingKeypressListeners = stdin.listeners('keypress');
|
|
49
|
+
for (const listener of existingKeypressListeners) {
|
|
50
|
+
stdin.removeListener('keypress', listener);
|
|
51
|
+
}
|
|
40
52
|
stdin.setRawMode(true);
|
|
41
53
|
emitKeypressEvents(stdin);
|
|
54
|
+
if (wasPaused) {
|
|
55
|
+
stdin.resume();
|
|
56
|
+
}
|
|
42
57
|
function render() {
|
|
43
58
|
const line = renderConfirmState({
|
|
44
59
|
prompt,
|
|
45
60
|
confirmed,
|
|
46
61
|
confirmLabel,
|
|
47
62
|
cancelLabel,
|
|
63
|
+
highlight: true,
|
|
48
64
|
});
|
|
49
65
|
stdout.write(`\r\x1b[K${line}`);
|
|
50
66
|
}
|
|
51
67
|
function cleanup() {
|
|
52
68
|
stdin.setRawMode(originalRawMode ?? false);
|
|
53
69
|
stdin.removeListener('keypress', onKeypress);
|
|
70
|
+
for (const listener of existingKeypressListeners) {
|
|
71
|
+
stdin.on('keypress', listener);
|
|
72
|
+
}
|
|
73
|
+
if (wasPaused) {
|
|
74
|
+
stdin.pause();
|
|
75
|
+
}
|
|
54
76
|
}
|
|
55
77
|
function finish(value) {
|
|
56
78
|
cleanup();
|
|
57
79
|
const label = value ? confirmLabel : cancelLabel;
|
|
58
|
-
|
|
80
|
+
const chosen = style.selected(`[${label}]`);
|
|
81
|
+
stdout.write(`\r\x1b[K${prompt} ${chosen}\n`);
|
|
59
82
|
resolve(value);
|
|
60
83
|
}
|
|
61
84
|
function onKeypress(str, key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-select.js","sourceRoot":"","sources":["../../src/cli/confirm-select.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"confirm-select.js","sourceRoot":"","sources":["../../src/cli/confirm-select.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAiBnC,SAAS,eAAe,CAAC,MAAc,EAAE,QAAiB,EAAE,SAAkB;IAC1E,OAAO,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACnE,CAAC;AAED,oBAAoB;AACpB,MAAM,UAAU,kBAAkB,CAAC,OAOlC;IACG,MAAM,EACF,MAAM,EACN,SAAS,EACT,YAAY,EACZ,WAAW,EACX,SAAS,GAAG,KAAK,GACpB,GAAG,OAAO,CAAC;IACZ,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC;IACrE,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,GAAG,CAAC;IAElE,OAAO,GAAG,MAAM,IAAI,eAAe,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,eAAe,CAAC,YAAY,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;AACvI,CAAC;AAED,wBAAwB;AACxB,SAAS,mBAAmB,CACxB,MAAc,EACd,KAAwB,EACxB,MAA0B;IAE1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,SAAS,CAAC,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACpD,OAAO,CAAC,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,KAAK,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,OAA6B;IAE7B,MAAM,EACF,MAAM,EACN,cAAc,GAAG,KAAK,EACtB,YAAY,GAAG,IAAI,EACnB,WAAW,GAAG,IAAI,EAClB,KAAK,GAAG,OAAO,CAAC,KAAK,EACrB,MAAM,GAAG,OAAO,CAAC,MAAM,GAC1B,GAAG,OAAO,CAAC;IAEZ,MAAM,KAAK,GAAG,KAAK,CAAC;IACpB,MAAM,MAAM,GAAG,MAAM,CAAC;IAEtB,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,OAAO,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,SAAS,GAAG,cAAc,CAAC;QAE/B,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC;QACpC,MAAM,SAAS,GACX,OAAQ,KAAa,CAAC,QAAQ,KAAK,UAAU;YACzC,CAAC,CAAE,KAAa,CAAC,QAAQ,EAAE;YAC3B,CAAC,CAAC,KAAK,CAAC;QAChB,MAAM,yBAAyB,GAAG,KAAK,CAAC,SAAS,CAAC,UAAU,CAE3D,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,yBAAyB,EAAE,CAAC;YAC/C,KAAK,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvB,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,SAAS,EAAE,CAAC;YACZ,KAAK,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC;QAED,SAAS,MAAM;YACX,MAAM,IAAI,GAAG,kBAAkB,CAAC;gBAC5B,MAAM;gBACN,SAAS;gBACT,YAAY;gBACZ,WAAW;gBACX,SAAS,EAAE,IAAI;aAClB,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,SAAS,OAAO;YACZ,KAAK,CAAC,UAAU,CAAC,eAAe,IAAI,KAAK,CAAC,CAAC;YAC3C,KAAK,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC7C,KAAK,MAAM,QAAQ,IAAI,yBAAyB,EAAE,CAAC;gBAC/C,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACnC,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACZ,KAAK,CAAC,KAAK,EAAE,CAAC;YAClB,CAAC;QACL,CAAC;QAED,SAAS,MAAM,CAAC,KAAc;YAC1B,OAAO,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;YACjD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;YAC5C,MAAM,CAAC,KAAK,CAAC,WAAW,MAAM,IAAI,MAAM,IAAI,CAAC,CAAC;YAC9C,OAAO,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;QAED,SAAS,UAAU,CACf,GAAW,EACX,GAAyD;YAEzD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;gBAC/B,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;YAED,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;gBACf,KAAK,QAAQ,CAAC;gBACd,KAAK,OAAO;oBACR,MAAM,CAAC,SAAS,CAAC,CAAC;oBAClB,OAAO;gBACX,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO,CAAC;gBACb,KAAK,IAAI,CAAC;gBACV,KAAK,MAAM;oBACP,SAAS,GAAG,CAAC,SAAS,CAAC;oBACvB,MAAM,EAAE,CAAC;oBACT,OAAO;YACf,CAAC;YAED,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAChC,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;gBAChB,MAAM,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;iBAAM,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;gBACvB,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC;QACL,CAAC;QAED,MAAM,EAAE,CAAC;QACT,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/dist/cli/repl/index.js
CHANGED
|
@@ -6,10 +6,12 @@
|
|
|
6
6
|
* 支持优雅退出：/exit、/quit，或按 Ctrl-D（EOF）、Ctrl-C。
|
|
7
7
|
*/
|
|
8
8
|
import { createInterface } from 'node:readline';
|
|
9
|
-
import { join } from 'node:path';
|
|
9
|
+
import { join, relative } from 'node:path';
|
|
10
10
|
import { NAME, VERSION } from '../../version.js';
|
|
11
|
+
import { style } from '../style.js';
|
|
11
12
|
import { loadConfig, maskKey, DEFAULT_SYSTEM_PROMPT, getRolePrompt, } from '../../config/config.js';
|
|
12
13
|
import { loadEnvFile } from '../../config/env.js';
|
|
14
|
+
import { appendMemories, appendProjectMemory, loadMemories, SCOPE_LABEL, } from '../../config/memory.js';
|
|
13
15
|
import { createAIClient } from '../../agent/ai.js';
|
|
14
16
|
import { handleSlash, slashCompleter } from '../slash/index.js';
|
|
15
17
|
import { injectFileReferences, completeFileReference, } from '../file-reference.js';
|
|
@@ -29,7 +31,7 @@ export async function startRepl() {
|
|
|
29
31
|
// 启动即解析配置：缺失就明确报错退出，不进入循环
|
|
30
32
|
const result = loadConfig();
|
|
31
33
|
if (!result.ok) {
|
|
32
|
-
console.error(result.message);
|
|
34
|
+
console.error(style.error(result.message));
|
|
33
35
|
process.exit(1);
|
|
34
36
|
}
|
|
35
37
|
const { config } = result;
|
|
@@ -43,19 +45,30 @@ export async function startRepl() {
|
|
|
43
45
|
mcp = new McpClientManager(config.mcpServers, { name: NAME, version: VERSION }, envLookup);
|
|
44
46
|
const errors = await mcp.connectAll();
|
|
45
47
|
if (errors.length > 0) {
|
|
46
|
-
console.error('部分 MCP server 连接失败：');
|
|
48
|
+
console.error(style.error('部分 MCP server 连接失败：'));
|
|
47
49
|
for (const e of errors)
|
|
48
|
-
console.error(` ${e}`);
|
|
50
|
+
console.error(style.muted(` ${e}`));
|
|
49
51
|
}
|
|
50
52
|
await registerMcpTools(mcp);
|
|
51
53
|
}
|
|
52
54
|
const ai = createAIClient(config);
|
|
55
|
+
// 记忆分层：启动时读一次（全局 + 项目根 + 子目录），注入 system 提示；切换角色或 # 写入时重读
|
|
56
|
+
let memories = loadMemories(process.cwd());
|
|
53
57
|
// 对话历史：以 system 提示词开场，之后累积 user / assistant 轮次
|
|
54
58
|
const history = [
|
|
55
|
-
{
|
|
59
|
+
{
|
|
60
|
+
role: 'system',
|
|
61
|
+
content: appendMemories(DEFAULT_SYSTEM_PROMPT, memories),
|
|
62
|
+
},
|
|
56
63
|
];
|
|
57
64
|
let currentRole = 'default';
|
|
58
65
|
let stats = emptyStats();
|
|
66
|
+
/** 当前角色的 system 提示基础文本（不含记忆）。 */
|
|
67
|
+
const currentRoleBase = () => getRolePrompt(currentRole, config.roles) ?? DEFAULT_SYSTEM_PROMPT;
|
|
68
|
+
/** 用最新记忆重建 history[0] 的 system 提示（切角色、# 写入后调用）。 */
|
|
69
|
+
const refreshSystemPrompt = () => {
|
|
70
|
+
history[0].content = appendMemories(currentRoleBase(), memories);
|
|
71
|
+
};
|
|
59
72
|
/** 组合补全：优先斜杠命令，@ 开头时尝试文件引用补全。 */
|
|
60
73
|
const inputCompleter = (line) => {
|
|
61
74
|
if (line.includes('@')) {
|
|
@@ -73,9 +86,12 @@ export async function startRepl() {
|
|
|
73
86
|
history: loadHistory(),
|
|
74
87
|
historySize: 1000,
|
|
75
88
|
});
|
|
76
|
-
console.log(`${NAME} v${VERSION}`);
|
|
77
|
-
console.log(`后端: ${config.provider} 模型: ${config.model} 密钥: ${maskKey(config.apiKey)}`);
|
|
78
|
-
|
|
89
|
+
console.log(style.label(`${NAME} v${VERSION}`));
|
|
90
|
+
console.log(style.muted(`后端: ${config.provider} 模型: ${config.model} 密钥: ${maskKey(config.apiKey)}`));
|
|
91
|
+
for (const m of memories) {
|
|
92
|
+
console.log(style.success(`已加载${SCOPE_LABEL[m.scope]}：${m.file}`));
|
|
93
|
+
}
|
|
94
|
+
console.log(style.info('进入交互式会话。输入 /help 查看命令，/exit 退出。\n'));
|
|
79
95
|
rl.prompt();
|
|
80
96
|
// 请用户确认破坏性操作：展示预览 + 方向键选择（默认取消，更安全）
|
|
81
97
|
const confirm = async (preview) => {
|
|
@@ -98,6 +114,23 @@ export async function startRepl() {
|
|
|
98
114
|
async function processUserInput(input) {
|
|
99
115
|
// 非空输入追加到持久化历史（readline 内存历史已自动维护）
|
|
100
116
|
appendHistory(input);
|
|
117
|
+
// # 动态记忆写入：追加到项目 CCLI.md 并立即注入当前会话，不发给 AI
|
|
118
|
+
const hashInput = input.trimStart();
|
|
119
|
+
if (hashInput.startsWith('#')) {
|
|
120
|
+
const note = hashInput.slice(1).trim();
|
|
121
|
+
if (!note) {
|
|
122
|
+
console.log(style.muted('用法：# 要记住的内容，例如 # 本项目用 pnpm'));
|
|
123
|
+
rl.prompt();
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
const file = appendProjectMemory(note, process.cwd());
|
|
127
|
+
memories = loadMemories(process.cwd());
|
|
128
|
+
refreshSystemPrompt();
|
|
129
|
+
const display = relative(process.cwd(), file) || file;
|
|
130
|
+
console.log(style.success(`已记住（${display}）：${note}`));
|
|
131
|
+
rl.prompt();
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
101
134
|
// 把 @文件引用 解析并注入文件内容
|
|
102
135
|
const processedInput = injectFileReferences(input, process.cwd());
|
|
103
136
|
// 斜杠命令：交给 handleSlash，不发给 AI
|
|
@@ -115,9 +148,7 @@ export async function startRepl() {
|
|
|
115
148
|
currentRole,
|
|
116
149
|
setRole: (name) => {
|
|
117
150
|
currentRole = name;
|
|
118
|
-
|
|
119
|
-
getRolePrompt(name, config.roles) ??
|
|
120
|
-
DEFAULT_SYSTEM_PROMPT;
|
|
151
|
+
refreshSystemPrompt();
|
|
121
152
|
},
|
|
122
153
|
requestExit: () => {
|
|
123
154
|
exiting = true;
|
|
@@ -156,12 +187,12 @@ export async function startRepl() {
|
|
|
156
187
|
try {
|
|
157
188
|
await runAgentTurn({ ai, history, confirm, stats });
|
|
158
189
|
// 本回合结束，显示本次 token 消耗
|
|
159
|
-
console.log(`\n${formatStats(stats, ai.getModel())}`);
|
|
190
|
+
console.log(style.muted(`\n${formatStats(stats, ai.getModel())}`));
|
|
160
191
|
// 上下文接近上限时自动压缩，避免下一轮溢出
|
|
161
192
|
await autoCompactIfNeeded(ai, history, stats);
|
|
162
193
|
}
|
|
163
194
|
catch (e) {
|
|
164
|
-
console.error(`\n[请求失败] ${e?.message ?? e}`);
|
|
195
|
+
console.error(style.error(`\n[请求失败] ${e?.message ?? e}`));
|
|
165
196
|
history.length = mark; // 回滚本轮新增的所有消息
|
|
166
197
|
}
|
|
167
198
|
finally {
|
|
@@ -187,7 +218,7 @@ export async function startRepl() {
|
|
|
187
218
|
if (mcp) {
|
|
188
219
|
await mcp.closeAll();
|
|
189
220
|
}
|
|
190
|
-
console.log('\n再见 👋');
|
|
221
|
+
console.log(style.info('\n再见 👋'));
|
|
191
222
|
process.exit(0);
|
|
192
223
|
});
|
|
193
224
|
// Ctrl-C：关闭循环（进而触发 close）
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/repl/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/repl/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/run/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { style } from '../style.js';
|
|
1
2
|
import { executeTool, getTool, registerMcpTools } from '../../tools/index.js';
|
|
2
3
|
import { estimatePromptTokens, estimateTokens, } from '../stats/index.js';
|
|
3
4
|
/** 单个用户回合内，最多允许模型连续调用工具的轮数，防止失控循环。 */
|
|
@@ -74,7 +75,7 @@ export async function runAgentTurn(options) {
|
|
|
74
75
|
onToolCall(tc);
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
77
|
-
print(`\n⚙ ${tc.name}(${tc.arguments})\n`);
|
|
78
|
+
print(style.tool(`\n⚙ ${tc.name}(${tc.arguments})\n`));
|
|
78
79
|
}
|
|
79
80
|
const result = await executeTool(tc.name, tc.arguments);
|
|
80
81
|
if (onToolResult) {
|
|
@@ -88,7 +89,7 @@ export async function runAgentTurn(options) {
|
|
|
88
89
|
}
|
|
89
90
|
// 继续下一轮，让模型基于工具结果接着回答
|
|
90
91
|
}
|
|
91
|
-
print('\n（已达到工具调用轮数上限）\n');
|
|
92
|
+
print(style.warn('\n（已达到工具调用轮数上限）\n'));
|
|
92
93
|
}
|
|
93
94
|
/**
|
|
94
95
|
* 非交互式单次调用。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/run/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/run/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/slash/index.js
CHANGED
|
@@ -21,6 +21,8 @@ import { handleResume } from './session/resume.js';
|
|
|
21
21
|
import { handleRole } from './config/role.js';
|
|
22
22
|
import { handleMcp, reloadMcpServers } from './mcp/mcp.js';
|
|
23
23
|
import { handleCompact } from './system/compact.js';
|
|
24
|
+
import { handleMemories } from './system/memories.js';
|
|
25
|
+
import { style } from '../style.js';
|
|
24
26
|
/**
|
|
25
27
|
* readline 的 Tab 补全函数。
|
|
26
28
|
* 对斜杠命令和 /load 的会话名提供补全提示。
|
|
@@ -63,7 +65,7 @@ export async function handleSlash(input, ctx) {
|
|
|
63
65
|
// 保留第 0 条 system 提示，清掉其余历史
|
|
64
66
|
ctx.history.length = 1;
|
|
65
67
|
resetStats(ctx.stats);
|
|
66
|
-
console.log('（已清空对话历史和 token 统计）');
|
|
68
|
+
console.log(style.muted('（已清空对话历史和 token 统计）'));
|
|
67
69
|
return true;
|
|
68
70
|
case 'undo':
|
|
69
71
|
handleUndo(arg, ctx);
|
|
@@ -107,12 +109,15 @@ export async function handleSlash(input, ctx) {
|
|
|
107
109
|
case 'role':
|
|
108
110
|
handleRole(arg, ctx);
|
|
109
111
|
return true;
|
|
112
|
+
case 'memories':
|
|
113
|
+
handleMemories(arg, ctx);
|
|
114
|
+
return true;
|
|
110
115
|
case 'exit':
|
|
111
116
|
case 'quit':
|
|
112
117
|
ctx.requestExit();
|
|
113
118
|
return true;
|
|
114
119
|
default:
|
|
115
|
-
console.log(`未知命令：/${name}，输入 /help 查看可用命令。`);
|
|
120
|
+
console.log(style.warn(`未知命令：/${name}，输入 /help 查看可用命令。`));
|
|
116
121
|
return true;
|
|
117
122
|
}
|
|
118
123
|
}
|
|
@@ -120,10 +125,10 @@ export async function handleSlash(input, ctx) {
|
|
|
120
125
|
async function handleReload(ctx) {
|
|
121
126
|
const result = ctx.reloadConfig();
|
|
122
127
|
if (!result.ok) {
|
|
123
|
-
console.log(`配置重载失败：${result.message}`);
|
|
128
|
+
console.log(style.error(`配置重载失败：${result.message}`));
|
|
124
129
|
return;
|
|
125
130
|
}
|
|
126
|
-
console.log('配置已重新加载。');
|
|
131
|
+
console.log(style.success('配置已重新加载。'));
|
|
127
132
|
if (ctx.mcpManager) {
|
|
128
133
|
await reloadMcpServers(ctx.mcpManager, result.config.mcpServers ?? {});
|
|
129
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/slash/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/slash/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { McpClientManager } from '../../../agent/mcp.js';
|
|
2
2
|
import { saveMcpServers, } from '../../../config/config.js';
|
|
3
3
|
import { registerMcpTools, unregisterAllMcpTools, unregisterMcpServerTools, } from '../../../tools/index.js';
|
|
4
|
+
import { style } from '../../style.js';
|
|
4
5
|
/** /mcp：管理 MCP server。 */
|
|
5
6
|
export async function handleMcp(arg, ctx) {
|
|
6
7
|
if (!ctx.mcpManager) {
|
|
7
|
-
console.log('当前没有可用的 MCP manager。');
|
|
8
|
+
console.log(style.muted('当前没有可用的 MCP manager。'));
|
|
8
9
|
return;
|
|
9
10
|
}
|
|
10
11
|
const parts = arg.trim().split(/\s+/);
|
|
@@ -23,30 +24,30 @@ export async function handleMcp(arg, ctx) {
|
|
|
23
24
|
await mcpReload(ctx);
|
|
24
25
|
return;
|
|
25
26
|
default:
|
|
26
|
-
console.log('用法：/mcp list | add <name> <command> [args...] | remove <name> | reload');
|
|
27
|
+
console.log(style.muted('用法：/mcp list | add <name> <command> [args...] | remove <name> | reload'));
|
|
27
28
|
}
|
|
28
29
|
}
|
|
29
30
|
async function mcpList(ctx) {
|
|
30
31
|
const servers = ctx.mcpManager.getServerNames();
|
|
31
32
|
if (servers.length === 0) {
|
|
32
|
-
console.log('没有已连接的 MCP server。');
|
|
33
|
+
console.log(style.muted('没有已连接的 MCP server。'));
|
|
33
34
|
return;
|
|
34
35
|
}
|
|
35
|
-
console.log('已连接的 MCP server：');
|
|
36
|
+
console.log(style.label('已连接的 MCP server：'));
|
|
36
37
|
const tools = await ctx.mcpManager.listTools();
|
|
37
38
|
for (const name of servers) {
|
|
38
39
|
const serverTools = tools
|
|
39
40
|
.filter((t) => t.serverName === name)
|
|
40
41
|
.map((t) => t.originalName);
|
|
41
|
-
console.log(` ${name}`);
|
|
42
|
+
console.log(style.info(` ${name}`));
|
|
42
43
|
for (const t of serverTools) {
|
|
43
|
-
console.log(` - ${t}`);
|
|
44
|
+
console.log(style.muted(` - ${t}`));
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
47
|
}
|
|
47
48
|
async function mcpAdd(parts, ctx) {
|
|
48
49
|
if (parts.length < 2) {
|
|
49
|
-
console.log('用法：/mcp add <name> <command> [args...]');
|
|
50
|
+
console.log(style.muted('用法：/mcp add <name> <command> [args...]'));
|
|
50
51
|
return;
|
|
51
52
|
}
|
|
52
53
|
const [name, command, ...args] = parts;
|
|
@@ -55,7 +56,7 @@ async function mcpAdd(parts, ctx) {
|
|
|
55
56
|
const testManager = new McpClientManager({ [name]: cfg }, { name: 'ccli', version: '0.0.0' });
|
|
56
57
|
const testErrors = await testManager.connectAll();
|
|
57
58
|
if (testErrors.length > 0) {
|
|
58
|
-
console.log(`连接失败：${testErrors[0]}`);
|
|
59
|
+
console.log(style.error(`连接失败：${testErrors[0]}`));
|
|
59
60
|
await testManager.closeAll();
|
|
60
61
|
return;
|
|
61
62
|
}
|
|
@@ -65,7 +66,7 @@ async function mcpAdd(parts, ctx) {
|
|
|
65
66
|
// 持久化
|
|
66
67
|
const saved = saveMcpServers(ctx.cwd, newConfig);
|
|
67
68
|
if (!saved.ok) {
|
|
68
|
-
console.log(saved.message);
|
|
69
|
+
console.log(style.error(saved.message));
|
|
69
70
|
await testManager.closeAll();
|
|
70
71
|
return;
|
|
71
72
|
}
|
|
@@ -73,17 +74,17 @@ async function mcpAdd(parts, ctx) {
|
|
|
73
74
|
Object.assign(currentConfig, { [name]: cfg });
|
|
74
75
|
unregisterMcpServerTools(name);
|
|
75
76
|
await registerMcpTools(testManager);
|
|
76
|
-
console.log(`已添加 MCP server：${name}（配置已保存到 ${saved.path}）`);
|
|
77
|
+
console.log(style.success(`已添加 MCP server：${name}（配置已保存到 ${saved.path}）`));
|
|
77
78
|
}
|
|
78
79
|
async function mcpRemove(parts, ctx) {
|
|
79
80
|
const name = parts[0];
|
|
80
81
|
if (!name) {
|
|
81
|
-
console.log('用法：/mcp remove <name>');
|
|
82
|
+
console.log(style.muted('用法：/mcp remove <name>'));
|
|
82
83
|
return;
|
|
83
84
|
}
|
|
84
85
|
const removed = await ctx.mcpManager.removeServer(name);
|
|
85
86
|
if (!removed) {
|
|
86
|
-
console.log(`未找到 MCP server：${name}`);
|
|
87
|
+
console.log(style.warn(`未找到 MCP server：${name}`));
|
|
87
88
|
return;
|
|
88
89
|
}
|
|
89
90
|
unregisterMcpServerTools(name);
|
|
@@ -93,19 +94,19 @@ async function mcpRemove(parts, ctx) {
|
|
|
93
94
|
Object.assign(currentConfig, newConfig);
|
|
94
95
|
const saved = saveMcpServers(ctx.cwd, newConfig);
|
|
95
96
|
if (saved.ok) {
|
|
96
|
-
console.log(`已移除 MCP server：${name}（配置已保存到 ${saved.path}）`);
|
|
97
|
+
console.log(style.success(`已移除 MCP server：${name}（配置已保存到 ${saved.path}）`));
|
|
97
98
|
}
|
|
98
99
|
else {
|
|
99
|
-
console.log(`已移除 MCP server：${name}，但保存配置失败：${saved.message}`);
|
|
100
|
+
console.log(style.warn(`已移除 MCP server：${name}，但保存配置失败：${saved.message}`));
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
103
|
async function mcpReload(ctx) {
|
|
103
104
|
const result = ctx.reloadConfig();
|
|
104
105
|
if (!result.ok) {
|
|
105
|
-
console.log(`配置重载失败：${result.message}`);
|
|
106
|
+
console.log(style.error(`配置重载失败：${result.message}`));
|
|
106
107
|
return;
|
|
107
108
|
}
|
|
108
|
-
console.log('配置已重新加载。');
|
|
109
|
+
console.log(style.success('配置已重新加载。'));
|
|
109
110
|
await reloadMcpServers(ctx.mcpManager, result.config.mcpServers ?? {});
|
|
110
111
|
}
|
|
111
112
|
/**
|
|
@@ -123,11 +124,11 @@ export async function reloadMcpServers(manager, mcpServers) {
|
|
|
123
124
|
Object.assign(currentConfig, mcpServers);
|
|
124
125
|
const errors = await manager.connectAll();
|
|
125
126
|
if (errors.length > 0) {
|
|
126
|
-
console.error('部分 MCP server 连接失败：');
|
|
127
|
+
console.error(style.error('部分 MCP server 连接失败：'));
|
|
127
128
|
for (const e of errors)
|
|
128
|
-
console.error(` ${e}`);
|
|
129
|
+
console.error(style.muted(` ${e}`));
|
|
129
130
|
}
|
|
130
131
|
await registerMcpTools(manager);
|
|
131
|
-
console.log('MCP server 已重新加载。');
|
|
132
|
+
console.log(style.success('MCP server 已重新加载。'));
|
|
132
133
|
}
|
|
133
134
|
//# sourceMappingURL=mcp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../../src/cli/slash/mcp/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAEH,cAAc,GAEjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,gBAAgB,EAChB,qBAAqB,EACrB,wBAAwB,GAC3B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../../src/cli/slash/mcp/mcp.ts"],"names":[],"mappings":"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"}
|