@gird/ccli 2.12.0 → 2.13.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 +3 -2
- package/dist/agent/ai.js +6 -5
- package/dist/agent/ai.js.map +1 -1
- package/dist/cli/repl/index.js +19 -10
- package/dist/cli/repl/index.js.map +1 -1
- package/dist/cli/run/fold.js +8 -5
- package/dist/cli/run/fold.js.map +1 -1
- package/dist/cli/run/index.js +20 -47
- package/dist/cli/run/index.js.map +1 -1
- package/dist/cli/run/pager.js +138 -0
- package/dist/cli/run/pager.js.map +1 -0
- package/dist/cli/run/stream-write.js +110 -10
- package/dist/cli/run/stream-write.js.map +1 -1
- package/dist/cli/run/task.js +212 -0
- package/dist/cli/run/task.js.map +1 -0
- package/dist/tools/index.js +24 -5
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/shared.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -40,8 +40,9 @@ ccli --role coder "review 这段代码" # 使用 coding 角色单次调用
|
|
|
40
40
|
- 模型可调用的工具：读文件、列目录、搜索代码、写文件、局部编辑文件、执行 shell 命令（写入/编辑/执行操作会请你确认，确认时可「始终允许」同类——bash 按命令首词、写/编辑按路径首段目录，本会话内自动放行；bash 也可 `background: true` 放后台长跑，用 `bash_output` 查看、`kill_bash` 终止）。
|
|
41
41
|
- 工具调用和结果都以**一行摘要**实时展示（如 `⚙ write_file index.html （85 行）` 接 ` → 已写入 …`）；`write_file` 还会在落盘前把内容**带行号**逐行铺出，`edit_file` 则展示 `-` / `+` 的逐行 diff（红删绿增），长 content 不刷屏，每个工具逐步出现。
|
|
42
42
|
- 对接支持思考（reasoning）的模型（如 DeepSeek-R1、Kimi、Qwen3-thinking）时，会在正文前用灰色流式展示「思考中…」；不支持的模型（如默认的 `qwen-plus`）自动跳过，不影响使用。
|
|
43
|
-
- `write` / `edit` 的内容超过 40 行会自动折叠为「…（还有 N 行，按 ctrl+o
|
|
44
|
-
- `write_file` 的内容会随模型生成**逐行实时流式**显示（`⚙ write_file …（生成中…）` 后一行行长出来，像看着模型写代码），不再等参数到齐才一次性铺出；`edit_file` 等工具仍走「摘要 +
|
|
43
|
+
- `write` / `edit` 的内容超过 40 行会自动折叠为「…（还有 N 行，按 ctrl+o 展开）」；在空闲提示符下按 `ctrl+o` 会进入**全屏可滚动查看器**（alternate screen，类 `less`）查看完整内容，↑/↓/PgUp/PgDn/Home/End 滚动，`q` / `Enter` / `Esc` 退出后回到原提示符（未提交输入原样保留）。
|
|
44
|
+
- `write_file` 的内容会随模型生成**逐行实时流式**显示（`⚙ write_file …（生成中…）` 后一行行长出来，像看着模型写代码），不再等参数到齐才一次性铺出；`edit_file` 等工具仍走「摘要 + 折叠」。流式超过 40 行也会**自动停打**并显示「…（后续内容已折叠，按 ctrl+o 展开）」，在空闲提示符下按 `ctrl+o` 同样进入全屏可滚动查看器查看被隐藏的剩余行（主 / 子代理共用同一套，阈值与第 57 步折叠一致）。
|
|
45
|
+
- 模型可调用 `task` 工具把**独立子任务委派给子代理**：子代理用独立上下文 + 全套工具（读/写/编辑/搜索/bash）自行完成，完成后只把结论返回主代理，避免中间过程污染主对话；子代理共享主会话的确认/「始终允许」/token 统计，且**不可再调用 task 继续委派**（防递归）；子代理的 `write_file` 同样**逐行实时流式**展示，与主代理观感一致；可用 `subagent_type` 选 `explore`（只读探索，仅 `read_file`/`list_dir`/`grep`/`bash_output`，执行层硬边界保证不能改文件）或 `code`（编码，除 `task` 外全套工具），省略则为通用子代理；子代理运行时的工具调用 / 结果 / 流式写入 / 结论都会**缩进成 ` │ ` 嵌套块**（开始 / 结束横幅顶格作边界），与主代理输出区分开，折叠块按 `ctrl+o` 展开时同样带缩进。
|
|
45
46
|
- `/help` 查看可用命令，`/clear` 清空历史，`/undo [n]` 撤销最近 n 轮对话。
|
|
46
47
|
- `/compact` 把对话历史压缩成一段摘要，释放上下文（长对话逼近上限时用；仅在确有收益时替换）。上下文占比达到约 80% 时也会**自动压缩**。
|
|
47
48
|
- `/model [id]` 查看当前模型或切换到新模型（输入空参数只查看）。
|
package/dist/agent/ai.js
CHANGED
|
@@ -60,7 +60,7 @@ class OpenAIClient {
|
|
|
60
60
|
stream_options: { include_usage: true },
|
|
61
61
|
};
|
|
62
62
|
if (!options?.disableTools) {
|
|
63
|
-
body.tools = toolDefs();
|
|
63
|
+
body.tools = toolDefs(options?.allowedTools);
|
|
64
64
|
if (options?.requireTools) {
|
|
65
65
|
body.tool_choice = 'required';
|
|
66
66
|
}
|
|
@@ -149,7 +149,7 @@ class AnthropicClient {
|
|
|
149
149
|
}
|
|
150
150
|
async chat(messages, onDelta, options, onReasoning, onToolArgumentDelta) {
|
|
151
151
|
const { system, messages: anthropicMessages } = toAnthropicMessages(messages);
|
|
152
|
-
const tools = toAnthropicTools();
|
|
152
|
+
const tools = toAnthropicTools(options?.allowedTools);
|
|
153
153
|
const stream = await this.client.messages.create({
|
|
154
154
|
model: this.model,
|
|
155
155
|
max_tokens: 4096,
|
|
@@ -274,9 +274,10 @@ export function toAnthropicMessages(messages) {
|
|
|
274
274
|
}
|
|
275
275
|
return { system: systemParts.join('\n\n'), messages: anthropicMessages };
|
|
276
276
|
}
|
|
277
|
-
/** 把内部工具定义转成 Anthropic 的 tool 格式。
|
|
278
|
-
|
|
279
|
-
|
|
277
|
+
/** 把内部工具定义转成 Anthropic 的 tool 格式。
|
|
278
|
+
* 传 allowedNames 时只转换这些工具（与 OpenAI 路径一致）。 */
|
|
279
|
+
export function toAnthropicTools(allowedNames) {
|
|
280
|
+
return toolDefs(allowedNames).map((t) => ({
|
|
280
281
|
name: t.function.name,
|
|
281
282
|
description: t.function.description,
|
|
282
283
|
input_schema: {
|
package/dist/agent/ai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai.js","sourceRoot":"","sources":["../../src/agent/ai.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ai.js","sourceRoot":"","sources":["../../src/agent/ai.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/repl/index.js
CHANGED
|
@@ -24,6 +24,7 @@ import { registerMcpTools, resetTools } from '../../tools/index.js';
|
|
|
24
24
|
import { emptyStats, formatStats, } from '../stats/index.js';
|
|
25
25
|
import { runAgentTurn } from '../run/index.js';
|
|
26
26
|
import { consumeFolded } from '../run/fold.js';
|
|
27
|
+
import { openFoldPager } from '../run/pager.js';
|
|
27
28
|
import { Permission, alwaysLabelFor } from '../run/permissions.js';
|
|
28
29
|
import { autoCompactIfNeeded } from '../slash/system/compact.js';
|
|
29
30
|
const PROMPT = '› ';
|
|
@@ -116,8 +117,9 @@ export async function startRepl() {
|
|
|
116
117
|
};
|
|
117
118
|
// 正在等待 AI 回复时置 true，避免这期间的输入被重复处理
|
|
118
119
|
let busy = false;
|
|
119
|
-
// ctrl+o
|
|
120
|
-
//
|
|
120
|
+
// ctrl+o：在空闲提示符下查看被折叠的长块（write/edit 内容）。
|
|
121
|
+
// 无折叠块 → 提示「没有可展开的内容」；有折叠块 → 进入全屏可滚动查看器
|
|
122
|
+
// （alternate screen，类 less），退出后还原提示符与未提交输入。
|
|
121
123
|
process.stdin.on('keypress', (_str, key) => {
|
|
122
124
|
if (!key || !key.ctrl || key.name !== 'o')
|
|
123
125
|
return;
|
|
@@ -125,17 +127,24 @@ export async function startRepl() {
|
|
|
125
127
|
return;
|
|
126
128
|
const folded = consumeFolded();
|
|
127
129
|
const pending = rl.line;
|
|
128
|
-
process.stdout.write('\r\x1b[K');
|
|
129
130
|
if (!folded) {
|
|
131
|
+
process.stdout.write('\r\x1b[K');
|
|
130
132
|
console.log(style.muted('（没有可展开的内容）'));
|
|
133
|
+
rl.prompt(true);
|
|
134
|
+
if (pending)
|
|
135
|
+
rl.write(pending);
|
|
136
|
+
return;
|
|
131
137
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
rl.
|
|
138
|
+
rl.pause();
|
|
139
|
+
void openFoldPager({
|
|
140
|
+
lines: folded.lines,
|
|
141
|
+
gutter: folded.gutter,
|
|
142
|
+
}).then(() => {
|
|
143
|
+
rl.resume();
|
|
144
|
+
rl.prompt(true);
|
|
145
|
+
if (pending)
|
|
146
|
+
rl.write(pending);
|
|
147
|
+
});
|
|
139
148
|
});
|
|
140
149
|
const INPUT_DEBOUNCE_MS = 80;
|
|
141
150
|
/** 处理一条已合并好的用户输入（斜杠命令或普通消息）。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/repl/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/repl/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/run/fold.js
CHANGED
|
@@ -15,9 +15,10 @@ import { style } from '../style.js';
|
|
|
15
15
|
export const FOLD_THRESHOLD = 40;
|
|
16
16
|
/** 最近一次被折叠的块（展开一次后清空）。 */
|
|
17
17
|
let last = null;
|
|
18
|
-
/** 注册一个被折叠的块（覆盖上一次）。lines 为全量，shown
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
/** 注册一个被折叠的块（覆盖上一次）。lines 为全量，shown 为已展示行数；
|
|
19
|
+
* gutter 为展开时每行补打的前缀（子代理缩进用，主代理省略）。 */
|
|
20
|
+
export function registerFolded(lines, shown, gutter) {
|
|
21
|
+
last = { lines, shown, gutter };
|
|
21
22
|
}
|
|
22
23
|
/** 取出并清空最近一次折叠（用于 ctrl+o 展开）；没有则返回 null。 */
|
|
23
24
|
export function consumeFolded() {
|
|
@@ -32,14 +33,16 @@ export function resetFoldedForTest() {
|
|
|
32
33
|
/**
|
|
33
34
|
* 把一组已渲染的行打包成「前 FOLD_THRESHOLD 行 + 折叠提示」。
|
|
34
35
|
* 超过阈值时注册折叠（供后续 ctrl+o 展开）；未超过则原样返回。
|
|
36
|
+
* gutter 为子代理缩进前缀：仅记录到折叠块（展开时由 ctrl+o 补打），
|
|
37
|
+
* 返回的「前 N 行」本身不含 gutter——由调用方 print 统一加，避免直播/展开重复。
|
|
35
38
|
*/
|
|
36
|
-
export function renderWithFold(lines) {
|
|
39
|
+
export function renderWithFold(lines, gutter) {
|
|
37
40
|
if (lines.length <= FOLD_THRESHOLD) {
|
|
38
41
|
return lines.join('\n') + (lines.length ? '\n' : '');
|
|
39
42
|
}
|
|
40
43
|
const head = lines.slice(0, FOLD_THRESHOLD);
|
|
41
44
|
const rest = lines.length - FOLD_THRESHOLD;
|
|
42
|
-
registerFolded(lines, FOLD_THRESHOLD);
|
|
45
|
+
registerFolded(lines, FOLD_THRESHOLD, gutter);
|
|
43
46
|
return (head.join('\n') +
|
|
44
47
|
'\n' +
|
|
45
48
|
style.muted(` …（还有 ${rest} 行，按 ctrl+o 展开）`) +
|
package/dist/cli/run/fold.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fold.js","sourceRoot":"","sources":["../../../src/cli/run/fold.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,yCAAyC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"fold.js","sourceRoot":"","sources":["../../../src/cli/run/fold.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,yCAAyC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AAejC,0BAA0B;AAC1B,IAAI,IAAI,GAAuB,IAAI,CAAC;AAEpC;wCACwC;AACxC,MAAM,UAAU,cAAc,CAC1B,KAAe,EACf,KAAa,EACb,MAAe;IAEf,IAAI,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACpC,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,aAAa;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,IAAI,GAAG,IAAI,CAAC;IACZ,OAAO,GAAG,CAAC;AACf,CAAC;AAED,mBAAmB;AACnB,MAAM,UAAU,kBAAkB;IAC9B,IAAI,GAAG,IAAI,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,KAAe,EAAE,MAAe;IAC3D,IAAI,KAAK,CAAC,MAAM,IAAI,cAAc,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC;IAC3C,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAC9C,OAAO,CACH,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACf,IAAI;QACJ,KAAK,CAAC,KAAK,CAAC,UAAU,IAAI,iBAAiB,CAAC;QAC5C,IAAI,CACP,CAAC;AACN,CAAC"}
|
package/dist/cli/run/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { style } from '../style.js';
|
|
2
|
-
import { executeTool, getTool, registerMcpTools } from '../../tools/index.js';
|
|
2
|
+
import { executeTool, getTool, registerMcpTools, registerTool, } from '../../tools/index.js';
|
|
3
|
+
import { createTaskTool } from './task.js';
|
|
3
4
|
import { ruleKeyFor } from './permissions.js';
|
|
4
5
|
import { formatToolCall, formatToolResult, toolCallLines, } from './format.js';
|
|
5
6
|
import { renderWithFold } from './fold.js';
|
|
6
|
-
import {
|
|
7
|
+
import { WriteFileStreamPrinter } from './stream-write.js';
|
|
7
8
|
import { estimatePromptTokens, estimateTokens, } from '../stats/index.js';
|
|
8
9
|
/** 单个用户回合内，最多允许模型连续调用工具的轮数，防止失控循环。 */
|
|
9
10
|
const MAX_TOOL_ROUNDS = 10;
|
|
@@ -25,6 +26,17 @@ function safeParse(argsJson) {
|
|
|
25
26
|
export async function runAgentTurn(options) {
|
|
26
27
|
const { ai, history, confirm, stats, print = process.stdout.write.bind(process.stdout), maxRounds, requireToolsFirstRound, onToolCall, onToolResult, permission, } = options;
|
|
27
28
|
const rounds = maxRounds ?? MAX_TOOL_ROUNDS;
|
|
29
|
+
/** 工具执行上下文（供 task 等需要反向调用 AI / 复用会话的工具）。 */
|
|
30
|
+
const toolCtx = {
|
|
31
|
+
ai,
|
|
32
|
+
confirm,
|
|
33
|
+
permission,
|
|
34
|
+
stats,
|
|
35
|
+
print,
|
|
36
|
+
cwd: process.cwd(),
|
|
37
|
+
};
|
|
38
|
+
// 注册 task 子代理工具（每回合注册一次，registerTool 同名替换幂等）。
|
|
39
|
+
registerTool(createTaskTool(toolCtx));
|
|
28
40
|
for (let round = 0; round < rounds; round++) {
|
|
29
41
|
let reasoningStarted = false;
|
|
30
42
|
let reasoningEnded = false;
|
|
@@ -44,48 +56,9 @@ export async function runAgentTurn(options) {
|
|
|
44
56
|
print(text);
|
|
45
57
|
};
|
|
46
58
|
// write_file 内容的流式渲染：边收参数边带行号打印，营造「正在写」观感。
|
|
47
|
-
//
|
|
48
|
-
const
|
|
49
|
-
const
|
|
50
|
-
let streamedAnyWrite = false;
|
|
51
|
-
const onToolArgumentDelta = (index, name, argsSoFar) => {
|
|
52
|
-
if (name !== 'write_file')
|
|
53
|
-
return;
|
|
54
|
-
let streamer = streamers.get(index);
|
|
55
|
-
if (!streamer) {
|
|
56
|
-
streamer = new WriteContentStreamer();
|
|
57
|
-
streamers.set(index, streamer);
|
|
58
|
-
}
|
|
59
|
-
let st = lineState.get(index);
|
|
60
|
-
if (!st) {
|
|
61
|
-
st = { headerPrinted: false, lineNo: 1, atLineStart: true };
|
|
62
|
-
lineState.set(index, st);
|
|
63
|
-
}
|
|
64
|
-
const r = streamer.feed(argsSoFar);
|
|
65
|
-
if (!r.started || r.delta.length === 0)
|
|
66
|
-
return;
|
|
67
|
-
if (!st.headerPrinted) {
|
|
68
|
-
print(style.tool(`\n⚙ write_file ${r.path ?? ''} （生成中…）\n`));
|
|
69
|
-
st.headerPrinted = true;
|
|
70
|
-
}
|
|
71
|
-
for (const ch of r.delta) {
|
|
72
|
-
if (st.atLineStart) {
|
|
73
|
-
print(style.muted(String(st.lineNo).padStart(2, ' ')) + ' ');
|
|
74
|
-
st.atLineStart = false;
|
|
75
|
-
}
|
|
76
|
-
print(ch);
|
|
77
|
-
if (ch === '\n') {
|
|
78
|
-
st.lineNo++;
|
|
79
|
-
st.atLineStart = true;
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
// content 已闭合且末尾不是换行 → 补换行，让结果摘要另起一行
|
|
83
|
-
if (r.ended && !st.atLineStart) {
|
|
84
|
-
print('\n');
|
|
85
|
-
st.atLineStart = true;
|
|
86
|
-
}
|
|
87
|
-
streamedAnyWrite = true;
|
|
88
|
-
};
|
|
59
|
+
// 与子代理共用 WriteFileStreamPrinter，行为一致。
|
|
60
|
+
const writePrinter = new WriteFileStreamPrinter();
|
|
61
|
+
const onToolArgumentDelta = (index, name, argsSoFar) => writePrinter.handleDelta(index, name, argsSoFar, print);
|
|
89
62
|
const turn = await ai.chat(history, onDelta, round === 0 && requireToolsFirstRound ? { requireTools: true } : undefined, onReasoningDelta, onToolArgumentDelta);
|
|
90
63
|
// 优先使用后端返回的真实 usage；不支持时降级为字符估算
|
|
91
64
|
if (turn.usage) {
|
|
@@ -122,7 +95,7 @@ export async function runAgentTurn(options) {
|
|
|
122
95
|
// 破坏性工具：执行前展示预览并请用户确认
|
|
123
96
|
if (tool?.needsConfirm) {
|
|
124
97
|
const args = safeParse(tc.arguments);
|
|
125
|
-
const preview = tc.name === 'write_file' &&
|
|
98
|
+
const preview = tc.name === 'write_file' && writePrinter.anyStreamed
|
|
126
99
|
? `写入文件：${args.path ?? ''}（内容已在上方流式展示）`
|
|
127
100
|
: tool.preview
|
|
128
101
|
? tool.preview(args)
|
|
@@ -153,7 +126,7 @@ export async function runAgentTurn(options) {
|
|
|
153
126
|
}
|
|
154
127
|
else {
|
|
155
128
|
// write_file 内容已在流式中逐行打印过，不再重复输出摘要+完整块
|
|
156
|
-
const alreadyStreamed = tc.name === 'write_file' &&
|
|
129
|
+
const alreadyStreamed = tc.name === 'write_file' && writePrinter.anyStreamed;
|
|
157
130
|
if (!alreadyStreamed) {
|
|
158
131
|
print(style.tool(`\n⚙ ${formatToolCall(tc)}\n`));
|
|
159
132
|
const lines = toolCallLines(tc);
|
|
@@ -161,7 +134,7 @@ export async function runAgentTurn(options) {
|
|
|
161
134
|
print(renderWithFold(lines));
|
|
162
135
|
}
|
|
163
136
|
}
|
|
164
|
-
const result = await executeTool(tc.name, tc.arguments);
|
|
137
|
+
const result = await executeTool(tc.name, tc.arguments, toolCtx);
|
|
165
138
|
if (onToolResult) {
|
|
166
139
|
onToolResult(tc, result);
|
|
167
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/run/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/run/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 折叠内容的全屏可滚动查看器（alternate screen，类 less）。
|
|
3
|
+
*
|
|
4
|
+
* 第 57 / 63 步的折叠只铺前 N 行，按 ctrl+o 原本是「在提示符处追加补打剩余行」
|
|
5
|
+
* （传统流式终端，行一旦打印就滚上去、无法原地重绘）。这里把 ctrl+o 升级为：
|
|
6
|
+
* 进入 alternate screen，整屏展示被折叠的完整内容，↑/↓/PgUp/PgDn/Home/End 滚动，
|
|
7
|
+
* q / Enter / Esc 退出后回到原 REPL（提示符与未提交输入原样恢复）。
|
|
8
|
+
*
|
|
9
|
+
* 这是「原地展开 / 可滚动」在终端里的标准做法（less / man 同款）：隔离在 ctrl+o
|
|
10
|
+
* 触发、退出即还原，不替换 readline、不改动正常输出路径，零回归。
|
|
11
|
+
*/
|
|
12
|
+
import { emitKeypressEvents } from 'node:readline';
|
|
13
|
+
import { style } from '../style.js';
|
|
14
|
+
const ALT_ON = '\x1b[?1049h';
|
|
15
|
+
const ALT_OFF = '\x1b[?1049l';
|
|
16
|
+
const CURSOR_HIDE = '\x1b[?25l';
|
|
17
|
+
const CURSOR_SHOW = '\x1b[?25h';
|
|
18
|
+
const CLEAR = '\x1b[H\x1b[2J';
|
|
19
|
+
/** 可滚动行数 = 终端行数 - 1（留一行给状态栏）。 */
|
|
20
|
+
function viewRowsOf(total) {
|
|
21
|
+
return Math.max(1, (total ?? 24) - 1);
|
|
22
|
+
}
|
|
23
|
+
/** 给定内容总行数与可视行数，计算最大合法 offset（ clamp 用）。 */
|
|
24
|
+
function maxOffset(total, viewRows) {
|
|
25
|
+
return Math.max(0, total - viewRows);
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* 纯逻辑：按按键计算新的 offset / 是否退出。
|
|
29
|
+
* 箭头 / vim 键（kjgG）/ PgUp/PgDn / Home/End 滚动；q / Enter / Esc 退出。
|
|
30
|
+
* 不直接处理 Ctrl-C（由 openFoldPager 统一处理为退出进程）。
|
|
31
|
+
*/
|
|
32
|
+
export function handlePagerKey(key, str, offset, total, viewRows) {
|
|
33
|
+
const max = maxOffset(total, viewRows);
|
|
34
|
+
const name = key.name ?? '';
|
|
35
|
+
const ch = str ?? ''; // 原始（区分大小写，用于 g / G）
|
|
36
|
+
const lower = ch.toLowerCase(); // 用于 q / k / j
|
|
37
|
+
if (name === 'q' || lower === 'q' || name === 'escape' || name === 'return') {
|
|
38
|
+
return { offset, quit: true };
|
|
39
|
+
}
|
|
40
|
+
if (name === 'up' || lower === 'k') {
|
|
41
|
+
return { offset: Math.max(0, offset - 1), quit: false };
|
|
42
|
+
}
|
|
43
|
+
if (name === 'down' || lower === 'j') {
|
|
44
|
+
return { offset: Math.min(max, offset + 1), quit: false };
|
|
45
|
+
}
|
|
46
|
+
if (name === 'pageup') {
|
|
47
|
+
return { offset: Math.max(0, offset - viewRows), quit: false };
|
|
48
|
+
}
|
|
49
|
+
if (name === 'pagedown') {
|
|
50
|
+
return { offset: Math.min(max, offset + viewRows), quit: false };
|
|
51
|
+
}
|
|
52
|
+
if (name === 'home' || ch === 'g') {
|
|
53
|
+
return { offset: 0, quit: false };
|
|
54
|
+
}
|
|
55
|
+
if (name === 'end' || ch === 'G') {
|
|
56
|
+
return { offset: max, quit: false };
|
|
57
|
+
}
|
|
58
|
+
return { offset, quit: false };
|
|
59
|
+
}
|
|
60
|
+
/** 纯逻辑：渲染一帧（清屏 + 可视窗口 + 状态栏）。供测试断言。 */
|
|
61
|
+
export function renderPager(options) {
|
|
62
|
+
const { lines, gutter = '', offset, viewRows } = options;
|
|
63
|
+
const total = lines.length;
|
|
64
|
+
const end = Math.min(total, offset + viewRows);
|
|
65
|
+
const window = lines.slice(offset, end).map((l) => gutter + l);
|
|
66
|
+
const from = total === 0 ? 0 : offset + 1;
|
|
67
|
+
const status = style.muted(` — 折叠内容 ${from}-${end}/${total} ↑/↓ 滚动 PgUp/PgDn Home/End q/Enter 退出 —`);
|
|
68
|
+
return CLEAR + window.join('\n') + (window.length ? '\n' : '') + status;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* 打开全屏查看器，退出后 resolve。非 TTY 降级为直接打印全部内容。
|
|
72
|
+
* 接管 keypress（移除并恢复既有监听，含 readline / ctrl+o），与 confirm-select 同款。
|
|
73
|
+
*/
|
|
74
|
+
export async function openFoldPager(options) {
|
|
75
|
+
const { lines, gutter = '', input = process.stdin, output = process.stdout, } = options;
|
|
76
|
+
const stdin = input;
|
|
77
|
+
const stdout = output;
|
|
78
|
+
// 非 TTY：无法进入 alternate screen，退化为一次性打印全部内容
|
|
79
|
+
if (!stdin.isTTY || !stdout.isTTY) {
|
|
80
|
+
stdout.write(lines.map((l) => gutter + l).join('\n') + '\n');
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
return new Promise((resolve) => {
|
|
84
|
+
let offset = 0;
|
|
85
|
+
const originalRawMode = stdin.isRaw;
|
|
86
|
+
const wasPaused = typeof stdin.isPaused === 'function'
|
|
87
|
+
? stdin.isPaused()
|
|
88
|
+
: false;
|
|
89
|
+
const existingKeypressListeners = stdin.listeners('keypress');
|
|
90
|
+
for (const listener of existingKeypressListeners) {
|
|
91
|
+
stdin.removeListener('keypress', listener);
|
|
92
|
+
}
|
|
93
|
+
stdin.setRawMode(true);
|
|
94
|
+
emitKeypressEvents(stdin);
|
|
95
|
+
if (wasPaused)
|
|
96
|
+
stdin.resume();
|
|
97
|
+
const viewRows = () => viewRowsOf(stdout.rows);
|
|
98
|
+
function render() {
|
|
99
|
+
stdout.write(renderPager({ lines, gutter, offset, viewRows: viewRows() }));
|
|
100
|
+
}
|
|
101
|
+
function cleanup() {
|
|
102
|
+
stdin.setRawMode(originalRawMode ?? false);
|
|
103
|
+
stdin.removeListener('keypress', onKeypress);
|
|
104
|
+
for (const listener of existingKeypressListeners) {
|
|
105
|
+
stdin.on('keypress', listener);
|
|
106
|
+
}
|
|
107
|
+
if (wasPaused)
|
|
108
|
+
stdin.pause();
|
|
109
|
+
}
|
|
110
|
+
function quit() {
|
|
111
|
+
cleanup();
|
|
112
|
+
// 还原光标并离开 alternate screen，回到原 REPL 画面
|
|
113
|
+
stdout.write(CURSOR_SHOW + ALT_OFF);
|
|
114
|
+
resolve();
|
|
115
|
+
}
|
|
116
|
+
function onKeypress(str, key) {
|
|
117
|
+
if (key?.ctrl && key.name === 'c') {
|
|
118
|
+
cleanup();
|
|
119
|
+
stdout.write(CURSOR_SHOW + ALT_OFF + '\n');
|
|
120
|
+
process.exit(0);
|
|
121
|
+
}
|
|
122
|
+
const r = handlePagerKey(key ?? {}, str ?? '', offset, lines.length, viewRows());
|
|
123
|
+
if (r.quit) {
|
|
124
|
+
quit();
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
if (r.offset !== offset) {
|
|
128
|
+
offset = r.offset;
|
|
129
|
+
render();
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
// 进入 alternate screen 并首帧渲染
|
|
133
|
+
stdout.write(ALT_ON + CURSOR_HIDE);
|
|
134
|
+
render();
|
|
135
|
+
stdin.on('keypress', onKeypress);
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
//# sourceMappingURL=pager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../src/cli/run/pager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
*
|
|
4
|
-
* 模型流式生成工具参数时，arguments 是一片片到达的「半截 JSON 字符串」，
|
|
5
|
-
* 不能 JSON.parse。这里针对 write_file 的 {"path":"...","content":"..."} 结构
|
|
6
|
-
* 做专用增量解码：每次 feed(累计 arguments) 都从头扫描，定位 content 字符串值，
|
|
7
|
-
* 解码出「当前能确定的最长前缀」，相对上次已解码的部分即为新增 delta。
|
|
8
|
-
*
|
|
9
|
-
* 只解 write_file，不通用；纯逻辑、可测。
|
|
10
|
-
*/
|
|
1
|
+
import { style } from '../style.js';
|
|
2
|
+
import { FOLD_THRESHOLD, registerFolded } from './fold.js';
|
|
11
3
|
/** 解码一个 \ 开头的转义；返回解码字符与下一位置；转义未完（含 \u 不足 4 位）返回 undefined。 */
|
|
12
4
|
function escapeChar(args, i) {
|
|
13
5
|
const n = args[i + 1];
|
|
@@ -143,4 +135,112 @@ export class WriteContentStreamer {
|
|
|
143
135
|
return { delta, started: true, ended: r.ended, path: this.path };
|
|
144
136
|
}
|
|
145
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* 一个回合内 write_file 流式渲染的状态机 + 打印。
|
|
140
|
+
*
|
|
141
|
+
* 主代理（run/index.ts）与子代理（task.ts）共用，避免两份「逐 token 带行号」
|
|
142
|
+
* 逻辑漂移。用法：每回合 new 一个；把 `handleDelta` 接给 `ai.chat` 的第 5 参
|
|
143
|
+
* `onToolArgumentDelta`；收齐执行时用 `anyStreamed` 判断是否跳过「摘要 + 完整块」
|
|
144
|
+
* （流式已展示，避免重复），并把 confirm preview 换成简短版。
|
|
145
|
+
*
|
|
146
|
+
* 流式折叠（与第 57 步非流式折叠共用 FOLD_THRESHOLD=40）：边生成边铺前 40 行；
|
|
147
|
+
* 进入第 41 行时停打、打印一次「…（后续内容已折叠，按 ctrl+o 展开）」，后续行
|
|
148
|
+
* 仅缓冲不打印；content 闭合时把全量渲染行注册到 fold 单例，用户在空闲提示符下
|
|
149
|
+
* 按 ctrl+o 即可补打被隐藏的尾巴（主/子一处实现，两边同时生效）。
|
|
150
|
+
*/
|
|
151
|
+
export class WriteFileStreamPrinter {
|
|
152
|
+
gutter;
|
|
153
|
+
streamers = new Map();
|
|
154
|
+
lineState = new Map();
|
|
155
|
+
streamedAny = false;
|
|
156
|
+
/** @param gutter 子代理缩进前缀；注册折叠时记录，展开由 ctrl+o 补打（主代理省略）。 */
|
|
157
|
+
constructor(gutter) {
|
|
158
|
+
this.gutter = gutter;
|
|
159
|
+
}
|
|
160
|
+
/** `onToolArgumentDelta` 的实现：write_file 增量解码并带行号逐字打印。 */
|
|
161
|
+
handleDelta(index, name, argsSoFar, print) {
|
|
162
|
+
if (name !== 'write_file')
|
|
163
|
+
return;
|
|
164
|
+
let streamer = this.streamers.get(index);
|
|
165
|
+
if (!streamer) {
|
|
166
|
+
streamer = new WriteContentStreamer();
|
|
167
|
+
this.streamers.set(index, streamer);
|
|
168
|
+
}
|
|
169
|
+
let st = this.lineState.get(index);
|
|
170
|
+
if (!st) {
|
|
171
|
+
st = {
|
|
172
|
+
headerPrinted: false,
|
|
173
|
+
lineNo: 1,
|
|
174
|
+
atLineStart: true,
|
|
175
|
+
rendered: [],
|
|
176
|
+
cur: '',
|
|
177
|
+
folded: false,
|
|
178
|
+
markerPrinted: false,
|
|
179
|
+
};
|
|
180
|
+
this.lineState.set(index, st);
|
|
181
|
+
}
|
|
182
|
+
const r = streamer.feed(argsSoFar);
|
|
183
|
+
if (!r.started || r.delta.length === 0)
|
|
184
|
+
return;
|
|
185
|
+
if (!st.headerPrinted) {
|
|
186
|
+
print(style.tool(`\n⚙ write_file ${r.path ?? ''} （生成中…）\n`));
|
|
187
|
+
st.headerPrinted = true;
|
|
188
|
+
}
|
|
189
|
+
const prefix = () => style.muted(String(st.lineNo).padStart(2, ' ')) + ' ';
|
|
190
|
+
for (const ch of r.delta) {
|
|
191
|
+
if (st.atLineStart) {
|
|
192
|
+
st.atLineStart = false;
|
|
193
|
+
const p = prefix();
|
|
194
|
+
st.cur = p; // 缓冲行号前缀（供 ctrl+o 原样补打）
|
|
195
|
+
if (st.lineNo > FOLD_THRESHOLD) {
|
|
196
|
+
// 进入折叠区：不打印前缀，提示只打一次
|
|
197
|
+
if (!st.markerPrinted) {
|
|
198
|
+
print(style.muted(' …（后续内容已折叠，按 ctrl+o 展开）') + '\n');
|
|
199
|
+
st.markerPrinted = true;
|
|
200
|
+
st.folded = true;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
print(p);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
if (ch === '\n') {
|
|
208
|
+
// 非折叠区：换行本身也要打出来（否则多行内容会粘成一行）
|
|
209
|
+
if (st.lineNo <= FOLD_THRESHOLD)
|
|
210
|
+
print('\n');
|
|
211
|
+
st.rendered.push(st.cur);
|
|
212
|
+
st.cur = '';
|
|
213
|
+
st.lineNo++;
|
|
214
|
+
st.atLineStart = true;
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
// 折叠区：仅缓冲不打印；非折叠区：照常逐字打印
|
|
218
|
+
if (st.lineNo <= FOLD_THRESHOLD)
|
|
219
|
+
print(ch);
|
|
220
|
+
st.cur += ch;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
if (r.ended) {
|
|
224
|
+
// content 闭合：把未以 \n 结尾的最后一行也并入渲染行
|
|
225
|
+
if (st.cur.length > 0) {
|
|
226
|
+
st.rendered.push(st.cur);
|
|
227
|
+
st.cur = '';
|
|
228
|
+
}
|
|
229
|
+
if (st.folded) {
|
|
230
|
+
// 注册全量渲染行，已展示前 FOLD_THRESHOLD 行 → ctrl+o 补打剩余
|
|
231
|
+
registerFolded(st.rendered, FOLD_THRESHOLD, this.gutter);
|
|
232
|
+
}
|
|
233
|
+
else if (!st.atLineStart) {
|
|
234
|
+
// 非折叠：末尾不是换行 → 补换行，让结果摘要另起一行
|
|
235
|
+
print('\n');
|
|
236
|
+
st.atLineStart = true;
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
this.streamedAny = true;
|
|
240
|
+
}
|
|
241
|
+
/** 本回合是否有 write_file 内容已通过流式展示（收齐后应跳过摘要+完整块）。 */
|
|
242
|
+
get anyStreamed() {
|
|
243
|
+
return this.streamedAny;
|
|
244
|
+
}
|
|
245
|
+
}
|
|
146
246
|
//# sourceMappingURL=stream-write.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-write.js","sourceRoot":"","sources":["../../../src/cli/run/stream-write.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"stream-write.js","sourceRoot":"","sources":["../../../src/cli/run/stream-write.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* task 子代理工具 —— 把一个独立子任务委派给子代理完成。
|
|
3
|
+
*
|
|
4
|
+
* 子代理：独立 history（子 system prompt + 子任务 prompt）+ 全套工具，
|
|
5
|
+
* 跑自己的「模型 ↔ 工具」多轮循环，完成后把最终结论作为工具结果返回主代理。
|
|
6
|
+
*
|
|
7
|
+
* 设计取舍：
|
|
8
|
+
* - 输出透传到主终端（print 用主 print），用户能看到子代理在做什么；
|
|
9
|
+
* 结论文本单独返回给主代理（不进 print）。
|
|
10
|
+
* - 共享主会话 confirm / permission / stats（破坏性操作仍问用户；已放行的子代理也放行）。
|
|
11
|
+
* - 防递归：子代理若调用 task，直接拒绝（返回错误文本），不允许再委派。
|
|
12
|
+
* - 子代理的 write_file 与主循环一致：逐 token 带行号流式展示（共用 WriteFileStreamPrinter）。
|
|
13
|
+
* - subagent_type：explore（只读：read_file/list_dir/grep/bash_output）/ code（编码：除 task 外全套），
|
|
14
|
+
* 按类型定制 system prompt + 裁剪「暴露给模型的工具定义」，并在执行侧用守卫兜底（模型越权调用也拒绝）。
|
|
15
|
+
*
|
|
16
|
+
* 放在 cli/run 而非 tools/：task 需要 runAgentTurn 级别的编排能力与 ctx，
|
|
17
|
+
* 且避免 tools ↔ cli/run 循环依赖（本文件只 import tools / ai / 同层工具）。
|
|
18
|
+
*/
|
|
19
|
+
import { executeTool, getTool, toolNames } from '../../tools/index.js';
|
|
20
|
+
import { style } from '../style.js';
|
|
21
|
+
import { ruleKeyFor } from './permissions.js';
|
|
22
|
+
import { formatToolCall, formatToolResult, toolCallLines, } from './format.js';
|
|
23
|
+
import { renderWithFold } from './fold.js';
|
|
24
|
+
import { WriteFileStreamPrinter } from './stream-write.js';
|
|
25
|
+
/** 只读探索类子代理允许的工具（无副作用，硬边界）。 */
|
|
26
|
+
const EXPLORE_TOOLS = ['read_file', 'list_dir', 'grep', 'bash_output'];
|
|
27
|
+
/** 各类型对应的 system prompt。 */
|
|
28
|
+
const PROMPTS = {
|
|
29
|
+
explore: `你是 CCLI 的【只读探索】子代理，被主代理委派完成一个独立的探索/分析子任务。
|
|
30
|
+
你只能使用只读工具（read_file / list_dir / grep / bash_output）：读文件、列目录、搜索代码、查看后台输出。
|
|
31
|
+
严禁修改文件、执行写命令或任何有副作用的操作（即使你觉得自己能改进，也只能建议，不能动手）。
|
|
32
|
+
你的产出是「理解 + 定位 + 总结」：回答了什么问题、关键文件/函数在哪、结论是什么。用简洁中文总结。`,
|
|
33
|
+
code: `你是 CCLI 的【编码】子代理，被主代理委派完成一个独立的编码子任务。
|
|
34
|
+
你可以使用全套工具（read_file / list_dir / grep / write_file / edit_file / bash 等）独立实现它。
|
|
35
|
+
注意：不要再调用 task 工具继续委派（会被拒绝）。
|
|
36
|
+
完成后用简洁中文总结：做了什么、改了哪些文件、结果如何。`,
|
|
37
|
+
default: `你是 CCLI 的子代理，被主代理委派完成一个独立的子任务。
|
|
38
|
+
请用可用工具（read_file / list_dir / grep / write_file / edit_file / bash 等）专注、独立地完成它。
|
|
39
|
+
注意：不要再调用 task 工具继续委派（会被拒绝）。
|
|
40
|
+
完成后用简洁中文总结：做了什么、改了哪些文件、结果如何。`,
|
|
41
|
+
};
|
|
42
|
+
/** 按类型计算「允许暴露给模型 + 允许执行」的工具名集合。task 永远排除（防递归）。 */
|
|
43
|
+
function resolveAllowedTools(type) {
|
|
44
|
+
if (type === 'explore')
|
|
45
|
+
return [...EXPLORE_TOOLS];
|
|
46
|
+
// code / 默认：除 task 外的全部已注册工具（含内置 + MCP）
|
|
47
|
+
return toolNames().filter((n) => n !== 'task');
|
|
48
|
+
}
|
|
49
|
+
/** 子代理最多连续调用工具的轮数，防止失控。 */
|
|
50
|
+
const MAX_ROUNDS = 8;
|
|
51
|
+
function safeParse(argsJson) {
|
|
52
|
+
try {
|
|
53
|
+
return JSON.parse(argsJson || '{}');
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return {};
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* 构造一个「逐行加前缀」的 print：每个逻辑行首补 gutter，正确处理跨 chunk 的
|
|
61
|
+
* 半截行（流式文本常一片不到一行）。用于把子代理正文统一缩进成嵌套块。
|
|
62
|
+
* 末尾的换行后不预先补 gutter（留给下一行），避免空行上挂孤 gutter。
|
|
63
|
+
*/
|
|
64
|
+
export function linePrefixer(print, gutter) {
|
|
65
|
+
let atLineStart = true;
|
|
66
|
+
return (chunk) => {
|
|
67
|
+
if (chunk.length === 0)
|
|
68
|
+
return;
|
|
69
|
+
let out = atLineStart ? gutter : '';
|
|
70
|
+
out += chunk.replace(/\n/g, '\n' + gutter);
|
|
71
|
+
if (chunk.endsWith('\n')) {
|
|
72
|
+
// 末尾 \n 后刚补的 gutter 属于「下一行」，去掉，下一行由 atLineStart 补
|
|
73
|
+
out = out.slice(0, -gutter.length);
|
|
74
|
+
atLineStart = true;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
atLineStart = false;
|
|
78
|
+
}
|
|
79
|
+
print(out);
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
/** 构造 task 工具（绑定主会话上下文）。 */
|
|
83
|
+
export function createTaskTool(ctx) {
|
|
84
|
+
return {
|
|
85
|
+
name: 'task',
|
|
86
|
+
description: '把一个独立的子任务委派给子代理完成。子代理有独立上下文，完成后返回简洁结论，避免污染主对话。可用 subagent_type 指定类型：explore=只读探索（仅 read_file/list_dir/grep/bash_output，不能改文件）；code=编码（除 task 外全套工具）；省略则用通用子代理。',
|
|
87
|
+
parameters: {
|
|
88
|
+
type: 'object',
|
|
89
|
+
properties: {
|
|
90
|
+
description: {
|
|
91
|
+
type: 'string',
|
|
92
|
+
description: '子任务短标题（一句话）',
|
|
93
|
+
},
|
|
94
|
+
prompt: {
|
|
95
|
+
type: 'string',
|
|
96
|
+
description: '子任务的详细说明（目标、约束、期望产出）',
|
|
97
|
+
},
|
|
98
|
+
subagent_type: {
|
|
99
|
+
type: 'string',
|
|
100
|
+
enum: ['explore', 'code'],
|
|
101
|
+
description: '子代理类型：explore=只读探索（仅只读工具，适合调研/定位/总结，不能改文件）；code=编码（全套工具，适合实现/修改）。省略=通用子代理。',
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
required: ['description', 'prompt'],
|
|
105
|
+
},
|
|
106
|
+
needsConfirm: false,
|
|
107
|
+
run: async (args) => runSubAgent(ctx, args),
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
async function runSubAgent(ctx, args) {
|
|
111
|
+
const print = ctx.print ?? ((c) => process.stdout.write(c));
|
|
112
|
+
// 子代理正文统一缩进，形成嵌套块，降低与主代理输出的视觉交错。
|
|
113
|
+
// banner（开始/结束）仍用原始 print 顶格，作为块的左右边界。
|
|
114
|
+
const gutter = style.muted(' │ ');
|
|
115
|
+
const bodyPrint = linePrefixer(print, gutter);
|
|
116
|
+
const type = args.subagent_type;
|
|
117
|
+
const systemPrompt = PROMPTS[type ?? 'default'];
|
|
118
|
+
const allowedTools = resolveAllowedTools(type);
|
|
119
|
+
const allowedSet = new Set(allowedTools);
|
|
120
|
+
print(style.muted(`\n（子代理开始：${args.description ?? ''}${type ? ` · ${type}` : ''}）\n`));
|
|
121
|
+
const history = [
|
|
122
|
+
{ role: 'system', content: systemPrompt },
|
|
123
|
+
{ role: 'user', content: String(args.prompt ?? '') },
|
|
124
|
+
];
|
|
125
|
+
let lastText = '';
|
|
126
|
+
for (let round = 0; round < MAX_ROUNDS; round++) {
|
|
127
|
+
// write_file 流式与主循环统一：边收参数边带行号打印；gutter 让折叠展开也缩进。
|
|
128
|
+
const writePrinter = new WriteFileStreamPrinter(gutter);
|
|
129
|
+
const turn = await ctx.ai.chat(history, (d) => bodyPrint(d), { allowedTools }, undefined, (index, name, args) => writePrinter.handleDelta(index, name, args, bodyPrint));
|
|
130
|
+
if (turn.usage) {
|
|
131
|
+
ctx.stats.promptTokens += turn.usage.promptTokens;
|
|
132
|
+
ctx.stats.completionTokens += turn.usage.completionTokens;
|
|
133
|
+
ctx.stats.totalTokens += turn.usage.totalTokens;
|
|
134
|
+
}
|
|
135
|
+
// 无工具调用 → 子代理给出最终结论，结束
|
|
136
|
+
if (turn.toolCalls.length === 0) {
|
|
137
|
+
lastText = turn.content;
|
|
138
|
+
history.push({ role: 'assistant', content: turn.content });
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
141
|
+
history.push({
|
|
142
|
+
role: 'assistant',
|
|
143
|
+
content: turn.content || null,
|
|
144
|
+
tool_calls: turn.toolCalls.map((tc) => ({
|
|
145
|
+
id: tc.id,
|
|
146
|
+
type: 'function',
|
|
147
|
+
function: { name: tc.name, arguments: tc.arguments },
|
|
148
|
+
})),
|
|
149
|
+
});
|
|
150
|
+
for (const tc of turn.toolCalls) {
|
|
151
|
+
// 工具集守卫：子代理只能调用本类型允许的工具。
|
|
152
|
+
// 含防递归（task 永不在 allowedSet）：模型即便越权调用，也硬拒绝、不执行。
|
|
153
|
+
if (!allowedSet.has(tc.name)) {
|
|
154
|
+
const msg = tc.name === 'task'
|
|
155
|
+
? '错误：子代理不可再委派子任务（task 调用已被拒绝）。请直接完成当前子任务。'
|
|
156
|
+
: `错误：当前子代理（${type ?? 'default'}）不允许调用工具 ${tc.name}。请改用允许的工具完成子任务。`;
|
|
157
|
+
history.push({
|
|
158
|
+
role: 'tool',
|
|
159
|
+
tool_call_id: tc.id,
|
|
160
|
+
content: msg,
|
|
161
|
+
});
|
|
162
|
+
continue;
|
|
163
|
+
}
|
|
164
|
+
const tool = getTool(tc.name);
|
|
165
|
+
// 破坏性工具：共享主会话的「始终允许」与确认
|
|
166
|
+
if (tool?.needsConfirm) {
|
|
167
|
+
const a = safeParse(tc.arguments);
|
|
168
|
+
const ruleKey = ctx.permission ? ruleKeyFor(tc.name, a) : null;
|
|
169
|
+
const allowed = ruleKey
|
|
170
|
+
? ctx.permission.isAllowed(ruleKey)
|
|
171
|
+
: false;
|
|
172
|
+
if (!allowed) {
|
|
173
|
+
const preview = tc.name === 'write_file' && writePrinter.anyStreamed
|
|
174
|
+
? `写入文件：${a.path ?? ''}（内容已在上方流式展示）`
|
|
175
|
+
: tool.preview
|
|
176
|
+
? tool.preview(a)
|
|
177
|
+
: `${tc.name}(${tc.arguments})`;
|
|
178
|
+
const choice = await ctx.confirm(preview, ruleKey ? { ruleKey } : undefined);
|
|
179
|
+
if (choice === 'no') {
|
|
180
|
+
history.push({
|
|
181
|
+
role: 'tool',
|
|
182
|
+
tool_call_id: tc.id,
|
|
183
|
+
content: '用户拒绝执行此操作。',
|
|
184
|
+
});
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
if (choice === 'always' && ruleKey) {
|
|
188
|
+
ctx.permission.allow(ruleKey);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
// 展示：调用摘要 + （write/edit）内容块；write_file 已流式则跳过（避免重复）
|
|
193
|
+
const alreadyStreamed = tc.name === 'write_file' && writePrinter.anyStreamed;
|
|
194
|
+
if (!alreadyStreamed) {
|
|
195
|
+
bodyPrint(style.tool(`\n⚙ ${formatToolCall(tc)}\n`));
|
|
196
|
+
const lines = toolCallLines(tc);
|
|
197
|
+
if (lines)
|
|
198
|
+
bodyPrint(renderWithFold(lines, gutter));
|
|
199
|
+
}
|
|
200
|
+
const result = await executeTool(tc.name, tc.arguments, ctx);
|
|
201
|
+
bodyPrint(style.muted(` → ${formatToolResult(tc, result)}\n`));
|
|
202
|
+
history.push({
|
|
203
|
+
role: 'tool',
|
|
204
|
+
tool_call_id: tc.id,
|
|
205
|
+
content: result,
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
print(style.muted('（子代理结束）\n'));
|
|
210
|
+
return lastText || '（子代理未给出文本结论）';
|
|
211
|
+
}
|
|
212
|
+
//# sourceMappingURL=task.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/cli/run/task.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/index.js
CHANGED
|
@@ -75,9 +75,24 @@ export async function registerMcpTools(manager) {
|
|
|
75
75
|
export function getTool(name) {
|
|
76
76
|
return tools.find((t) => t.name === name);
|
|
77
77
|
}
|
|
78
|
-
/**
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
/**
|
|
79
|
+
* 注册一个工具（同名已存在则替换）。
|
|
80
|
+
* 供 task 等动态工具注册、以及测试注入探针工具使用。
|
|
81
|
+
*/
|
|
82
|
+
export function registerTool(tool) {
|
|
83
|
+
const i = tools.findIndex((t) => t.name === tool.name);
|
|
84
|
+
if (i >= 0)
|
|
85
|
+
tools[i] = tool;
|
|
86
|
+
else
|
|
87
|
+
tools.push(tool);
|
|
88
|
+
}
|
|
89
|
+
/** 转成 OpenAI function-calling 需要的工具定义数组。
|
|
90
|
+
* 传 allowedNames 时只返回这些工具（供子代理按类型裁剪工具集）。 */
|
|
91
|
+
export function toolDefs(allowedNames) {
|
|
92
|
+
const set = allowedNames ? new Set(allowedNames) : null;
|
|
93
|
+
return tools
|
|
94
|
+
.filter((t) => !set || set.has(t.name))
|
|
95
|
+
.map((t) => ({
|
|
81
96
|
type: 'function',
|
|
82
97
|
function: {
|
|
83
98
|
name: t.name,
|
|
@@ -86,11 +101,15 @@ export function toolDefs() {
|
|
|
86
101
|
},
|
|
87
102
|
}));
|
|
88
103
|
}
|
|
104
|
+
/** 当前已注册工具的名字列表（供子代理计算「除 task 外的全部工具」）。 */
|
|
105
|
+
export function toolNames() {
|
|
106
|
+
return tools.map((t) => t.name);
|
|
107
|
+
}
|
|
89
108
|
/**
|
|
90
109
|
* 按名字执行工具，返回给模型的文本结果。
|
|
91
110
|
* 任何错误都转成文本返回（让模型看到失败原因并自行决定下一步），而不是抛异常。
|
|
92
111
|
*/
|
|
93
|
-
export async function executeTool(name, argsJson) {
|
|
112
|
+
export async function executeTool(name, argsJson, ctx) {
|
|
94
113
|
const tool = tools.find((t) => t.name === name);
|
|
95
114
|
if (!tool)
|
|
96
115
|
return `错误：未知工具 ${name}`;
|
|
@@ -102,7 +121,7 @@ export async function executeTool(name, argsJson) {
|
|
|
102
121
|
return `错误：参数不是合法 JSON：${argsJson}`;
|
|
103
122
|
}
|
|
104
123
|
try {
|
|
105
|
-
return await tool.run(args);
|
|
124
|
+
return await tool.run(args, ctx);
|
|
106
125
|
}
|
|
107
126
|
catch (e) {
|
|
108
127
|
return `错误：${e?.message ?? String(e)}`;
|
package/dist/tools/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAO9C,cAAc;AACd,MAAM,YAAY,GAAW;IACzB,YAAY;IACZ,WAAW;IACX,QAAQ;IACR,aAAa;IACb,YAAY;IACZ,QAAQ;IACR,cAAc;IACd,YAAY;CACf,CAAC;AAEF,0BAA0B;AAC1B,IAAI,KAAK,GAAW,CAAC,GAAG,YAAY,CAAC,CAAC;AAEtC,8CAA8C;AAC9C,IAAI,UAAU,GAA4B,IAAI,CAAC;AAE/C,uBAAuB;AACvB,MAAM,UAAU,UAAU;IACtB,KAAK,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;IAC1B,UAAU,GAAG,IAAI,CAAC;AACtB,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,wBAAwB,CAAC,UAAkB;IACvD,MAAM,MAAM,GAAG,QAAQ,UAAU,IAAI,CAAC;IACtC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,qBAAqB;IACjC,KAAK,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;AAC9B,CAAC;AAED,kCAAkC;AAClC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAyB;IAC5D,UAAU,GAAG,OAAO,CAAC;IACrB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACvB,MAAM,OAAO,GAAS;YAClB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,YAAY,EAAE,IAAI,EAAE,oBAAoB;YACxC,OAAO,EAAE,CAAC,IAAS,EAAE,EAAE;gBACnB,OAAO,IAAI,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,YAAY,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACtF,CAAC;YACD,GAAG,EAAE,KAAK,EAAE,IAAS,EAAE,EAAE;gBACrB,IAAI,CAAC,UAAU,EAAE,CAAC;oBACd,OAAO,sBAAsB,CAAC;gBAClC,CAAC;gBACD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7D,CAAC;SACJ,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;AACL,CAAC;AAED,+BAA+B;AAC/B,MAAM,UAAU,OAAO,CAAC,IAAY;IAChC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,
|
|
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;AA+CH,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"}
|