workerclaw 0.8.2 → 0.9.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 +5 -0
- package/dist/agent/agent-engine.d.ts +33 -1
- package/dist/agent/agent-engine.d.ts.map +1 -1
- package/dist/agent/agent-engine.js +278 -2
- package/dist/agent/agent-engine.js.map +1 -1
- package/dist/sandbox/browser-sandbox.d.ts +31 -4
- package/dist/sandbox/browser-sandbox.d.ts.map +1 -1
- package/dist/sandbox/browser-sandbox.js +103 -125
- package/dist/sandbox/browser-sandbox.js.map +1 -1
- package/dist/sandbox/browser-session.d.ts +87 -0
- package/dist/sandbox/browser-session.d.ts.map +1 -0
- package/dist/sandbox/browser-session.js +250 -0
- package/dist/sandbox/browser-session.js.map +1 -0
- package/dist/skills/browser-skill.d.ts +23 -2
- package/dist/skills/browser-skill.d.ts.map +1 -1
- package/dist/skills/browser-skill.js +297 -20
- package/dist/skills/browser-skill.js.map +1 -1
- package/dist/task/task-manager.d.ts.map +1 -1
- package/dist/task/task-manager.js +13 -0
- package/dist/task/task-manager.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,17 +3,23 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 基于 Playwright 的网页浏览技能,为 Agent 提供安全上网能力。
|
|
5
5
|
*
|
|
6
|
-
* 提供
|
|
6
|
+
* 提供 6 个工具:
|
|
7
7
|
* 1. browser_navigate - 导航到 URL 并提取页面文本内容
|
|
8
8
|
* 2. browser_extract - 提取页面结构化数据(链接/图片/元数据)
|
|
9
9
|
* 3. browser_screenshot - 截取页面截图
|
|
10
|
+
* 4. browser_click - 点击页面元素
|
|
11
|
+
* 5. browser_fill - 在输入框中填写内容
|
|
12
|
+
* 6. browser_wait - 等待页面元素出现
|
|
13
|
+
*
|
|
14
|
+
* 会话隔离:
|
|
15
|
+
* - 同一 taskId 的多次操作共享 BrowserContext(保持 Cookie/登录态)
|
|
16
|
+
* - 不同 taskId 之间 Context 完全隔离
|
|
10
17
|
*
|
|
11
18
|
* 安全策略:
|
|
12
19
|
* - 权限级别:elevated(需要较高权限才能使用浏览器)
|
|
13
20
|
* - URL 验证:阻止内网/localhost/file:// 等危险地址
|
|
14
21
|
* - 页面大小限制:防止超大页面消耗资源
|
|
15
22
|
* - 截图大小限制:防止截图过大
|
|
16
|
-
* - Cookie 隔离:每次操作独立浏览器上下文
|
|
17
23
|
* - 弹窗拦截:阻止恶意弹窗
|
|
18
24
|
* - 超时控制:防止页面加载卡死
|
|
19
25
|
*/
|
|
@@ -23,7 +29,7 @@ import { BrowserSandbox } from '../sandbox/browser-sandbox.js';
|
|
|
23
29
|
const BROWSER_TOOLS = [
|
|
24
30
|
{
|
|
25
31
|
name: 'browser_navigate',
|
|
26
|
-
description: '导航到指定 URL
|
|
32
|
+
description: '导航到指定 URL 并提取页面文本内容。同一任务内的多次导航会保持 Cookie 和登录状态。',
|
|
27
33
|
requiredLevel: 'elevated',
|
|
28
34
|
parameters: {
|
|
29
35
|
type: 'object',
|
|
@@ -82,24 +88,89 @@ const BROWSER_TOOLS = [
|
|
|
82
88
|
required: ['url'],
|
|
83
89
|
},
|
|
84
90
|
},
|
|
91
|
+
{
|
|
92
|
+
name: 'browser_click',
|
|
93
|
+
description: '点击页面上的元素。用于点击按钮、链接等交互操作。需要在 navigate 之后的同一任务内使用。',
|
|
94
|
+
requiredLevel: 'elevated',
|
|
95
|
+
parameters: {
|
|
96
|
+
type: 'object',
|
|
97
|
+
properties: {
|
|
98
|
+
selector: {
|
|
99
|
+
type: 'string',
|
|
100
|
+
description: 'CSS 选择器,指定要点击的元素(如 "#submit-btn"、".login-button")',
|
|
101
|
+
},
|
|
102
|
+
waitForNavigation: {
|
|
103
|
+
type: 'boolean',
|
|
104
|
+
description: '点击后是否等待页面跳转完成(默认 true)',
|
|
105
|
+
},
|
|
106
|
+
},
|
|
107
|
+
required: ['selector'],
|
|
108
|
+
},
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
name: 'browser_fill',
|
|
112
|
+
description: '在页面的输入框中填写内容。用于填写表单、搜索框等。需要在 navigate 之后的同一任务内使用。',
|
|
113
|
+
requiredLevel: 'elevated',
|
|
114
|
+
parameters: {
|
|
115
|
+
type: 'object',
|
|
116
|
+
properties: {
|
|
117
|
+
selector: {
|
|
118
|
+
type: 'string',
|
|
119
|
+
description: 'CSS 选择器,指定要填写的输入框(如 "#username"、"input[name=email]")',
|
|
120
|
+
},
|
|
121
|
+
value: {
|
|
122
|
+
type: 'string',
|
|
123
|
+
description: '要填写的内容',
|
|
124
|
+
},
|
|
125
|
+
submit: {
|
|
126
|
+
type: 'boolean',
|
|
127
|
+
description: '填写后是否按回车提交(默认 false)',
|
|
128
|
+
},
|
|
129
|
+
},
|
|
130
|
+
required: ['selector', 'value'],
|
|
131
|
+
},
|
|
132
|
+
},
|
|
133
|
+
{
|
|
134
|
+
name: 'browser_wait',
|
|
135
|
+
description: '等待页面上的元素出现。用于等待动态加载的内容或操作结果。',
|
|
136
|
+
requiredLevel: 'elevated',
|
|
137
|
+
parameters: {
|
|
138
|
+
type: 'object',
|
|
139
|
+
properties: {
|
|
140
|
+
selector: {
|
|
141
|
+
type: 'string',
|
|
142
|
+
description: 'CSS 选择器,等待该元素出现',
|
|
143
|
+
},
|
|
144
|
+
timeout: {
|
|
145
|
+
type: 'number',
|
|
146
|
+
description: '最大等待时间(毫秒,默认 5000)',
|
|
147
|
+
},
|
|
148
|
+
},
|
|
149
|
+
required: ['selector'],
|
|
150
|
+
},
|
|
151
|
+
},
|
|
85
152
|
];
|
|
86
153
|
// ==================== 浏览器技能 ====================
|
|
87
154
|
export class BrowserSkill {
|
|
88
155
|
logger;
|
|
89
156
|
sandbox;
|
|
157
|
+
sessionManager;
|
|
158
|
+
/** 每个任务的活跃 page(用于交互式操作) */
|
|
159
|
+
activePages = new Map();
|
|
90
160
|
metadata = {
|
|
91
161
|
name: 'browser',
|
|
92
162
|
displayName: '🌐 网页浏览器',
|
|
93
|
-
description: '基于 Playwright
|
|
94
|
-
version: '
|
|
163
|
+
description: '基于 Playwright 的网页浏览能力,支持导航、提取、截图、点击、填写表单等交互操作',
|
|
164
|
+
version: '2.0.0',
|
|
95
165
|
author: 'WorkerClaw',
|
|
96
|
-
tags: ['browser', 'web', 'scraping', 'playwright'],
|
|
166
|
+
tags: ['browser', 'web', 'scraping', 'playwright', 'form', 'interaction'],
|
|
97
167
|
requiredLevel: 'elevated',
|
|
98
168
|
applicableTaskTypes: [], // 空数组 = 适用所有任务类型
|
|
99
169
|
requiredTools: [],
|
|
100
170
|
};
|
|
101
171
|
constructor(browserConfig) {
|
|
102
172
|
this.sandbox = new BrowserSandbox(browserConfig);
|
|
173
|
+
this.sessionManager = this.sandbox.getSessionManager();
|
|
103
174
|
this.logger = createLogger('BrowserSkill');
|
|
104
175
|
}
|
|
105
176
|
tools = BROWSER_TOOLS;
|
|
@@ -113,13 +184,20 @@ export class BrowserSkill {
|
|
|
113
184
|
browser_screenshot: async (params, context) => {
|
|
114
185
|
return this.executeScreenshot(params, context);
|
|
115
186
|
},
|
|
187
|
+
browser_click: async (params, context) => {
|
|
188
|
+
return this.executeClick(params, context);
|
|
189
|
+
},
|
|
190
|
+
browser_fill: async (params, context) => {
|
|
191
|
+
return this.executeFill(params, context);
|
|
192
|
+
},
|
|
193
|
+
browser_wait: async (params, context) => {
|
|
194
|
+
return this.executeWait(params, context);
|
|
195
|
+
},
|
|
116
196
|
};
|
|
117
197
|
async execute(context) {
|
|
118
|
-
// 技能级别的 execute 通常不会直接调用
|
|
119
|
-
// 浏览器能力通过工具注册表暴露给 LLM,由 LLM 自主调用工具
|
|
120
198
|
return {
|
|
121
199
|
success: true,
|
|
122
|
-
content: '浏览器技能已就绪。请使用 browser_navigate / browser_extract / browser_screenshot
|
|
200
|
+
content: '浏览器技能已就绪。请使用 browser_navigate / browser_extract / browser_screenshot / browser_click / browser_fill / browser_wait 工具访问网页和进行交互。',
|
|
123
201
|
outputs: [],
|
|
124
202
|
durationMs: 0,
|
|
125
203
|
};
|
|
@@ -127,40 +205,105 @@ export class BrowserSkill {
|
|
|
127
205
|
getSystemPromptAddon() {
|
|
128
206
|
return [
|
|
129
207
|
'## 🌐 浏览器工具',
|
|
130
|
-
'
|
|
208
|
+
'你可以使用以下浏览器工具安全地访问网页并进行交互操作:',
|
|
131
209
|
'',
|
|
210
|
+
'**基础浏览:**',
|
|
132
211
|
'- `browser_navigate(url, waitFor?, screenshot?)` - 访问网页并提取文本内容',
|
|
133
212
|
'- `browser_extract(url)` - 提取页面结构化数据(链接/图片/meta)',
|
|
134
213
|
'- `browser_screenshot(url, fullPage?, selector?)` - 截取页面截图',
|
|
135
214
|
'',
|
|
136
|
-
'
|
|
137
|
-
'-
|
|
215
|
+
'**交互操作(需先 navigate):**',
|
|
216
|
+
'- `browser_click(selector, waitForNavigation?)` - 点击页面元素(按钮/链接)',
|
|
217
|
+
'- `browser_fill(selector, value, submit?)` - 在输入框中填写内容',
|
|
218
|
+
'- `browser_wait(selector, timeout?)` - 等待元素出现',
|
|
219
|
+
'',
|
|
220
|
+
'**会话特性:**',
|
|
221
|
+
'- 同一任务的多次浏览器操作会保持 Cookie 和登录状态',
|
|
222
|
+
'- 可以先 navigate 登录页 → browser_fill 填写账号 → browser_click 提交 → browser_navigate 访问需要登录的页面',
|
|
223
|
+
'- 不同客户之间的浏览器会话完全隔离',
|
|
224
|
+
'',
|
|
225
|
+
'**使用提示:**',
|
|
138
226
|
'- 页面文本内容会自动去除导航栏/广告等干扰元素',
|
|
139
|
-
'- 大页面会被自动截断',
|
|
140
227
|
'- 截图保存为 JPEG 格式,会作为文件附件提交',
|
|
141
228
|
'- 内网地址和危险协议会被安全沙箱阻止',
|
|
142
229
|
].join('\n');
|
|
143
230
|
}
|
|
144
231
|
async init() {
|
|
145
|
-
this.logger.info('浏览器技能初始化');
|
|
232
|
+
this.logger.info('浏览器技能初始化 (v2.0.0 - 会话隔离模式)');
|
|
146
233
|
}
|
|
147
234
|
async dispose() {
|
|
235
|
+
// 清理所有活跃 page
|
|
236
|
+
for (const [taskId, page] of this.activePages) {
|
|
237
|
+
try {
|
|
238
|
+
await page.close().catch(() => { });
|
|
239
|
+
}
|
|
240
|
+
catch { }
|
|
241
|
+
}
|
|
242
|
+
this.activePages.clear();
|
|
243
|
+
// 关闭会话管理器
|
|
244
|
+
await this.sandbox.close();
|
|
148
245
|
this.logger.info('浏览器技能清理');
|
|
149
246
|
}
|
|
247
|
+
/**
|
|
248
|
+
* 销毁指定任务的会话(由 AgentEngine 在任务结束时调用)
|
|
249
|
+
*/
|
|
250
|
+
async destroyTaskSession(taskId) {
|
|
251
|
+
// 关闭该任务的活跃 page
|
|
252
|
+
const page = this.activePages.get(taskId);
|
|
253
|
+
if (page) {
|
|
254
|
+
try {
|
|
255
|
+
await page.close().catch(() => { });
|
|
256
|
+
}
|
|
257
|
+
catch { }
|
|
258
|
+
this.activePages.delete(taskId);
|
|
259
|
+
}
|
|
260
|
+
// 销毁该任务的浏览器会话(context)
|
|
261
|
+
await this.sessionManager.destroy(taskId);
|
|
262
|
+
this.logger.debug(`已销毁任务浏览器会话 [${taskId}]`);
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* 获取或创建任务的活跃 page
|
|
266
|
+
* 用于交互式操作(click/fill/wait),需要先 navigate 才能使用
|
|
267
|
+
*/
|
|
268
|
+
async getActivePage(taskId) {
|
|
269
|
+
let page = this.activePages.get(taskId);
|
|
270
|
+
if (page) {
|
|
271
|
+
try {
|
|
272
|
+
// 检查 page 是否仍然有效
|
|
273
|
+
if (!page.isClosed()) {
|
|
274
|
+
return page;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
catch {
|
|
278
|
+
// page 已失效
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
throw new Error('没有活跃页面。请先使用 browser_navigate 访问一个网页。');
|
|
282
|
+
}
|
|
150
283
|
// ==================== 工具执行器 ====================
|
|
151
284
|
async executeNavigate(params, context) {
|
|
152
285
|
const { url, waitFor, screenshot } = params;
|
|
153
286
|
const toolCallId = context.toolCallId || 'unknown';
|
|
287
|
+
const taskId = context.taskId || '';
|
|
154
288
|
if (!url) {
|
|
155
289
|
return { toolCallId, success: false, content: '缺少必要参数: url', error: 'missing_param' };
|
|
156
290
|
}
|
|
157
|
-
this.logger.info(`browser_navigate: ${url}
|
|
291
|
+
this.logger.info(`browser_navigate: ${url}`, { taskId });
|
|
292
|
+
// 如果该任务已有活跃 page,先关闭
|
|
293
|
+
const oldPage = this.activePages.get(taskId);
|
|
294
|
+
if (oldPage) {
|
|
295
|
+
try {
|
|
296
|
+
await oldPage.close().catch(() => { });
|
|
297
|
+
}
|
|
298
|
+
catch { }
|
|
299
|
+
this.activePages.delete(taskId);
|
|
300
|
+
}
|
|
158
301
|
const result = await this.sandbox.navigate(url, {
|
|
159
302
|
waitFor,
|
|
160
303
|
extractText: true,
|
|
161
304
|
screenshot: screenshot || false,
|
|
162
305
|
workDir: context.workDir,
|
|
163
|
-
});
|
|
306
|
+
}, taskId || undefined);
|
|
164
307
|
if (!result.success) {
|
|
165
308
|
return {
|
|
166
309
|
toolCallId,
|
|
@@ -169,6 +312,30 @@ export class BrowserSkill {
|
|
|
169
312
|
error: result.error,
|
|
170
313
|
};
|
|
171
314
|
}
|
|
315
|
+
// 保留该任务的活跃 page 用于后续交互
|
|
316
|
+
// 通过 sessionManager 获取会话并创建 page
|
|
317
|
+
if (taskId) {
|
|
318
|
+
try {
|
|
319
|
+
const session = await this.sessionManager.getOrCreate(taskId);
|
|
320
|
+
const page = await session.context.newPage();
|
|
321
|
+
const response = await page.goto(url, {
|
|
322
|
+
timeout: this.sandbox['config']?.pageTimeoutMs || 30000,
|
|
323
|
+
waitUntil: 'domcontentloaded',
|
|
324
|
+
});
|
|
325
|
+
if (response && response.status() < 400) {
|
|
326
|
+
this.activePages.set(taskId, page);
|
|
327
|
+
}
|
|
328
|
+
else {
|
|
329
|
+
try {
|
|
330
|
+
await page.close().catch(() => { });
|
|
331
|
+
}
|
|
332
|
+
catch { }
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
catch (err) {
|
|
336
|
+
this.logger.debug('创建活跃页面失败', { error: err.message });
|
|
337
|
+
}
|
|
338
|
+
}
|
|
172
339
|
const output = [
|
|
173
340
|
`标题: ${result.title}`,
|
|
174
341
|
`URL: ${result.url}`,
|
|
@@ -187,11 +354,12 @@ export class BrowserSkill {
|
|
|
187
354
|
async executeExtract(params, context) {
|
|
188
355
|
const { url } = params;
|
|
189
356
|
const toolCallId = context.toolCallId || 'unknown';
|
|
357
|
+
const taskId = context.taskId || '';
|
|
190
358
|
if (!url) {
|
|
191
359
|
return { toolCallId, success: false, content: '缺少必要参数: url', error: 'missing_param' };
|
|
192
360
|
}
|
|
193
|
-
this.logger.info(`browser_extract: ${url}
|
|
194
|
-
const result = await this.sandbox.extractStructured(url);
|
|
361
|
+
this.logger.info(`browser_extract: ${url}`, { taskId });
|
|
362
|
+
const result = await this.sandbox.extractStructured(url, taskId || undefined);
|
|
195
363
|
if (!result.success) {
|
|
196
364
|
return {
|
|
197
365
|
toolCallId,
|
|
@@ -250,14 +418,15 @@ export class BrowserSkill {
|
|
|
250
418
|
async executeScreenshot(params, context) {
|
|
251
419
|
const { url, fullPage, selector } = params;
|
|
252
420
|
const toolCallId = context.toolCallId || 'unknown';
|
|
421
|
+
const taskId = context.taskId || '';
|
|
253
422
|
if (!url) {
|
|
254
423
|
return { toolCallId, success: false, content: '缺少必要参数: url', error: 'missing_param' };
|
|
255
424
|
}
|
|
256
|
-
this.logger.info(`browser_screenshot: ${url}
|
|
425
|
+
this.logger.info(`browser_screenshot: ${url}`, { taskId });
|
|
257
426
|
const result = await this.sandbox.takeScreenshot(url, context.workDir, {
|
|
258
427
|
fullPage: fullPage || false,
|
|
259
428
|
selector,
|
|
260
|
-
});
|
|
429
|
+
}, taskId || undefined);
|
|
261
430
|
if (!result.success) {
|
|
262
431
|
return {
|
|
263
432
|
toolCallId,
|
|
@@ -272,5 +441,113 @@ export class BrowserSkill {
|
|
|
272
441
|
content: `截图已保存: ${result.path}\n尺寸: ${result.width}x${result.height}px\n大小: ${result.sizeKB}KB`,
|
|
273
442
|
};
|
|
274
443
|
}
|
|
444
|
+
async executeClick(params, context) {
|
|
445
|
+
const { selector, waitForNavigation = true } = params;
|
|
446
|
+
const toolCallId = context.toolCallId || 'unknown';
|
|
447
|
+
const taskId = context.taskId || '';
|
|
448
|
+
if (!selector) {
|
|
449
|
+
return { toolCallId, success: false, content: '缺少必要参数: selector', error: 'missing_param' };
|
|
450
|
+
}
|
|
451
|
+
if (!taskId) {
|
|
452
|
+
return { toolCallId, success: false, content: '交互操作需要任务上下文(taskId)', error: 'no_task_context' };
|
|
453
|
+
}
|
|
454
|
+
this.logger.info(`browser_click: ${selector}`, { taskId });
|
|
455
|
+
try {
|
|
456
|
+
const page = await this.getActivePage(taskId);
|
|
457
|
+
if (waitForNavigation) {
|
|
458
|
+
await Promise.all([
|
|
459
|
+
page.waitForNavigation({ timeout: 15000 }).catch(() => { }),
|
|
460
|
+
page.click(selector, { timeout: 5000 }),
|
|
461
|
+
]);
|
|
462
|
+
}
|
|
463
|
+
else {
|
|
464
|
+
await page.click(selector, { timeout: 5000 });
|
|
465
|
+
}
|
|
466
|
+
// 提取点击后的页面内容
|
|
467
|
+
const extractFn = `() => {
|
|
468
|
+
const main = document.querySelector('main') || document.querySelector('article') || document.querySelector('[role="main"]') || document.body;
|
|
469
|
+
if (!main) return '';
|
|
470
|
+
return (main.innerText || '').replace(/\\n{3,}/g, '\\n\\n').trim().slice(0, 3000);
|
|
471
|
+
}`;
|
|
472
|
+
const content = await page.evaluate(extractFn);
|
|
473
|
+
return {
|
|
474
|
+
toolCallId,
|
|
475
|
+
success: true,
|
|
476
|
+
content: content ? `点击成功,当前页面内容:\n\n${content}` : '点击成功。',
|
|
477
|
+
};
|
|
478
|
+
}
|
|
479
|
+
catch (err) {
|
|
480
|
+
return {
|
|
481
|
+
toolCallId,
|
|
482
|
+
success: false,
|
|
483
|
+
content: `点击失败: ${err.message}`,
|
|
484
|
+
error: err.message,
|
|
485
|
+
};
|
|
486
|
+
}
|
|
487
|
+
}
|
|
488
|
+
async executeFill(params, context) {
|
|
489
|
+
const { selector, value, submit = false } = params;
|
|
490
|
+
const toolCallId = context.toolCallId || 'unknown';
|
|
491
|
+
const taskId = context.taskId || '';
|
|
492
|
+
if (!selector || value === undefined) {
|
|
493
|
+
return { toolCallId, success: false, content: '缺少必要参数: selector, value', error: 'missing_param' };
|
|
494
|
+
}
|
|
495
|
+
if (!taskId) {
|
|
496
|
+
return { toolCallId, success: false, content: '交互操作需要任务上下文(taskId)', error: 'no_task_context' };
|
|
497
|
+
}
|
|
498
|
+
this.logger.info(`browser_fill: ${selector} = ${value.slice(0, 20)}...`, { taskId });
|
|
499
|
+
try {
|
|
500
|
+
const page = await this.getActivePage(taskId);
|
|
501
|
+
// 清空输入框并填写新内容
|
|
502
|
+
await page.fill(selector, String(value), { timeout: 5000 });
|
|
503
|
+
if (submit) {
|
|
504
|
+
await page.press(selector, 'Enter');
|
|
505
|
+
// 等待可能的页面跳转
|
|
506
|
+
await page.waitForNavigation({ timeout: 10000 }).catch(() => { });
|
|
507
|
+
}
|
|
508
|
+
return {
|
|
509
|
+
toolCallId,
|
|
510
|
+
success: true,
|
|
511
|
+
content: `已在 "${selector}" 中填写内容${submit ? '并提交' : ''}。`,
|
|
512
|
+
};
|
|
513
|
+
}
|
|
514
|
+
catch (err) {
|
|
515
|
+
return {
|
|
516
|
+
toolCallId,
|
|
517
|
+
success: false,
|
|
518
|
+
content: `填写失败: ${err.message}`,
|
|
519
|
+
error: err.message,
|
|
520
|
+
};
|
|
521
|
+
}
|
|
522
|
+
}
|
|
523
|
+
async executeWait(params, context) {
|
|
524
|
+
const { selector, timeout = 5000 } = params;
|
|
525
|
+
const toolCallId = context.toolCallId || 'unknown';
|
|
526
|
+
const taskId = context.taskId || '';
|
|
527
|
+
if (!selector) {
|
|
528
|
+
return { toolCallId, success: false, content: '缺少必要参数: selector', error: 'missing_param' };
|
|
529
|
+
}
|
|
530
|
+
if (!taskId) {
|
|
531
|
+
return { toolCallId, success: false, content: '交互操作需要任务上下文(taskId)', error: 'no_task_context' };
|
|
532
|
+
}
|
|
533
|
+
this.logger.info(`browser_wait: ${selector} (timeout: ${timeout}ms)`, { taskId });
|
|
534
|
+
try {
|
|
535
|
+
const page = await this.getActivePage(taskId);
|
|
536
|
+
await page.waitForSelector(selector, { timeout });
|
|
537
|
+
return {
|
|
538
|
+
toolCallId,
|
|
539
|
+
success: true,
|
|
540
|
+
content: `元素 "${selector}" 已出现。`,
|
|
541
|
+
};
|
|
542
|
+
}
|
|
543
|
+
catch (err) {
|
|
544
|
+
return {
|
|
545
|
+
toolCallId,
|
|
546
|
+
success: false,
|
|
547
|
+
content: `等待超时 (${timeout}ms): 元素 "${selector}" 未出现`,
|
|
548
|
+
error: err.message,
|
|
549
|
+
};
|
|
550
|
+
}
|
|
551
|
+
}
|
|
275
552
|
}
|
|
276
553
|
//# sourceMappingURL=browser-skill.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-skill.js","sourceRoot":"","sources":["../../src/skills/browser-skill.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"browser-skill.js","sourceRoot":"","sources":["../../src/skills/browser-skill.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager.d.ts","sourceRoot":"","sources":["../../src/task/task-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,QAAQ,EAAmB,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAOvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAIzD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,EAAE;YACT,WAAW,EAAE,MAAM,CAAC;YACpB,KAAK,EAAE,MAAM,CAAC;YACd,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;CACH;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAc;IAGjC,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,YAAY,CAAe;IAEnC,mBAAmB;IACnB,OAAO,CAAC,iBAAiB,CAAkC;IAG3D,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,iBAAiB,CAA+C;IAGxE,OAAO,CAAC,YAAY,CAAoD;IAGxE,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAK;gBAEtC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY;IA0DrF;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDhD;;OAEG;YACW,iBAAiB;IAY/B;;;OAGG;YACW,wBAAwB;IAyDtC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsD3B;;;;;;;OAOG;YACW,eAAe;IAwI7B;;OAEG;YACW,qBAAqB;IAwDnC;;OAEG;YACW,eAAe;YAsBf,yBAAyB;IA4EvC;;;;;OAKG;YACW,YAAY;IA4E1B;;OAEG;YACW,kBAAkB;IAoChC;;OAEG;YACW,cAAc;IAsD5B;;OAEG;IACH,OAAO,CAAC,YAAY;IAmBpB;;OAEG;YACW,UAAU;IAkDxB;;OAEG;YACW,SAAS;IAiDvB;;OAEG;YACW,WAAW;IAoFzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B;;OAEG;YACW,YAAY;
|
|
1
|
+
{"version":3,"file":"task-manager.d.ts","sourceRoot":"","sources":["../../src/task/task-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -867,6 +867,19 @@ export class TaskManager {
|
|
|
867
867
|
error: result.error,
|
|
868
868
|
reported,
|
|
869
869
|
});
|
|
870
|
+
// 释放服务端接单状态(cancelTake)
|
|
871
|
+
try {
|
|
872
|
+
const cancelResult = await this.platformApi.cancelTake(taskId);
|
|
873
|
+
if (cancelResult.success) {
|
|
874
|
+
this.logger.info(`✅ 已释放接单状态 [${taskId}]`);
|
|
875
|
+
}
|
|
876
|
+
else {
|
|
877
|
+
this.logger.warn(`释放接单状态失败 [${taskId}]`, { error: cancelResult.error });
|
|
878
|
+
}
|
|
879
|
+
}
|
|
880
|
+
catch (err) {
|
|
881
|
+
this.logger.debug(`释放接单状态异常 [${taskId}]`, { error: err.message });
|
|
882
|
+
}
|
|
870
883
|
// v2: 成果质量失败时通知发单人
|
|
871
884
|
if (result.qualityIssue) {
|
|
872
885
|
this.notifyQualityFailure(task, result).catch(err => {
|