@gird/ccli 2.11.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 +6 -1
- package/dist/agent/ai.js +24 -9
- package/dist/agent/ai.js.map +1 -1
- package/dist/cli/confirm-select.js +123 -0
- package/dist/cli/confirm-select.js.map +1 -1
- package/dist/cli/repl/index.js +43 -6
- package/dist/cli/repl/index.js.map +1 -1
- package/dist/cli/run/fold.js +51 -0
- package/dist/cli/run/fold.js.map +1 -0
- package/dist/cli/run/format.js +278 -0
- package/dist/cli/run/format.js.map +1 -0
- package/dist/cli/run/index.js +77 -17
- 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/permissions.js +98 -0
- package/dist/cli/run/permissions.js.map +1 -0
- package/dist/cli/run/stream-write.js +246 -0
- package/dist/cli/run/stream-write.js.map +1 -0
- package/dist/cli/run/task.js +212 -0
- package/dist/cli/run/task.js.map +1 -0
- package/dist/cli/slash/system/agent.js +1 -1
- package/dist/cli/slash/system/agent.js.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- 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
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 会话内工具调用权限(「本次会话始终允许同类」)。
|
|
3
|
+
*
|
|
4
|
+
* 破坏性工具(write_file / edit_file / bash)每次执行前都要确认,高频使用时很烦——
|
|
5
|
+
* 比如反复跑 `npm test`、反复改 `src/` 下的文件。这里让用户在确认时选「本次会话
|
|
6
|
+
* 始终允许」,把规则记进内存 allow-list,之后同类调用直接放行、不再问。
|
|
7
|
+
*
|
|
8
|
+
* 规则粒度:
|
|
9
|
+
* - bash → 按「命令首词」(`bash:npm`、`bash:git`)。
|
|
10
|
+
* - write_file / edit_file → 按「路径首段目录」(`write_file:src`、`edit_file:<root>`)。
|
|
11
|
+
* allow-list 只在内存里,随会话结束清空(不持久化)。
|
|
12
|
+
*/
|
|
13
|
+
/** 取 bash 命令的首词(第一个空白分隔的 token),用于同类匹配。 */
|
|
14
|
+
function bashHead(command) {
|
|
15
|
+
return command.trim().split(/\s+/)[0] ?? '';
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* 把文件路径归一成「放行桶」:
|
|
19
|
+
* - 相对路径取首段目录:`src/tools/foo.ts` → `src`;`./src/foo.ts`(去 ./)→ `src`。
|
|
20
|
+
* - 根级文件(无目录):`README.md` → `<root>`。
|
|
21
|
+
* - 绝对路径:`/Users/x/foo.ts` → `<abs>`(不与相对路径混,单独成桶,更保守)。
|
|
22
|
+
* 空字符串 → ''(调用方据此返回 null)。
|
|
23
|
+
*/
|
|
24
|
+
function pathBucket(p) {
|
|
25
|
+
let s = String(p ?? '').trim();
|
|
26
|
+
if (!s)
|
|
27
|
+
return '';
|
|
28
|
+
while (s.startsWith('./'))
|
|
29
|
+
s = s.slice(2);
|
|
30
|
+
if (s.startsWith('/'))
|
|
31
|
+
return '<abs>';
|
|
32
|
+
const idx = s.indexOf('/');
|
|
33
|
+
return idx === -1 ? '<root>' : s.slice(0, idx);
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* 为一次工具调用生成「同类规则」key。返回 null 表示该工具不支持「始终允许」。
|
|
37
|
+
* - bash → `bash:<首词>`,例如 `npm test` → `bash:npm`。
|
|
38
|
+
* - write_file / edit_file → `<工具>:<路径桶>`,例如写 `src/a.ts` → `write_file:src`。
|
|
39
|
+
* - 其它工具(含 MCP)→ null(每次仍需确认)。
|
|
40
|
+
*/
|
|
41
|
+
export function ruleKeyFor(toolName, args) {
|
|
42
|
+
if (toolName === 'bash') {
|
|
43
|
+
const head = bashHead(String(args?.command ?? ''));
|
|
44
|
+
return head ? `bash:${head}` : null;
|
|
45
|
+
}
|
|
46
|
+
if (toolName === 'write_file' || toolName === 'edit_file') {
|
|
47
|
+
const bucket = pathBucket(String(args?.path ?? ''));
|
|
48
|
+
return bucket ? `${toolName}:${bucket}` : null;
|
|
49
|
+
}
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
/** 路径桶的人类可读描述(用于确认选项标签)。 */
|
|
53
|
+
function bucketLabel(bucket) {
|
|
54
|
+
if (bucket === '<root>')
|
|
55
|
+
return '根目录文件';
|
|
56
|
+
if (bucket === '<abs>')
|
|
57
|
+
return '绝对路径文件';
|
|
58
|
+
return `'${bucket}/' 目录`;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 由规则 key 生成「始终允许」选项的展示标签。
|
|
62
|
+
* - `bash:npm` → `始终允许 'npm'`
|
|
63
|
+
* - `write_file:src` → `始终允许写 'src/' 目录`
|
|
64
|
+
* - `edit_file:<root>` → `始终允许编辑根目录文件`
|
|
65
|
+
*/
|
|
66
|
+
export function alwaysLabelFor(ruleKey) {
|
|
67
|
+
if (ruleKey.startsWith('bash:')) {
|
|
68
|
+
return `始终允许 '${ruleKey.slice('bash:'.length)}'`;
|
|
69
|
+
}
|
|
70
|
+
if (ruleKey.startsWith('write_file:')) {
|
|
71
|
+
return `始终允许写 ${bucketLabel(ruleKey.slice('write_file:'.length))}`;
|
|
72
|
+
}
|
|
73
|
+
if (ruleKey.startsWith('edit_file:')) {
|
|
74
|
+
return `始终允许编辑 ${bucketLabel(ruleKey.slice('edit_file:'.length))}`;
|
|
75
|
+
}
|
|
76
|
+
return `始终允许 ${ruleKey}`;
|
|
77
|
+
}
|
|
78
|
+
/** 会话级 allow-list。 */
|
|
79
|
+
export class Permission {
|
|
80
|
+
allowed = new Set();
|
|
81
|
+
/** key 是否已放行。 */
|
|
82
|
+
isAllowed(key) {
|
|
83
|
+
return this.allowed.has(key);
|
|
84
|
+
}
|
|
85
|
+
/** 放行 key(本次会话内)。 */
|
|
86
|
+
allow(key) {
|
|
87
|
+
this.allowed.add(key);
|
|
88
|
+
}
|
|
89
|
+
/** 清空全部放行(例如 /clear 或新会话)。 */
|
|
90
|
+
clear() {
|
|
91
|
+
this.allowed.clear();
|
|
92
|
+
}
|
|
93
|
+
/** 当前放行规则数(调试用)。 */
|
|
94
|
+
size() {
|
|
95
|
+
return this.allowed.size;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=permissions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/cli/run/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,246 @@
|
|
|
1
|
+
import { style } from '../style.js';
|
|
2
|
+
import { FOLD_THRESHOLD, registerFolded } from './fold.js';
|
|
3
|
+
/** 解码一个 \ 开头的转义;返回解码字符与下一位置;转义未完(含 \u 不足 4 位)返回 undefined。 */
|
|
4
|
+
function escapeChar(args, i) {
|
|
5
|
+
const n = args[i + 1];
|
|
6
|
+
if (n === undefined)
|
|
7
|
+
return undefined;
|
|
8
|
+
switch (n) {
|
|
9
|
+
case 'n':
|
|
10
|
+
return { char: '\n', next: i + 2 };
|
|
11
|
+
case 'r':
|
|
12
|
+
return { char: '\r', next: i + 2 };
|
|
13
|
+
case 't':
|
|
14
|
+
return { char: '\t', next: i + 2 };
|
|
15
|
+
case 'b':
|
|
16
|
+
return { char: '\b', next: i + 2 };
|
|
17
|
+
case 'f':
|
|
18
|
+
return { char: '\f', next: i + 2 };
|
|
19
|
+
case '"':
|
|
20
|
+
return { char: '"', next: i + 2 };
|
|
21
|
+
case '\\':
|
|
22
|
+
return { char: '\\', next: i + 2 };
|
|
23
|
+
case '/':
|
|
24
|
+
return { char: '/', next: i + 2 };
|
|
25
|
+
case 'u': {
|
|
26
|
+
const hex = args.slice(i + 2, i + 6);
|
|
27
|
+
if (hex.length < 4 || !/^[0-9a-fA-F]{4}$/.test(hex))
|
|
28
|
+
return undefined;
|
|
29
|
+
return { char: String.fromCharCode(parseInt(hex, 16)), next: i + 6 };
|
|
30
|
+
}
|
|
31
|
+
default:
|
|
32
|
+
return { char: n, next: i + 2 };
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
/** 从 args 中尽力解出一个 JSON 字符串字段的「完整值」;未完整返回 undefined。 */
|
|
36
|
+
function extractStringField(args, field) {
|
|
37
|
+
const key = `"${field}"`;
|
|
38
|
+
const k = args.indexOf(key);
|
|
39
|
+
if (k < 0)
|
|
40
|
+
return undefined;
|
|
41
|
+
let i = k + key.length;
|
|
42
|
+
while (i < args.length && (args[i] === ':' || /\s/.test(args[i])))
|
|
43
|
+
i++;
|
|
44
|
+
if (args[i] !== '"')
|
|
45
|
+
return undefined;
|
|
46
|
+
i++;
|
|
47
|
+
let out = '';
|
|
48
|
+
while (i < args.length) {
|
|
49
|
+
const ch = args[i];
|
|
50
|
+
if (ch === '\\') {
|
|
51
|
+
const r = escapeChar(args, i);
|
|
52
|
+
if (r === undefined)
|
|
53
|
+
return undefined;
|
|
54
|
+
out += r.char;
|
|
55
|
+
i = r.next;
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
if (ch === '"')
|
|
59
|
+
return out;
|
|
60
|
+
out += ch;
|
|
61
|
+
i++;
|
|
62
|
+
}
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
/** 解码 content 字段的「当前最长可解码前缀」(允许未闭合)。 */
|
|
66
|
+
function decodeContentPrefix(args) {
|
|
67
|
+
const key = '"content"';
|
|
68
|
+
const k = args.indexOf(key);
|
|
69
|
+
if (k < 0)
|
|
70
|
+
return { started: false, ended: false, value: '' };
|
|
71
|
+
let i = k + key.length;
|
|
72
|
+
while (i < args.length && (args[i] === ':' || /\s/.test(args[i])))
|
|
73
|
+
i++;
|
|
74
|
+
if (args[i] !== '"')
|
|
75
|
+
return { started: false, ended: false, value: '' };
|
|
76
|
+
i++;
|
|
77
|
+
let out = '';
|
|
78
|
+
let ended = false;
|
|
79
|
+
while (i < args.length) {
|
|
80
|
+
const ch = args[i];
|
|
81
|
+
if (ch === '\\') {
|
|
82
|
+
const r = escapeChar(args, i);
|
|
83
|
+
if (r === undefined)
|
|
84
|
+
break; // 转义未完 → 停,等下一片
|
|
85
|
+
out += r.char;
|
|
86
|
+
i = r.next;
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
if (ch === '"') {
|
|
90
|
+
ended = true;
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
out += ch;
|
|
94
|
+
i++;
|
|
95
|
+
}
|
|
96
|
+
return { started: true, ended, value: out };
|
|
97
|
+
}
|
|
98
|
+
export class WriteContentStreamer {
|
|
99
|
+
decoded = '';
|
|
100
|
+
started = false;
|
|
101
|
+
ended = false;
|
|
102
|
+
path;
|
|
103
|
+
/** 喂入「截至目前的累计 arguments 字符串」,返回新增解码结果。 */
|
|
104
|
+
feed(argsSoFar) {
|
|
105
|
+
if (this.path === undefined) {
|
|
106
|
+
this.path = extractStringField(argsSoFar, 'path');
|
|
107
|
+
}
|
|
108
|
+
if (!this.started) {
|
|
109
|
+
const r = decodeContentPrefix(argsSoFar);
|
|
110
|
+
if (!r.started) {
|
|
111
|
+
return {
|
|
112
|
+
delta: '',
|
|
113
|
+
started: false,
|
|
114
|
+
ended: false,
|
|
115
|
+
path: this.path,
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
this.started = true;
|
|
119
|
+
this.decoded = r.value;
|
|
120
|
+
this.ended = r.ended;
|
|
121
|
+
return {
|
|
122
|
+
delta: r.value,
|
|
123
|
+
started: true,
|
|
124
|
+
ended: r.ended,
|
|
125
|
+
path: this.path,
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
if (this.ended) {
|
|
129
|
+
return { delta: '', started: true, ended: true, path: this.path };
|
|
130
|
+
}
|
|
131
|
+
const r = decodeContentPrefix(argsSoFar);
|
|
132
|
+
const delta = r.value.slice(this.decoded.length);
|
|
133
|
+
this.decoded = r.value;
|
|
134
|
+
this.ended = r.ended;
|
|
135
|
+
return { delta, started: true, ended: r.ended, path: this.path };
|
|
136
|
+
}
|
|
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
|
+
}
|
|
246
|
+
//# sourceMappingURL=stream-write.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-write.js","sourceRoot":"","sources":["../../../src/cli/run/stream-write.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAwB3D,8DAA8D;AAC9D,SAAS,UAAU,CACf,IAAY,EACZ,CAAS;IAET,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACtC,QAAQ,CAAC,EAAE,CAAC;QACR,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACtC,KAAK,IAAI;YACL,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,GAAG;YACJ,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACtC,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,SAAS,CAAC;YACtE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QACzE,CAAC;QACD;YACI,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,CAAC;AACL,CAAC;AAED,uDAAuD;AACvD,SAAS,kBAAkB,CAAC,IAAY,EAAE,KAAa;IACnD,MAAM,GAAG,GAAG,IAAI,KAAK,GAAG,CAAC;IACzB,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;IACvB,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAAE,CAAC,EAAE,CAAC;IACvE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO,SAAS,CAAC;IACtC,CAAC,EAAE,CAAC;IACJ,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YACd,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,SAAS;gBAAE,OAAO,SAAS,CAAC;YACtC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;YACd,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACX,SAAS;QACb,CAAC;QACD,IAAI,EAAE,KAAK,GAAG;YAAE,OAAO,GAAG,CAAC;QAC3B,GAAG,IAAI,EAAE,CAAC;QACV,CAAC,EAAE,CAAC;IACR,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,wCAAwC;AACxC,SAAS,mBAAmB,CAAC,IAAY;IAKrC,MAAM,GAAG,GAAG,WAAW,CAAC;IACxB,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC9D,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;IACvB,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAAE,CAAC,EAAE,CAAC;IACvE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACxE,CAAC,EAAE,CAAC;IACJ,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YACd,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,SAAS;gBAAE,MAAM,CAAC,gBAAgB;YAC5C,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;YACd,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACX,SAAS;QACb,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACb,KAAK,GAAG,IAAI,CAAC;YACb,MAAM;QACV,CAAC;QACD,GAAG,IAAI,EAAE,CAAC;QACV,CAAC,EAAE,CAAC;IACR,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,OAAO,oBAAoB;IACrB,OAAO,GAAG,EAAE,CAAC;IACb,OAAO,GAAG,KAAK,CAAC;IAChB,KAAK,GAAG,KAAK,CAAC;IACtB,IAAI,CAAU;IAEd,0CAA0C;IAC1C,IAAI,CAAC,SAAiB;QAClB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO;oBACH,KAAK,EAAE,EAAE;oBACT,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI,CAAC,IAAI;iBAClB,CAAC;YACN,CAAC;YACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACrB,OAAO;gBACH,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,IAAI,EAAE,IAAI,CAAC,IAAI;aAClB,CAAC;QACN,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACtE,CAAC;QACD,MAAM,CAAC,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QACrB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACrE,CAAC;CACJ;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,sBAAsB;IAqBX;IApBZ,SAAS,GAAG,IAAI,GAAG,EAAgC,CAAC;IACpD,SAAS,GAAG,IAAI,GAAG,EAexB,CAAC;IACI,WAAW,GAAG,KAAK,CAAC;IAE5B,0DAA0D;IAC1D,YAAoB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEvC,yDAAyD;IACzD,WAAW,CACP,KAAa,EACb,IAAY,EACZ,SAAiB,EACjB,KAA8B;QAE9B,IAAI,IAAI,KAAK,YAAY;YAAE,OAAO;QAClC,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAC;YACtC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,EAAE,GAAG;gBACD,aAAa,EAAE,KAAK;gBACpB,MAAM,EAAE,CAAC;gBACT,WAAW,EAAE,IAAI;gBACjB,QAAQ,EAAE,EAAE;gBACZ,GAAG,EAAE,EAAE;gBACP,MAAM,EAAE,KAAK;gBACb,aAAa,EAAE,KAAK;aACvB,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC/C,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;YACpB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;YAC/D,EAAE,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,EAAE,CAChB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;QAC3D,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBACjB,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;gBACvB,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;gBACnB,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,wBAAwB;gBACpC,IAAI,EAAE,CAAC,MAAM,GAAG,cAAc,EAAE,CAAC;oBAC7B,qBAAqB;oBACrB,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;wBACpB,KAAK,CACD,KAAK,CAAC,KAAK,CACP,0BAA0B,CAC7B,GAAG,IAAI,CACX,CAAC;wBACF,EAAE,CAAC,aAAa,GAAG,IAAI,CAAC;wBACxB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC;oBACrB,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,KAAK,CAAC,CAAC,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;YACD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBACd,8BAA8B;gBAC9B,IAAI,EAAE,CAAC,MAAM,IAAI,cAAc;oBAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7C,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACzB,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;gBACZ,EAAE,CAAC,MAAM,EAAE,CAAC;gBACZ,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACJ,yBAAyB;gBACzB,IAAI,EAAE,CAAC,MAAM,IAAI,cAAc;oBAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC3C,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC;YACjB,CAAC;QACL,CAAC;QACD,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACV,kCAAkC;YAClC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACzB,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;YAChB,CAAC;YACD,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;gBACZ,8CAA8C;gBAC9C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7D,CAAC;iBAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;gBACzB,6BAA6B;gBAC7B,KAAK,CAAC,IAAI,CAAC,CAAC;gBACZ,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1B,CAAC;QACL,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,iDAAiD;IACjD,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;CACJ"}
|
|
@@ -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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"}
|
|
@@ -129,7 +129,7 @@ export function makeConfirm(ctx) {
|
|
|
129
129
|
return async (preview) => {
|
|
130
130
|
console.log('\n' + preview);
|
|
131
131
|
const answer = (await ctx.ask('确认执行?(y/N) ')).trim().toLowerCase();
|
|
132
|
-
return answer === 'y' || answer === 'yes';
|
|
132
|
+
return answer === 'y' || answer === 'yes' ? 'yes' : 'no';
|
|
133
133
|
};
|
|
134
134
|
}
|
|
135
135
|
/** /agent:先制定计划,确认后自动执行。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/agent.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -120,10 +120,10 @@ async function main() {
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
const confirm = args.yes
|
|
123
|
-
? () => Promise.resolve(
|
|
123
|
+
? () => Promise.resolve('yes')
|
|
124
124
|
: async (preview) => {
|
|
125
125
|
console.error(style.warn(`\n[非交互式模式] 需要确认以下操作,请添加 --yes 自动批准:\n${preview}`));
|
|
126
|
-
return
|
|
126
|
+
return 'no';
|
|
127
127
|
};
|
|
128
128
|
try {
|
|
129
129
|
await runOnce({
|