sema-core 2.1.1 → 2.1.2
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/dist/core/Conversation.d.ts.map +1 -1
- package/dist/core/Conversation.js +9 -3
- package/dist/core/Conversation.js.map +1 -1
- package/dist/core/SemaEngine.d.ts +0 -5
- package/dist/core/SemaEngine.d.ts.map +1 -1
- package/dist/core/SemaEngine.js +19 -50
- package/dist/core/SemaEngine.js.map +1 -1
- package/dist/events/types.d.ts +4 -1
- package/dist/events/types.d.ts.map +1 -1
- package/dist/manager/ConfManager.d.ts.map +1 -1
- package/dist/manager/ConfManager.js +3 -0
- package/dist/manager/ConfManager.js.map +1 -1
- package/dist/manager/PermissionManager.d.ts.map +1 -1
- package/dist/manager/PermissionManager.js +124 -216
- package/dist/manager/PermissionManager.js.map +1 -1
- package/dist/manager/runShellGate.d.ts +25 -0
- package/dist/manager/runShellGate.d.ts.map +1 -0
- package/dist/manager/runShellGate.js +154 -0
- package/dist/manager/runShellGate.js.map +1 -0
- package/dist/prompt/inputPredict.d.ts +1 -1
- package/dist/prompt/inputPredict.d.ts.map +1 -1
- package/dist/prompt/inputPredict.js +1 -1
- package/dist/prompt/permission.d.ts.map +1 -1
- package/dist/prompt/permission.js +91 -36
- package/dist/prompt/permission.js.map +1 -1
- package/dist/prompt/skills.d.ts +18 -0
- package/dist/prompt/skills.d.ts.map +1 -0
- package/dist/prompt/skills.js +151 -0
- package/dist/prompt/skills.js.map +1 -0
- package/dist/prompt/toolAliases.d.ts +12 -1
- package/dist/prompt/toolAliases.d.ts.map +1 -1
- package/dist/prompt/toolAliases.js +28 -1
- package/dist/prompt/toolAliases.js.map +1 -1
- package/dist/prompt/tools/runShell.js +1 -1
- package/dist/prompt/tools/skill.d.ts.map +1 -1
- package/dist/prompt/tools/skill.js +2 -1
- package/dist/prompt/tools/skill.js.map +1 -1
- package/dist/services/agents/agentsManager.d.ts +5 -2
- package/dist/services/agents/agentsManager.d.ts.map +1 -1
- package/dist/services/agents/agentsManager.js +33 -21
- package/dist/services/agents/agentsManager.js.map +1 -1
- package/dist/services/commands/commandsManager.d.ts +5 -6
- package/dist/services/commands/commandsManager.d.ts.map +1 -1
- package/dist/services/commands/commandsManager.js +28 -23
- package/dist/services/commands/commandsManager.js.map +1 -1
- package/dist/services/hooks/hookTriggers.d.ts.map +1 -1
- package/dist/services/hooks/hookTriggers.js +4 -1
- package/dist/services/hooks/hookTriggers.js.map +1 -1
- package/dist/services/hooks/hooksManager.d.ts +8 -2
- package/dist/services/hooks/hooksManager.d.ts.map +1 -1
- package/dist/services/hooks/hooksManager.js +70 -28
- package/dist/services/hooks/hooksManager.js.map +1 -1
- package/dist/services/mcp/MCPManager.d.ts +2 -1
- package/dist/services/mcp/MCPManager.d.ts.map +1 -1
- package/dist/services/mcp/MCPManager.js +4 -2
- package/dist/services/mcp/MCPManager.js.map +1 -1
- package/dist/services/memory/memManager.d.ts +8 -1
- package/dist/services/memory/memManager.d.ts.map +1 -1
- package/dist/services/memory/memManager.js +16 -2
- package/dist/services/memory/memManager.js.map +1 -1
- package/dist/services/plugins/pluginsManager.d.ts +1 -1
- package/dist/services/plugins/pluginsManager.d.ts.map +1 -1
- package/dist/services/plugins/pluginsManager.js +13 -4
- package/dist/services/plugins/pluginsManager.js.map +1 -1
- package/dist/services/rules/rulesManager.d.ts +2 -1
- package/dist/services/rules/rulesManager.d.ts.map +1 -1
- package/dist/services/rules/rulesManager.js +2 -2
- package/dist/services/rules/rulesManager.js.map +1 -1
- package/dist/services/skills/skillsManager.d.ts +13 -8
- package/dist/services/skills/skillsManager.d.ts.map +1 -1
- package/dist/services/skills/skillsManager.js +68 -30
- package/dist/services/skills/skillsManager.js.map +1 -1
- package/dist/tools/EditNotebook.d.ts +1 -1
- package/dist/tools/PatchFile.d.ts.map +1 -1
- package/dist/tools/PatchFile.js +22 -18
- package/dist/tools/PatchFile.js.map +1 -1
- package/dist/tools/RunShell.d.ts +9 -9
- package/dist/tools/RunShell.d.ts.map +1 -1
- package/dist/tools/RunShell.js +11 -14
- package/dist/tools/RunShell.js.map +1 -1
- package/dist/tools/Skill.d.ts.map +1 -1
- package/dist/tools/Skill.js +40 -2
- package/dist/tools/Skill.js.map +1 -1
- package/dist/tools/ViewFile.d.ts.map +1 -1
- package/dist/tools/ViewFile.js +3 -19
- package/dist/tools/ViewFile.js.map +1 -1
- package/dist/tools/WriteFile.d.ts.map +1 -1
- package/dist/tools/WriteFile.js +4 -2
- package/dist/tools/WriteFile.js.map +1 -1
- package/dist/tools/base/tools.d.ts.map +1 -1
- package/dist/tools/base/tools.js +7 -1
- package/dist/tools/base/tools.js.map +1 -1
- package/dist/types/hook.d.ts +8 -3
- package/dist/types/hook.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/plugin.d.ts +2 -0
- package/dist/types/plugin.d.ts.map +1 -1
- package/dist/types/skill.d.ts +1 -1
- package/dist/types/skill.d.ts.map +1 -1
- package/dist/util/autoRunContext.d.ts +3 -2
- package/dist/util/autoRunContext.d.ts.map +1 -1
- package/dist/util/autoRunContext.js +45 -11
- package/dist/util/autoRunContext.js.map +1 -1
- package/dist/util/commands.d.ts.map +1 -1
- package/dist/util/commands.js +6 -1
- package/dist/util/commands.js.map +1 -1
- package/dist/util/fetchSafety.d.ts +10 -3
- package/dist/util/fetchSafety.d.ts.map +1 -1
- package/dist/util/fetchSafety.js +22 -29
- package/dist/util/fetchSafety.js.map +1 -1
- package/dist/util/imageCompress.d.ts +16 -0
- package/dist/util/imageCompress.d.ts.map +1 -1
- package/dist/util/imageCompress.js +53 -0
- package/dist/util/imageCompress.js.map +1 -1
- package/dist/util/readPathClass.d.ts +16 -0
- package/dist/util/readPathClass.d.ts.map +1 -0
- package/dist/util/readPathClass.js +121 -0
- package/dist/util/readPathClass.js.map +1 -0
- package/dist/util/secureFile.d.ts +4 -0
- package/dist/util/secureFile.d.ts.map +1 -1
- package/dist/util/secureFile.js +8 -60
- package/dist/util/secureFile.js.map +1 -1
- package/dist/util/shell.d.ts +1 -0
- package/dist/util/shell.d.ts.map +1 -1
- package/dist/util/shell.js +36 -0
- package/dist/util/shell.js.map +1 -1
- package/dist/util/shellSafety.d.ts +26 -15
- package/dist/util/shellSafety.d.ts.map +1 -1
- package/dist/util/shellSafety.js +277 -60
- package/dist/util/shellSafety.js.map +1 -1
- package/package.json +1 -1
|
@@ -50,6 +50,7 @@ const savePath_1 = require("../../util/savePath");
|
|
|
50
50
|
const cwd_1 = require("../../util/cwd");
|
|
51
51
|
const formatter_1 = require("../../util/formatter");
|
|
52
52
|
const pluginsManager_1 = require("../plugins/pluginsManager");
|
|
53
|
+
const skills_1 = require("../../prompt/skills");
|
|
53
54
|
const settingsLoader_1 = require("../settings/settingsLoader");
|
|
54
55
|
const SKILL_FILE_NAME = 'SKILL.md';
|
|
55
56
|
/**
|
|
@@ -62,6 +63,8 @@ class SkillsManager {
|
|
|
62
63
|
this.skillInfoCache = null;
|
|
63
64
|
// 后台加载 Promise
|
|
64
65
|
this.loadingPromise = null;
|
|
66
|
+
// 重载串行链:多次重载依次执行,后发起的一定晚于先发起的开始读盘(写文件后立即重载能读到自己的写入)
|
|
67
|
+
this.refreshChain = Promise.resolve();
|
|
65
68
|
const semaRootDir = (0, savePath_1.getSemaRootDir)();
|
|
66
69
|
this.semaUserSkillsDir = path.join(semaRootDir, 'skills');
|
|
67
70
|
const cwd = (0, cwd_1.readInitialCwd)();
|
|
@@ -82,26 +85,42 @@ class SkillsManager {
|
|
|
82
85
|
}
|
|
83
86
|
/**
|
|
84
87
|
* 加载 Skills 配置(内部方法)
|
|
85
|
-
*
|
|
88
|
+
* 按优先级加载:内置 -> 插件 -> 用户级 -> 项目级
|
|
86
89
|
* 后加载的覆盖先加载的
|
|
90
|
+
* 写入新建的 Map 并返回,不动 this.skillConfigs,由调用方加载完成后一次性替换
|
|
87
91
|
*/
|
|
88
92
|
async loadSkills() {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
const target = new Map();
|
|
94
|
+
// 1. 内置 skills - 最低优先级
|
|
95
|
+
this.loadBuiltInSkills(target);
|
|
96
|
+
// 2. 插件 skills
|
|
97
|
+
await this.loadSkillsFromPlugins(target);
|
|
98
|
+
// 3. 用户级
|
|
99
|
+
await this.loadSkillsFromDir(target, this.semaUserSkillsDir, 'user');
|
|
100
|
+
// 4. 项目级 - 最高优先级
|
|
101
|
+
await this.loadSkillsFromDir(target, this.semaProjectSkillsDir, 'project');
|
|
102
|
+
const skillNames = Array.from(target.keys()).join(', ');
|
|
98
103
|
(0, log_1.logInfo)(`加载 Skills 配置: ${skillNames}`);
|
|
104
|
+
return target;
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* 加载内置 skills(正文中的安装位置用本机真实路径生成)
|
|
108
|
+
*/
|
|
109
|
+
loadBuiltInSkills(target) {
|
|
110
|
+
const confs = (0, skills_1.buildBuiltInSkillConfs)({
|
|
111
|
+
userRoot: path.dirname(this.semaUserSkillsDir),
|
|
112
|
+
projectRoot: path.dirname(this.semaProjectSkillsDir),
|
|
113
|
+
});
|
|
114
|
+
for (const conf of confs) {
|
|
115
|
+
target.set(conf.name, { ...conf, locate: 'builtin' });
|
|
116
|
+
}
|
|
117
|
+
(0, log_1.logDebug)(`加载内置 Skills: ${confs.length} 个`);
|
|
99
118
|
}
|
|
100
119
|
/**
|
|
101
120
|
* 从已安装且启用的插件中加载 skills
|
|
102
121
|
* skill 名格式:插件名:skill名,locate 为 'plugin'
|
|
103
122
|
*/
|
|
104
|
-
async loadSkillsFromPlugins() {
|
|
123
|
+
async loadSkillsFromPlugins(target) {
|
|
105
124
|
try {
|
|
106
125
|
const pluginsInfo = await (0, pluginsManager_1.getPluginsManager)().getMarketplacePluginsInfo();
|
|
107
126
|
const enabledPlugins = pluginsInfo.plugins.filter(p => p.status);
|
|
@@ -114,10 +133,10 @@ class SkillsManager {
|
|
|
114
133
|
const skillConfig = await this.parseSkillFile(skillEntry.filePath);
|
|
115
134
|
if (skillConfig) {
|
|
116
135
|
const pluginSkillName = `${plugin.name}:${skillConfig.name}`;
|
|
117
|
-
if (
|
|
136
|
+
if (target.has(pluginSkillName)) {
|
|
118
137
|
(0, log_1.logDebug)(`Skill [${pluginSkillName}] 被插件配置覆盖`);
|
|
119
138
|
}
|
|
120
|
-
|
|
139
|
+
target.set(pluginSkillName, {
|
|
121
140
|
...skillConfig,
|
|
122
141
|
name: pluginSkillName,
|
|
123
142
|
locate: 'plugin'
|
|
@@ -138,7 +157,7 @@ class SkillsManager {
|
|
|
138
157
|
* 从指定目录加载 skill 配置
|
|
139
158
|
* 每个 skill 存放于子目录中,子目录下有 SKILL.md 文件
|
|
140
159
|
*/
|
|
141
|
-
async loadSkillsFromDir(dirPath, scope) {
|
|
160
|
+
async loadSkillsFromDir(target, dirPath, scope) {
|
|
142
161
|
try {
|
|
143
162
|
if (!fs.existsSync(dirPath)) {
|
|
144
163
|
(0, log_1.logDebug)(`Skills 目录不存在: ${dirPath}`);
|
|
@@ -154,10 +173,10 @@ class SkillsManager {
|
|
|
154
173
|
let loadedCount = 0;
|
|
155
174
|
for (const skillConfig of skillConfigs) {
|
|
156
175
|
if (skillConfig) {
|
|
157
|
-
if (
|
|
176
|
+
if (target.has(skillConfig.name)) {
|
|
158
177
|
(0, log_1.logDebug)(`Skill [${skillConfig.name}] 被 ${scope} 级配置覆盖`);
|
|
159
178
|
}
|
|
160
|
-
|
|
179
|
+
target.set(skillConfig.name, { ...skillConfig, locate: scope });
|
|
161
180
|
loadedCount++;
|
|
162
181
|
}
|
|
163
182
|
}
|
|
@@ -196,12 +215,6 @@ class SkillsManager {
|
|
|
196
215
|
return null;
|
|
197
216
|
}
|
|
198
217
|
}
|
|
199
|
-
/**
|
|
200
|
-
* 获取所有 Skill 配置
|
|
201
|
-
*/
|
|
202
|
-
getSkillsConfs() {
|
|
203
|
-
return Array.from(this.skillConfigs.values());
|
|
204
|
-
}
|
|
205
218
|
/**
|
|
206
219
|
* 读取禁用的 Skill 集合(用户级 + 项目级并集)
|
|
207
220
|
* 每次实时读 settings,外部(如 WebUI)直接改文件后无需重启即可生效
|
|
@@ -213,14 +226,18 @@ class SkillsManager {
|
|
|
213
226
|
}
|
|
214
227
|
/**
|
|
215
228
|
* Skill 是否被禁用
|
|
229
|
+
* 内置 Skill 不支持开关,始终启用(即便名字被手写进 settings 的 disabledSkills 也忽略)
|
|
216
230
|
*/
|
|
217
231
|
isSkillDisabled(name) {
|
|
232
|
+
if (this.skillConfigs.get(name)?.locate === 'builtin')
|
|
233
|
+
return false;
|
|
218
234
|
return this.readDisabledSkills().has(name);
|
|
219
235
|
}
|
|
220
236
|
/**
|
|
221
237
|
* 启用/禁用 Skill:写入 settings 的 disabledSkills
|
|
222
238
|
* 未显式指定 scope 时跟随技能所在层:项目级技能写项目级,用户级/插件技能写用户级(全局生效)
|
|
223
239
|
* enable 只从目标层移除;若另一层仍禁用,最终状态仍为禁用(返回值如实反映并集)
|
|
240
|
+
* 内置 Skill 不支持开关
|
|
224
241
|
*/
|
|
225
242
|
async setSkillEnabled(name, enabled) {
|
|
226
243
|
const conf = this.skillConfigs.get(name);
|
|
@@ -228,6 +245,10 @@ class SkillsManager {
|
|
|
228
245
|
(0, log_1.logWarn)(`${enabled ? '启用' : '禁用'} Skill 失败: 未找到 [${name}]`);
|
|
229
246
|
return this.getSkillsInfo();
|
|
230
247
|
}
|
|
248
|
+
if (conf.locate === 'builtin') {
|
|
249
|
+
(0, log_1.logWarn)(`${enabled ? '启用' : '禁用'} Skill 失败: 内置 Skill 不支持开关 [${name}]`);
|
|
250
|
+
return this.getSkillsInfo();
|
|
251
|
+
}
|
|
231
252
|
// 写入层跟随技能所在层:项目级技能写项目级 settings,用户级/插件技能写用户级(全局生效)
|
|
232
253
|
const target = conf.locate === 'project' ? 'project' : 'user';
|
|
233
254
|
const settings = (0, settingsLoader_1.readSettings)(target);
|
|
@@ -238,19 +259,27 @@ class SkillsManager {
|
|
|
238
259
|
return this.getSkillsInfo();
|
|
239
260
|
}
|
|
240
261
|
/**
|
|
241
|
-
* 重新加载并缓存 Skills
|
|
262
|
+
* 重新加载并缓存 Skills 信息(串行排队,见 refreshChain)
|
|
242
263
|
*/
|
|
243
|
-
|
|
264
|
+
loadAndCacheSkills() {
|
|
265
|
+
const run = this.refreshChain.then(() => this.doLoadAndCacheSkills());
|
|
266
|
+
// 链上只记完成与否,失败不阻断后续重载;错误由调用方的 run 拿到
|
|
267
|
+
this.refreshChain = run.catch(() => undefined);
|
|
268
|
+
return run;
|
|
269
|
+
}
|
|
270
|
+
async doLoadAndCacheSkills() {
|
|
244
271
|
(0, log_1.logDebug)('刷新 Skills 信息...');
|
|
245
|
-
|
|
246
|
-
await this.loadSkills();
|
|
247
|
-
const skillInfos =
|
|
272
|
+
// 先加载到新 Map,此时 skillConfigs 与缓存仍是旧的
|
|
273
|
+
const next = await this.loadSkills();
|
|
274
|
+
const skillInfos = Array.from(next.values()).map(config => ({
|
|
248
275
|
name: config.name,
|
|
249
276
|
description: config.description,
|
|
250
277
|
prompt: config.prompt,
|
|
251
278
|
locate: config.locate,
|
|
252
279
|
filePath: config.filePath
|
|
253
280
|
}));
|
|
281
|
+
// 同步一次性发布:重载期间 getSkillConfig / getSkillsInfo 始终读到完整的旧值,不会读到空表或半截
|
|
282
|
+
this.skillConfigs = next;
|
|
254
283
|
this.skillInfoCache = skillInfos;
|
|
255
284
|
(0, log_1.logInfo)(`Skills 信息刷新完成: ${skillInfos.length} 个 Skill`);
|
|
256
285
|
return skillInfos;
|
|
@@ -258,7 +287,7 @@ class SkillsManager {
|
|
|
258
287
|
/**
|
|
259
288
|
* 获取所有 Skill 信息
|
|
260
289
|
* @param concise 简洁模式,返回的 prompt 字段为空字符串(UI 层一般用不上)
|
|
261
|
-
* @param refresh
|
|
290
|
+
* @param refresh 是否强制刷新(重新加载后替换缓存)
|
|
262
291
|
*/
|
|
263
292
|
async getSkillsInfo(concise, refresh) {
|
|
264
293
|
let infos;
|
|
@@ -275,8 +304,13 @@ class SkillsManager {
|
|
|
275
304
|
infos = await this.loadAndCacheSkills();
|
|
276
305
|
}
|
|
277
306
|
// status 实时按 settings 标注(不进缓存),返回全量含禁用项供管理页展示;执行侧自行过滤
|
|
307
|
+
// 内置 Skill 不支持开关,status 恒为 true
|
|
278
308
|
const disabled = this.readDisabledSkills();
|
|
279
|
-
return infos.map(info => ({
|
|
309
|
+
return infos.map(info => ({
|
|
310
|
+
...info,
|
|
311
|
+
status: info.locate === 'builtin' || !disabled.has(info.name),
|
|
312
|
+
...(concise ? { prompt: '' } : {}),
|
|
313
|
+
}));
|
|
280
314
|
}
|
|
281
315
|
/**
|
|
282
316
|
* 根据名称获取 Skill 配置
|
|
@@ -299,7 +333,7 @@ class SkillsManager {
|
|
|
299
333
|
}
|
|
300
334
|
/**
|
|
301
335
|
* 移除 Skill 配置
|
|
302
|
-
*
|
|
336
|
+
* 内置 Skill 与插件 Skill 不可移除
|
|
303
337
|
*/
|
|
304
338
|
async removeSkillConf(name) {
|
|
305
339
|
const skillConf = this.skillConfigs.get(name);
|
|
@@ -307,6 +341,10 @@ class SkillsManager {
|
|
|
307
341
|
(0, log_1.logWarn)(`移除 Skill 失败: 未找到 [${name}]`);
|
|
308
342
|
return this.getSkillsInfo();
|
|
309
343
|
}
|
|
344
|
+
if (skillConf.locate === 'builtin') {
|
|
345
|
+
(0, log_1.logWarn)(`移除 Skill 失败: 内置 Skill 不可移除 [${name}]`);
|
|
346
|
+
return this.getSkillsInfo();
|
|
347
|
+
}
|
|
310
348
|
if (skillConf.locate === 'plugin') {
|
|
311
349
|
(0, log_1.logWarn)(`移除 Skill 失败: 插件 Skill 不可移除 [${name}]`);
|
|
312
350
|
return this.getSkillsInfo();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skillsManager.js","sourceRoot":"","sources":["../../../src/services/skills/skillsManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"skillsManager.js","sourceRoot":"","sources":["../../../src/services/skills/skillsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@ export declare const EditNotebook: {
|
|
|
19
19
|
}, {
|
|
20
20
|
notebook_path: string;
|
|
21
21
|
cell_index: number;
|
|
22
|
-
source?: string | undefined;
|
|
23
22
|
command?: "replace" | "delete" | "insert" | undefined;
|
|
23
|
+
source?: string | undefined;
|
|
24
24
|
cell_type?: "code" | "markdown" | undefined;
|
|
25
25
|
}>;
|
|
26
26
|
isSafe(): false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PatchFile.d.ts","sourceRoot":"","sources":["../../src/tools/PatchFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAQ,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAiBpD,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;EAKd,CAAA;AAEF,MAAM,MAAM,EAAE,GAAG,OAAO,UAAU,CAAA;AAelC,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PatchFile.d.ts","sourceRoot":"","sources":["../../src/tools/PatchFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAQ,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAiBpD,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;EAKd,CAAA;AAEF,MAAM,MAAM,EAAE,GAAG,OAAO,UAAU,CAAA;AAelC,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA8NR,MAAM;mBACL,MAAM;mBACN,MAAM;sBACH,MAAM;yBACH,IAAI,EAAE;;;;;;;;;;;;;;;;;;;;;qBAtLT,GAAG;;;;;;qBAgHgE,GAAG;;;;;;;;;;;;kBAkE1E,MAAM;mBACL,MAAM;mBACN,MAAM;sBACH,MAAM;yBACH,IAAI,EAAE;;CAE1B,CAAA"}
|
package/dist/tools/PatchFile.js
CHANGED
|
@@ -11,6 +11,7 @@ const tool_1 = require("../prompt/tool");
|
|
|
11
11
|
const edit_1 = require("../util/edit");
|
|
12
12
|
const StateManager_1 = require("../manager/StateManager");
|
|
13
13
|
const CheckpointManager_1 = require("../manager/CheckpointManager");
|
|
14
|
+
const memManager_1 = require("../services/memory/memManager");
|
|
14
15
|
const toolParams = zod_1.z.strictObject({
|
|
15
16
|
file_path: zod_1.z.string().describe('Absolute path of the file to edit'),
|
|
16
17
|
search_text: zod_1.z.string().describe('The exact text in the file that should be replaced (must differ from replacement)'),
|
|
@@ -108,23 +109,26 @@ Always edit existing files rather than creating new ones. Never add emojis unles
|
|
|
108
109
|
message: `This is a Jupyter Notebook — please use ${tool_1.TOOL_NAME_EDIT_NOTEBOOK} instead.`,
|
|
109
110
|
};
|
|
110
111
|
}
|
|
111
|
-
|
|
112
|
-
if (!
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
112
|
+
// 记忆文件内容已注入系统提示,跳过已读/过期校验(search_text 精确匹配仍兜底)
|
|
113
|
+
if (!(0, memManager_1.isMemoryFile)(fullFilePath)) {
|
|
114
|
+
const readTimestamp = readFileTimestamps[fullFilePath];
|
|
115
|
+
if (!readTimestamp) {
|
|
116
|
+
return {
|
|
117
|
+
result: false,
|
|
118
|
+
message: 'You need to read the file before editing it.',
|
|
119
|
+
meta: {
|
|
120
|
+
isFilePathAbsolute: String((0, path_1.isAbsolute)(file_path)),
|
|
121
|
+
},
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
const stats = (0, fs_1.statSync)(fullFilePath);
|
|
125
|
+
const lastWriteTime = stats.mtimeMs;
|
|
126
|
+
if (lastWriteTime > readTimestamp) {
|
|
127
|
+
return {
|
|
128
|
+
result: false,
|
|
129
|
+
message: 'The file was modified externally since last read. Please re-read it before editing.',
|
|
130
|
+
};
|
|
131
|
+
}
|
|
128
132
|
}
|
|
129
133
|
const enc = (0, file_1.inferFileEncoding)(fullFilePath);
|
|
130
134
|
const rawFile = (0, fs_1.readFileSync)(fullFilePath, enc);
|
|
@@ -173,7 +177,7 @@ Always edit existing files rather than creating new ones. Never add emojis unles
|
|
|
173
177
|
? (0, edit_1.normalizeLF)((0, fs_1.readFileSync)(fullFilePath, enc))
|
|
174
178
|
: '';
|
|
175
179
|
// 权限确认后二次校验时间戳,防止用户在权限对话框期间修改文件
|
|
176
|
-
if (fileExists) {
|
|
180
|
+
if (fileExists && !(0, memManager_1.isMemoryFile)(fullFilePath)) {
|
|
177
181
|
const readTimestamp = agentState.getReadFileTimestamps()[fullFilePath];
|
|
178
182
|
const currentMtime = (0, fs_1.statSync)(fullFilePath).mtimeMs;
|
|
179
183
|
if (readTimestamp && currentMtime > readTimestamp) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PatchFile.js","sourceRoot":"","sources":["../../src/tools/PatchFile.ts"],"names":[],"mappings":";;;AACA,2BAAkE;AAClE,+BAAoD;AACpD,6BAAuB;AAEvB,uCAOqB;AACrB,uCAAyD;AACzD,qCAA4C;AAC5C,yCAA8E;AAC9E,uCAAqD;AACrD,0DAAyD;AACzD,oEAAmE;
|
|
1
|
+
{"version":3,"file":"PatchFile.js","sourceRoot":"","sources":["../../src/tools/PatchFile.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/RunShell.d.ts
CHANGED
|
@@ -8,13 +8,13 @@ export declare const toolParams: z.ZodObject<{
|
|
|
8
8
|
description: z.ZodString;
|
|
9
9
|
background: z.ZodOptional<z.ZodBoolean>;
|
|
10
10
|
}, "strict", z.ZodTypeAny, {
|
|
11
|
-
description: string;
|
|
12
11
|
command: string;
|
|
12
|
+
description: string;
|
|
13
13
|
timeout?: number | undefined;
|
|
14
14
|
background?: boolean | undefined;
|
|
15
15
|
}, {
|
|
16
|
-
description: string;
|
|
17
16
|
command: string;
|
|
17
|
+
description: string;
|
|
18
18
|
timeout?: number | undefined;
|
|
19
19
|
background?: boolean | undefined;
|
|
20
20
|
}>;
|
|
@@ -37,25 +37,25 @@ export declare const RunShell: {
|
|
|
37
37
|
description: z.ZodString;
|
|
38
38
|
background: z.ZodOptional<z.ZodBoolean>;
|
|
39
39
|
}, "strict", z.ZodTypeAny, {
|
|
40
|
-
description: string;
|
|
41
40
|
command: string;
|
|
41
|
+
description: string;
|
|
42
42
|
timeout?: number | undefined;
|
|
43
43
|
background?: boolean | undefined;
|
|
44
44
|
}, {
|
|
45
|
-
description: string;
|
|
46
45
|
command: string;
|
|
46
|
+
description: string;
|
|
47
47
|
timeout?: number | undefined;
|
|
48
48
|
background?: boolean | undefined;
|
|
49
49
|
}>;
|
|
50
50
|
validateInput({ command }: {
|
|
51
|
-
description: string;
|
|
52
51
|
command: string;
|
|
52
|
+
description: string;
|
|
53
53
|
timeout?: number | undefined;
|
|
54
54
|
background?: boolean | undefined;
|
|
55
55
|
}, agentContext: any): Promise<ValidationResult>;
|
|
56
56
|
genToolPermission(input: {
|
|
57
|
-
description: string;
|
|
58
57
|
command: string;
|
|
58
|
+
description: string;
|
|
59
59
|
timeout?: number | undefined;
|
|
60
60
|
background?: boolean | undefined;
|
|
61
61
|
}): {
|
|
@@ -63,8 +63,8 @@ export declare const RunShell: {
|
|
|
63
63
|
content: string;
|
|
64
64
|
};
|
|
65
65
|
genToolResultMessage({ stdout, stderr, interrupted, command }: ToolOut, input: {
|
|
66
|
-
description: string;
|
|
67
66
|
command: string;
|
|
67
|
+
description: string;
|
|
68
68
|
timeout?: number | undefined;
|
|
69
69
|
background?: boolean | undefined;
|
|
70
70
|
} | undefined): {
|
|
@@ -73,15 +73,15 @@ export declare const RunShell: {
|
|
|
73
73
|
content: string;
|
|
74
74
|
};
|
|
75
75
|
getDisplayTitle(input: {
|
|
76
|
-
description: string;
|
|
77
76
|
command: string;
|
|
77
|
+
description: string;
|
|
78
78
|
timeout?: number | undefined;
|
|
79
79
|
background?: boolean | undefined;
|
|
80
80
|
} | undefined): string;
|
|
81
81
|
genResultForAssistant({ interrupted, stdout, stderr }: ToolOut): string;
|
|
82
82
|
call({ command, timeout, background, description }: {
|
|
83
|
-
description: string;
|
|
84
83
|
command: string;
|
|
84
|
+
description: string;
|
|
85
85
|
timeout?: number | undefined;
|
|
86
86
|
background?: boolean | undefined;
|
|
87
87
|
}, agentContext: any): AsyncGenerator<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunShell.d.ts","sourceRoot":"","sources":["../../src/tools/RunShell.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RunShell.d.ts","sourceRoot":"","sources":["../../src/tools/RunShell.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAQ,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAcpD,eAAO,MAAM,wBAAwB,SAAS,CAAC;AAC/C,eAAO,MAAM,4BAA4B,SAAS,CAAC;AAkBnD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAmBrB,CAAA;AAGF,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;qBAY4B,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;qEAmDtB,MAAM;;;;;;qBAmB9C,GAAG;;;;;CAwLQ,CAAA"}
|
package/dist/tools/RunShell.js
CHANGED
|
@@ -2,10 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RunShell = exports.toolParams = exports.DEFAULT_RUN_SHELL_TIMEOUT_MS = exports.RUN_SHELL_MAX_TIMEOUT_MS = void 0;
|
|
4
4
|
const os_1 = require("os");
|
|
5
|
-
const path_1 = require("path");
|
|
6
5
|
const zod_1 = require("zod");
|
|
7
6
|
const commands_1 = require("../util/commands");
|
|
8
|
-
const file_1 = require("../util/file");
|
|
9
7
|
const shell_1 = require("../util/shell");
|
|
10
8
|
const TaskManager_1 = require("../manager/TaskManager");
|
|
11
9
|
const cwd_1 = require("../util/cwd");
|
|
@@ -75,19 +73,9 @@ exports.RunShell = {
|
|
|
75
73
|
message: `Command '${baseCmd}' is not allowed for security reasons`,
|
|
76
74
|
};
|
|
77
75
|
}
|
|
78
|
-
if (baseCmd === 'cd' && parts[1]) {
|
|
79
|
-
const targetDir = parts[1].replace(/^['"]|['"]$/g, '');
|
|
80
|
-
const fullTargetDir = (0, path_1.isAbsolute)(targetDir)
|
|
81
|
-
? targetDir
|
|
82
|
-
: (0, path_1.resolve)((0, cwd_1.readInitialCwd)(), targetDir);
|
|
83
|
-
if (!(0, file_1.isInDirectory)((0, path_1.relative)((0, cwd_1.readInitialCwd)(), fullTargetDir), (0, path_1.relative)((0, cwd_1.readInitialCwd)(), (0, cwd_1.readInitialCwd)()))) {
|
|
84
|
-
return {
|
|
85
|
-
result: false,
|
|
86
|
-
message: `ERROR: cd to '${fullTargetDir}' was blocked. For security, agent may only change directories to child directories of the original working directory (${(0, cwd_1.readInitialCwd)()}) for this session.`,
|
|
87
|
-
};
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
76
|
}
|
|
77
|
+
// cd 不在此按命令文本拦截:文本匹配拦不住 cd ~ / pushd / cd $VAR,又会误伤子 shell。
|
|
78
|
+
// 持久 cwd 不离开项目目录由 call 在命令执行后按真实 cwd 复位保证。
|
|
91
79
|
return { result: true };
|
|
92
80
|
},
|
|
93
81
|
genToolPermission(input) {
|
|
@@ -237,6 +225,15 @@ exports.RunShell = {
|
|
|
237
225
|
stderr += `Exit code ${result.code}` + os_1.EOL;
|
|
238
226
|
}
|
|
239
227
|
stderr += (result.stderr || '').trim() + os_1.EOL;
|
|
228
|
+
// 持久 cwd 离开项目目录则切回项目根,并告知模型下一条命令的起点
|
|
229
|
+
try {
|
|
230
|
+
if (await shell_1.PersistentShell.getInstance().resetCwdIfOutside((0, cwd_1.readInitialCwd)())) {
|
|
231
|
+
stderr += `Shell cwd was reset to ${(0, cwd_1.readInitialCwd)()}` + os_1.EOL;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
catch (error) {
|
|
235
|
+
stderr += `Failed to reset shell cwd to ${(0, cwd_1.readInitialCwd)()}: ${error instanceof Error ? error.message : String(error)}` + os_1.EOL;
|
|
236
|
+
}
|
|
240
237
|
const stdoutTrimmed = stdout.trim();
|
|
241
238
|
const stderrTrimmed = stderr.trim();
|
|
242
239
|
const { totalLines: stdoutLines, truncatedContent: stdoutContent } = stdoutTrimmed ? (0, shell_2.formatOutput)(stdoutTrimmed) : { totalLines: 0, truncatedContent: '' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunShell.js","sourceRoot":"","sources":["../../src/tools/RunShell.ts"],"names":[],"mappings":";;;AAAA,2BAAwB;AACxB
|
|
1
|
+
{"version":3,"file":"RunShell.js","sourceRoot":"","sources":["../../src/tools/RunShell.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Skill.d.ts","sourceRoot":"","sources":["../../src/tools/Skill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"Skill.d.ts","sourceRoot":"","sources":["../../src/tools/Skill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAoBvB,QAAA,MAAM,UAAU;;;;;;;;;EAGd,CAAA;AAEF,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;6BASe,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC;;;;;;;iCAsB5B,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC;;;;wEAYa,OAAO;;;;;;;;;0BAkB9C,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC;;;;;;;;;kCAwCzB,OAAO,GAAG,MAAM;CAGJ,CAAA"}
|
package/dist/tools/Skill.js
CHANGED
|
@@ -1,7 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.Skill = void 0;
|
|
4
37
|
const zod_1 = require("zod");
|
|
38
|
+
const path = __importStar(require("path"));
|
|
5
39
|
const skill_1 = require("../prompt/tools/skill");
|
|
6
40
|
const skillsManager_1 = require("../services/skills/skillsManager");
|
|
7
41
|
const tool_1 = require("../prompt/tool");
|
|
@@ -92,8 +126,12 @@ exports.Skill = {
|
|
|
92
126
|
textContent = `${textContent}\n\nARGUMENTS: ${trimmedArgs}`;
|
|
93
127
|
}
|
|
94
128
|
}
|
|
129
|
+
// 注入目录而非 SKILL.md 文件路径,并声明正文已完整,避免模型再读一遍 SKILL.md
|
|
95
130
|
const text = skillConfig.filePath
|
|
96
|
-
? `Skill’s base path: ${skillConfig.filePath}\n
|
|
131
|
+
? `Skill’s base path: ${path.dirname(skillConfig.filePath)}\n` +
|
|
132
|
+
'The full body of SKILL.md is reproduced below — do not read SKILL.md, you already have it. ' +
|
|
133
|
+
'Resolve every relative path in these instructions against the base path above.' +
|
|
134
|
+
`\n\n${textContent}`
|
|
97
135
|
: textContent;
|
|
98
136
|
const output = {
|
|
99
137
|
name: skillConfig.name,
|
|
@@ -109,7 +147,7 @@ exports.Skill = {
|
|
|
109
147
|
};
|
|
110
148
|
},
|
|
111
149
|
genResultForAssistant(output) {
|
|
112
|
-
return `
|
|
150
|
+
return `Skill "${output.name}" activated; its full instructions are provided below.`;
|
|
113
151
|
},
|
|
114
152
|
};
|
|
115
153
|
//# sourceMappingURL=Skill.js.map
|