sema-core 2.0.13 → 2.0.15
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 +51 -37
- package/dist/conf/config.d.ts +1 -1
- package/dist/conf/config.d.ts.map +1 -1
- package/dist/conf/config.js +1 -1
- package/dist/conf/config.js.map +1 -1
- package/dist/core/Conversation.js +8 -5
- package/dist/core/Conversation.js.map +1 -1
- package/dist/core/SemaCore.d.ts +2 -0
- package/dist/core/SemaCore.d.ts.map +1 -1
- package/dist/core/SemaCore.js +5 -0
- package/dist/core/SemaCore.js.map +1 -1
- package/dist/core/SemaEngine.d.ts +10 -3
- package/dist/core/SemaEngine.d.ts.map +1 -1
- package/dist/core/SemaEngine.js +78 -16
- package/dist/core/SemaEngine.js.map +1 -1
- package/dist/core/SemaSession.d.ts +7 -1
- package/dist/core/SemaSession.d.ts.map +1 -1
- package/dist/core/SemaSession.js +15 -1
- package/dist/core/SemaSession.js.map +1 -1
- package/dist/events/types.d.ts +4 -1
- package/dist/events/types.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/manager/CheckpointManager.d.ts +5 -0
- package/dist/manager/CheckpointManager.d.ts.map +1 -1
- package/dist/manager/CheckpointManager.js +8 -0
- package/dist/manager/CheckpointManager.js.map +1 -1
- package/dist/manager/CronManager.d.ts +2 -1
- package/dist/manager/CronManager.d.ts.map +1 -1
- package/dist/manager/CronManager.js +6 -2
- package/dist/manager/CronManager.js.map +1 -1
- package/dist/manager/ModelManager.d.ts +15 -3
- package/dist/manager/ModelManager.d.ts.map +1 -1
- package/dist/manager/ModelManager.js +51 -3
- package/dist/manager/ModelManager.js.map +1 -1
- package/dist/manager/PermissionManager.d.ts.map +1 -1
- package/dist/manager/PermissionManager.js +26 -1
- package/dist/manager/PermissionManager.js.map +1 -1
- package/dist/manager/StateManager.d.ts +2 -1
- package/dist/manager/StateManager.d.ts.map +1 -1
- package/dist/manager/StateManager.js.map +1 -1
- package/dist/prompt/system.d.ts +1 -1
- package/dist/prompt/system.d.ts.map +1 -1
- package/dist/prompt/system.js +3 -1
- package/dist/prompt/system.js.map +1 -1
- package/dist/prompt/tools/createCron.d.ts +1 -1
- package/dist/prompt/tools/createCron.d.ts.map +1 -1
- package/dist/prompt/tools/createCron.js +1 -0
- package/dist/prompt/tools/createCron.js.map +1 -1
- package/dist/services/agents/genSystemPrompt.d.ts +1 -0
- package/dist/services/agents/genSystemPrompt.d.ts.map +1 -1
- package/dist/services/agents/genSystemPrompt.js +24 -3
- package/dist/services/agents/genSystemPrompt.js.map +1 -1
- package/dist/services/agents/genSystemReminder.d.ts.map +1 -1
- package/dist/services/agents/genSystemReminder.js +3 -1
- package/dist/services/agents/genSystemReminder.js.map +1 -1
- package/dist/services/api/adapt/anthropic.d.ts.map +1 -1
- package/dist/services/api/adapt/anthropic.js +5 -4
- package/dist/services/api/adapt/anthropic.js.map +1 -1
- package/dist/services/api/adapt/openai.d.ts.map +1 -1
- package/dist/services/api/adapt/openai.js +5 -4
- package/dist/services/api/adapt/openai.js.map +1 -1
- package/dist/services/api/adapt/util.d.ts +4 -2
- package/dist/services/api/adapt/util.d.ts.map +1 -1
- package/dist/services/api/adapt/util.js +31 -20
- package/dist/services/api/adapt/util.js.map +1 -1
- package/dist/services/api/apiUtil.d.ts +1 -1
- package/dist/services/api/apiUtil.js +3 -3
- package/dist/services/api/apiUtil.js.map +1 -1
- package/dist/services/api/queryLLM.d.ts.map +1 -1
- package/dist/services/api/queryLLM.js +3 -2
- package/dist/services/api/queryLLM.js.map +1 -1
- package/dist/services/commands/runCommand.js +1 -1
- package/dist/services/commands/runCommand.js.map +1 -1
- package/dist/tools/CreateCron.d.ts +8 -1
- package/dist/tools/CreateCron.d.ts.map +1 -1
- package/dist/tools/CreateCron.js +10 -7
- package/dist/tools/CreateCron.js.map +1 -1
- package/dist/tools/EditNotebook.d.ts +1 -1
- package/dist/tools/PickOption.d.ts.map +1 -1
- package/dist/tools/PickOption.js +6 -0
- package/dist/tools/PickOption.js.map +1 -1
- package/dist/tools/SubAgent.js +7 -7
- package/dist/tools/SubAgent.js.map +1 -1
- package/dist/types/cron.d.ts +2 -1
- package/dist/types/cron.d.ts.map +1 -1
- package/dist/types/fork.d.ts +12 -0
- package/dist/types/fork.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/message.d.ts +2 -0
- package/dist/types/message.d.ts.map +1 -1
- package/dist/types/session.d.ts +4 -0
- package/dist/types/session.d.ts.map +1 -1
- package/dist/util/agentStats.d.ts +3 -1
- package/dist/util/agentStats.d.ts.map +1 -1
- package/dist/util/agentStats.js +17 -3
- package/dist/util/agentStats.js.map +1 -1
- package/dist/util/compact.d.ts +1 -1
- package/dist/util/compact.d.ts.map +1 -1
- package/dist/util/compact.js +8 -8
- package/dist/util/compact.js.map +1 -1
- package/dist/util/history.d.ts +10 -0
- package/dist/util/history.d.ts.map +1 -1
- package/dist/util/history.js +57 -0
- package/dist/util/history.js.map +1 -1
- package/dist/util/inputQueue.d.ts +2 -1
- package/dist/util/inputQueue.d.ts.map +1 -1
- package/dist/util/model.d.ts +6 -0
- package/dist/util/model.d.ts.map +1 -1
- package/dist/util/model.js +15 -0
- package/dist/util/model.js.map +1 -1
- package/dist/util/notifyRegistry.d.ts +4 -2
- package/dist/util/notifyRegistry.d.ts.map +1 -1
- package/dist/util/shellSafety.d.ts +12 -0
- package/dist/util/shellSafety.d.ts.map +1 -1
- package/dist/util/shellSafety.js +250 -7
- package/dist/util/shellSafety.js.map +1 -1
- package/dist/util/tokens.d.ts +1 -1
- package/dist/util/tokens.d.ts.map +1 -1
- package/dist/util/tokens.js +2 -2
- package/dist/util/tokens.js.map +1 -1
- package/package.json +1 -1
package/dist/util/shellSafety.js
CHANGED
|
@@ -1,19 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.hasRedirection = hasRedirection;
|
|
4
|
+
exports.classifyCommandSubstitutions = classifyCommandSubstitutions;
|
|
4
5
|
exports.hasDangerousCommand = hasDangerousCommand;
|
|
5
6
|
exports.isUnsafeForPrefixAuth = isUnsafeForPrefixAuth;
|
|
6
7
|
exports.isReadonlySafeCommand = isReadonlySafeCommand;
|
|
7
8
|
const commands_1 = require("./commands");
|
|
8
9
|
// 仅凭首词即可判定安全的「真只读」单命令。
|
|
9
|
-
// find 列入只读,但需额外排除危险动作 flag(见
|
|
10
|
+
// find 列入只读,但需额外排除危险动作 flag(见 ALWAYS_DANGEROUS_FIND_FLAGS),
|
|
11
|
+
// -exec/-execdir 则按目标命令递归分类(见 classifyFindExecTargets)。
|
|
10
12
|
const READONLY_COMMANDS = new Set([
|
|
11
13
|
'pwd', 'tree', 'date', 'which', 'find',
|
|
12
14
|
'ls', 'grep', 'head', 'tail', 'cat', 'du', 'wc', 'echo', 'env', 'printenv',
|
|
13
15
|
]);
|
|
14
|
-
// find
|
|
15
|
-
//
|
|
16
|
-
|
|
16
|
+
// find 的确定性危险 flag:删除(-delete)、写文件(-fprintf/-fprint/-fprint0/-fls)、
|
|
17
|
+
// 交互确认(-ok/-okdir,会在非 tty 下挂住 shell,且同样是命令执行原语)。
|
|
18
|
+
// 命中即确定性危险,无目标命令可细分;整段正则匹配(含 -exec 目标内),fail-closed。
|
|
19
|
+
// -exec/-execdir 不在此列:它们的危险性取决于目标命令,由 classifyFindExecTargets 递归分类。
|
|
20
|
+
const ALWAYS_DANGEROUS_FIND_FLAGS = /(^|\s)-(ok(dir)?|delete|fprint(0|f)?|fls)\b/;
|
|
17
21
|
// 仅允许整条精确匹配的完整命令(多词命令不能按首词放行,如 git 仅放行只读子命令)
|
|
18
22
|
const SAFE_FULL_COMMANDS = new Set([
|
|
19
23
|
'git status', 'git diff', 'git log', 'git branch',
|
|
@@ -128,6 +132,232 @@ const DANGEROUS_PREFIX_COMMANDS = new Set([
|
|
|
128
132
|
'sudo', 'doas', 'su',
|
|
129
133
|
'mv',
|
|
130
134
|
]);
|
|
135
|
+
const FIND_EXEC_TOKENS = new Set(['-exec', '-execdir']);
|
|
136
|
+
// shell 解释器:-exec sh -c '...' 是任意命令执行原语,与危险首词同级,
|
|
137
|
+
// 不给模型判断机会(isDangerousSubcommand 只查首词集合,覆盖不到这里)
|
|
138
|
+
const SHELL_INTERPRETERS = new Set(['sh', 'bash', 'zsh', 'dash', 'ksh', 'fish']);
|
|
139
|
+
// 剥掉 token 两侧成对的引号(find -exec cat {} ';' 中的 ';' → ;),用于识别结束符与 {}
|
|
140
|
+
function unquoteToken(t) {
|
|
141
|
+
if (t.length >= 2 && ((t.startsWith("'") && t.endsWith("'")) || (t.startsWith('"') && t.endsWith('"')))) {
|
|
142
|
+
return t.slice(1, -1);
|
|
143
|
+
}
|
|
144
|
+
return t;
|
|
145
|
+
}
|
|
146
|
+
function classifyExecTarget(target) {
|
|
147
|
+
const t = target.trim();
|
|
148
|
+
// 空目标(-exec ; / -exec +)不是合法 find 语法,按解析异常 fail-closed
|
|
149
|
+
if (!t)
|
|
150
|
+
return 'dangerous';
|
|
151
|
+
const first = t.split(/\s+/)[0];
|
|
152
|
+
if (SHELL_INTERPRETERS.has(first))
|
|
153
|
+
return 'dangerous';
|
|
154
|
+
// 递归复用顶层分类:危险首词/嵌套 find 危险 flag → dangerous;只读安全 → readonly;其余 → gray
|
|
155
|
+
if (isDangerousSubcommand(t))
|
|
156
|
+
return 'dangerous';
|
|
157
|
+
if (isReadonlySafeSubcommand(t))
|
|
158
|
+
return 'readonly';
|
|
159
|
+
return 'gray';
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* 提取 find 段内所有 -exec/-execdir 的目标命令(-exec 到 ;/+ 结束符之间、剥掉 {}),
|
|
163
|
+
* 逐个分类后取最严结果:任一 dangerous → dangerous;否则任一 gray → gray;全 readonly → readonly。
|
|
164
|
+
*
|
|
165
|
+
* 结束符识别 token 级精确匹配 ; 或 +(含引号包裹形式)。`\;` 形式经 splitCommand 的转义占位
|
|
166
|
+
* 处理后 `;` 会被当作命令分隔符消耗掉,段内只残留孤立的 `\`,找不到结束符 → fail-closed 判
|
|
167
|
+
* dangerous,与现状(一律危险)一致,不放宽。
|
|
168
|
+
*/
|
|
169
|
+
function classifyFindExecTargets(seg) {
|
|
170
|
+
const tokens = seg.trim().split(/\s+/);
|
|
171
|
+
let cls = 'no-exec';
|
|
172
|
+
let i = 0;
|
|
173
|
+
while (i < tokens.length) {
|
|
174
|
+
if (!FIND_EXEC_TOKENS.has(tokens[i])) {
|
|
175
|
+
i++;
|
|
176
|
+
continue;
|
|
177
|
+
}
|
|
178
|
+
const targetTokens = [];
|
|
179
|
+
let j = i + 1;
|
|
180
|
+
let foundEnd = false;
|
|
181
|
+
for (; j < tokens.length; j++) {
|
|
182
|
+
const bare = unquoteToken(tokens[j]);
|
|
183
|
+
if (bare === ';' || bare === '+') {
|
|
184
|
+
foundEnd = true;
|
|
185
|
+
break;
|
|
186
|
+
}
|
|
187
|
+
if (bare !== '{}')
|
|
188
|
+
targetTokens.push(tokens[j]);
|
|
189
|
+
}
|
|
190
|
+
// 找不到结束符(\; 被打散 / 命令截断)→ fail-closed
|
|
191
|
+
if (!foundEnd)
|
|
192
|
+
return 'dangerous';
|
|
193
|
+
const c = classifyExecTarget(targetTokens.join(' '));
|
|
194
|
+
if (c === 'dangerous')
|
|
195
|
+
return 'dangerous';
|
|
196
|
+
if (c === 'gray')
|
|
197
|
+
cls = 'gray';
|
|
198
|
+
else if (cls === 'no-exec')
|
|
199
|
+
cls = 'readonly';
|
|
200
|
+
i = j + 1;
|
|
201
|
+
}
|
|
202
|
+
return cls;
|
|
203
|
+
}
|
|
204
|
+
// ==================== $() 命令替换分类 ====================
|
|
205
|
+
// 命令替换嵌套深度上限:正常命令极少超过 2 层,超限按解析失败 fail-closed
|
|
206
|
+
const MAX_SUBSTITUTION_DEPTH = 3;
|
|
207
|
+
// 骨架占位符:替换 $(...) 后参与分词/分类,纯字母数字下划线,不会引入新的注入特征
|
|
208
|
+
const SUBST_PLACEHOLDER = '__SUBST__';
|
|
209
|
+
/**
|
|
210
|
+
* 从 $( 之后的位置找配对的右括号,返回其下标;找不到返回 -1。
|
|
211
|
+
* 括号仅在引号外计数(含 $(a (b) c) 的子 shell 嵌套);单引号内全字面;
|
|
212
|
+
* 双引号内 ) 为字面不计数。双引号内再嵌 $( 会重新进入命令上下文,解析
|
|
213
|
+
* 复杂度陡增 → fail-closed;替换内任何位置出现反引号同样 fail-closed。
|
|
214
|
+
*/
|
|
215
|
+
function findSubstitutionEnd(s, start) {
|
|
216
|
+
let depth = 1;
|
|
217
|
+
let inSingle = false;
|
|
218
|
+
let inDouble = false;
|
|
219
|
+
for (let i = start; i < s.length; i++) {
|
|
220
|
+
const c = s[i];
|
|
221
|
+
if (inSingle) {
|
|
222
|
+
if (c === "'")
|
|
223
|
+
inSingle = false;
|
|
224
|
+
continue;
|
|
225
|
+
}
|
|
226
|
+
if (c === '\\') {
|
|
227
|
+
i++;
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
if (inDouble) {
|
|
231
|
+
if (c === '$' && s[i + 1] === '(')
|
|
232
|
+
return -1;
|
|
233
|
+
if (c === '`')
|
|
234
|
+
return -1;
|
|
235
|
+
if (c === '"')
|
|
236
|
+
inDouble = false;
|
|
237
|
+
continue;
|
|
238
|
+
}
|
|
239
|
+
if (c === "'") {
|
|
240
|
+
inSingle = true;
|
|
241
|
+
continue;
|
|
242
|
+
}
|
|
243
|
+
if (c === '"') {
|
|
244
|
+
inDouble = true;
|
|
245
|
+
continue;
|
|
246
|
+
}
|
|
247
|
+
if (c === '`')
|
|
248
|
+
return -1;
|
|
249
|
+
if (c === '(') {
|
|
250
|
+
depth++;
|
|
251
|
+
continue;
|
|
252
|
+
}
|
|
253
|
+
if (c === ')') {
|
|
254
|
+
depth--;
|
|
255
|
+
if (depth === 0)
|
|
256
|
+
return i;
|
|
257
|
+
continue;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
return -1;
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
263
|
+
* 提取整条命令中所有顶层 $(...) 命令替换:返回骨架(替换为占位符)与各内层命令文本。
|
|
264
|
+
* 出现反引号(agent 不使用该写法,且无嵌套边界、解析不可靠)、括号不配对、引号不闭合
|
|
265
|
+
* → 返回 null(fail-closed,维持确定性拦截)。
|
|
266
|
+
* 必须在 splitCommand 之前调用:底层 shell-quote 不理解 $() 边界,会把内层的 && / | / ;
|
|
267
|
+
* 当作顶层分隔符拆散替换体。
|
|
268
|
+
*/
|
|
269
|
+
function extractCommandSubstitutions(command) {
|
|
270
|
+
let inSingle = false;
|
|
271
|
+
let inDouble = false;
|
|
272
|
+
let skeleton = '';
|
|
273
|
+
const inners = [];
|
|
274
|
+
for (let i = 0; i < command.length; i++) {
|
|
275
|
+
const c = command[i];
|
|
276
|
+
const next = command[i + 1];
|
|
277
|
+
if (inSingle) {
|
|
278
|
+
if (c === "'")
|
|
279
|
+
inSingle = false;
|
|
280
|
+
skeleton += c;
|
|
281
|
+
continue;
|
|
282
|
+
}
|
|
283
|
+
if (c === '\\') {
|
|
284
|
+
skeleton += c + (next ?? '');
|
|
285
|
+
i++;
|
|
286
|
+
continue;
|
|
287
|
+
}
|
|
288
|
+
if (c === '`')
|
|
289
|
+
return null;
|
|
290
|
+
if (c === '$' && next === '(') {
|
|
291
|
+
const end = findSubstitutionEnd(command, i + 2);
|
|
292
|
+
if (end < 0)
|
|
293
|
+
return null;
|
|
294
|
+
inners.push(command.slice(i + 2, end));
|
|
295
|
+
skeleton += SUBST_PLACEHOLDER;
|
|
296
|
+
i = end;
|
|
297
|
+
continue;
|
|
298
|
+
}
|
|
299
|
+
if (!inDouble && c === "'") {
|
|
300
|
+
inSingle = true;
|
|
301
|
+
skeleton += c;
|
|
302
|
+
continue;
|
|
303
|
+
}
|
|
304
|
+
if (c === '"') {
|
|
305
|
+
inDouble = !inDouble;
|
|
306
|
+
skeleton += c;
|
|
307
|
+
continue;
|
|
308
|
+
}
|
|
309
|
+
skeleton += c;
|
|
310
|
+
}
|
|
311
|
+
if (inSingle || inDouble)
|
|
312
|
+
return null;
|
|
313
|
+
return { skeleton, inners };
|
|
314
|
+
}
|
|
315
|
+
/**
|
|
316
|
+
* 对「注入特征仅可能来自 $() 命令替换」的整条命令做递归分类。
|
|
317
|
+
* 内层命令先递归分类(内层自身可含 && / | / 嵌套 $() 等);随后骨架经 splitCommand
|
|
318
|
+
* 分段,逐段按顶层三层规则判定:危险首词/解释器/嵌套危险 find → dangerous;
|
|
319
|
+
* 只读安全 → readonly;其余 → gray。骨架残留任何注入特征(换行等)→ dangerous。
|
|
320
|
+
*
|
|
321
|
+
* 供权限闸门使用:dangerous → 确定性转人工(不给模型机会);readonly/gray → 交
|
|
322
|
+
* AutoRun 模型判断。刻意不提供确定性放行——放行与否只由模型或人工裁决,解析器
|
|
323
|
+
* 误差最多把命令送去模型,绝不静默放过。
|
|
324
|
+
*/
|
|
325
|
+
function classifyCommandSubstitutions(command, depth = 0) {
|
|
326
|
+
if (depth > MAX_SUBSTITUTION_DEPTH)
|
|
327
|
+
return 'dangerous';
|
|
328
|
+
const parsed = extractCommandSubstitutions(command);
|
|
329
|
+
if (!parsed)
|
|
330
|
+
return 'dangerous';
|
|
331
|
+
let worst = 'readonly';
|
|
332
|
+
for (const inner of parsed.inners) {
|
|
333
|
+
const c = classifyCommandSubstitutions(inner, depth + 1);
|
|
334
|
+
if (c === 'dangerous')
|
|
335
|
+
return 'dangerous';
|
|
336
|
+
if (c === 'gray')
|
|
337
|
+
worst = 'gray';
|
|
338
|
+
}
|
|
339
|
+
let segs;
|
|
340
|
+
try {
|
|
341
|
+
segs = (0, commands_1.splitCommand)(parsed.skeleton);
|
|
342
|
+
}
|
|
343
|
+
catch {
|
|
344
|
+
return 'dangerous';
|
|
345
|
+
}
|
|
346
|
+
if (segs.length === 0)
|
|
347
|
+
return 'dangerous';
|
|
348
|
+
for (const seg of segs) {
|
|
349
|
+
if ((0, commands_1.hasCommandInjection)(seg))
|
|
350
|
+
return 'dangerous';
|
|
351
|
+
const first = seg.trim().split(/\s+/)[0] ?? '';
|
|
352
|
+
if (SHELL_INTERPRETERS.has(first))
|
|
353
|
+
return 'dangerous';
|
|
354
|
+
if (isDangerousSubcommand(seg))
|
|
355
|
+
return 'dangerous';
|
|
356
|
+
if (!isReadonlySafeSubcommand(seg))
|
|
357
|
+
worst = 'gray';
|
|
358
|
+
}
|
|
359
|
+
return worst;
|
|
360
|
+
}
|
|
131
361
|
function isDangerousSubcommand(seg) {
|
|
132
362
|
const s = seg.trim();
|
|
133
363
|
const first = s.split(/\s+/)[0] ?? '';
|
|
@@ -135,8 +365,12 @@ function isDangerousSubcommand(seg) {
|
|
|
135
365
|
return true;
|
|
136
366
|
if (first.startsWith('mkfs'))
|
|
137
367
|
return true; // mkfs / mkfs.ext4 等格式化
|
|
138
|
-
if (first === 'find'
|
|
139
|
-
|
|
368
|
+
if (first === 'find') {
|
|
369
|
+
if (ALWAYS_DANGEROUS_FIND_FLAGS.test(s))
|
|
370
|
+
return true;
|
|
371
|
+
if (classifyFindExecTargets(s) === 'dangerous')
|
|
372
|
+
return true;
|
|
373
|
+
}
|
|
140
374
|
return false;
|
|
141
375
|
}
|
|
142
376
|
/**
|
|
@@ -180,8 +414,17 @@ function isReadonlySafeSubcommand(seg) {
|
|
|
180
414
|
const first = s.split(/\s+/)[0];
|
|
181
415
|
if (!READONLY_COMMANDS.has(first))
|
|
182
416
|
return false;
|
|
183
|
-
|
|
417
|
+
// env 带任何参数即是「执行任意命令」的包装器(env rm -rf /),只有裸 env(打印环境变量)才只读
|
|
418
|
+
if (first === 'env' && s.split(/\s+/).length > 1)
|
|
184
419
|
return false;
|
|
420
|
+
if (first === 'find') {
|
|
421
|
+
if (ALWAYS_DANGEROUS_FIND_FLAGS.test(s))
|
|
422
|
+
return false;
|
|
423
|
+
// 只有「无 -exec」或「所有 -exec 目标均只读安全」的 find 才算只读;gray/dangerous 不走快速通道
|
|
424
|
+
const cls = classifyFindExecTargets(s);
|
|
425
|
+
if (cls !== 'no-exec' && cls !== 'readonly')
|
|
426
|
+
return false;
|
|
427
|
+
}
|
|
185
428
|
return true;
|
|
186
429
|
}
|
|
187
430
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shellSafety.js","sourceRoot":"","sources":["../../src/util/shellSafety.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shellSafety.js","sourceRoot":"","sources":["../../src/util/shellSafety.ts"],"names":[],"mappings":"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"}
|
package/dist/util/tokens.d.ts
CHANGED
|
@@ -4,5 +4,5 @@ export declare function countTokens(messages: Message[]): {
|
|
|
4
4
|
inputTokens: number;
|
|
5
5
|
outputTokens: number;
|
|
6
6
|
};
|
|
7
|
-
export declare function getTokens(messages: Message[]): Usage;
|
|
7
|
+
export declare function getTokens(messages: Message[], sessionId?: string): Usage;
|
|
8
8
|
//# sourceMappingURL=tokens.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAGvC,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAkD9F;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAGvC,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAkD9F;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAgBxE"}
|
package/dist/util/tokens.js
CHANGED
|
@@ -51,12 +51,12 @@ function countTokens(messages) {
|
|
|
51
51
|
}
|
|
52
52
|
return { inputTokens: 0, outputTokens: 0 };
|
|
53
53
|
}
|
|
54
|
-
function getTokens(messages) {
|
|
54
|
+
function getTokens(messages, sessionId) {
|
|
55
55
|
const tokens = countTokens(messages);
|
|
56
56
|
const useTokens = tokens.inputTokens + tokens.outputTokens;
|
|
57
57
|
const promptTokens = tokens.inputTokens;
|
|
58
58
|
const modelManager = (0, ModelManager_1.getModelManager)();
|
|
59
|
-
const modelProfile = modelManager.getModel('main'); //
|
|
59
|
+
const modelProfile = modelManager.getModel('main', sessionId); // 获取主模型配置(含会话级覆盖)
|
|
60
60
|
// 如果没有找到模型配置,使用默认值
|
|
61
61
|
const maxTokens = modelProfile?.contextLength || 128000;
|
|
62
62
|
return {
|
package/dist/util/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":";;AAKA,kCAkDC;AAED,8BAgBC;AAxED,uCAAgD;AAEhD,0DAAyD;AAEzD,SAAgB,WAAW,CAAC,QAAmB;IAC7C,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;IAC3B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QAC3B,IACE,OAAO,EAAE,IAAI,KAAK,WAAW;YAC7B,OAAO,IAAI,OAAO,CAAC,OAAO;YAC1B,CAAC,CACC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM;gBAC3C,IAAA,8BAAoB,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACtD,EACD,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAY,CAAA;YAE1C,mBAAmB;YACnB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACvC,IAAI,cAAc,IAAI,KAAK,IAAI,eAAe,IAAI,KAAK,EAAE,CAAC;oBACxD,mBAAmB;oBACnB,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY;wBACpC,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,CAAC;wBACxC,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,CAAC,CAAA;oBACtC,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAAA;oBACxC,8BAA8B;oBAC9B,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBAC5C,CAAC,EAAE,CAAA;wBACH,SAAQ;oBACV,CAAC;oBACD,OAAO;wBACL,WAAW;wBACX,YAAY;qBACb,CAAA;gBACH,CAAC;qBAAM,IAAI,eAAe,IAAI,KAAK,IAAI,mBAAmB,IAAI,KAAK,EAAE,CAAC;oBACpE,YAAY;oBACZ,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAA;oBACvC,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAA;oBAC5C,8BAA8B;oBAC9B,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBAC5C,CAAC,EAAE,CAAA;wBACH,SAAQ;oBACV,CAAC;oBACD,OAAO;wBACL,WAAW;wBACX,YAAY;qBACb,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,CAAC,EAAE,CAAA;IACL,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;AAC5C,CAAC;AAED,SAAgB,SAAS,CAAC,QAAmB;
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/util/tokens.ts"],"names":[],"mappings":";;AAKA,kCAkDC;AAED,8BAgBC;AAxED,uCAAgD;AAEhD,0DAAyD;AAEzD,SAAgB,WAAW,CAAC,QAAmB;IAC7C,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;IAC3B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;QAC3B,IACE,OAAO,EAAE,IAAI,KAAK,WAAW;YAC7B,OAAO,IAAI,OAAO,CAAC,OAAO;YAC1B,CAAC,CACC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM;gBAC3C,IAAA,8BAAoB,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACtD,EACD,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAY,CAAA;YAE1C,mBAAmB;YACnB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACvC,IAAI,cAAc,IAAI,KAAK,IAAI,eAAe,IAAI,KAAK,EAAE,CAAC;oBACxD,mBAAmB;oBACnB,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY;wBACpC,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,CAAC;wBACxC,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,CAAC,CAAA;oBACtC,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAAA;oBACxC,8BAA8B;oBAC9B,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBAC5C,CAAC,EAAE,CAAA;wBACH,SAAQ;oBACV,CAAC;oBACD,OAAO;wBACL,WAAW;wBACX,YAAY;qBACb,CAAA;gBACH,CAAC;qBAAM,IAAI,eAAe,IAAI,KAAK,IAAI,mBAAmB,IAAI,KAAK,EAAE,CAAC;oBACpE,YAAY;oBACZ,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAA;oBACvC,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAA;oBAC5C,8BAA8B;oBAC9B,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBAC5C,CAAC,EAAE,CAAA;wBACH,SAAQ;oBACV,CAAC;oBACD,OAAO;wBACL,WAAW;wBACX,YAAY;qBACb,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,CAAC,EAAE,CAAA;IACL,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;AAC5C,CAAC;AAED,SAAgB,SAAS,CAAC,QAAmB,EAAE,SAAkB;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;IAC3D,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC;IAExC,MAAM,YAAY,GAAG,IAAA,8BAAe,GAAE,CAAA;IACtC,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA,CAAC,kBAAkB;IAEhF,mBAAmB;IACnB,MAAM,SAAS,GAAG,YAAY,EAAE,aAAa,IAAI,MAAM,CAAC;IAExD,OAAO;QACL,SAAS;QACT,SAAS;QACT,YAAY;KACb,CAAC;AACJ,CAAC"}
|