plugin-agent-orchestrator 1.0.32 → 1.0.35
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 +114 -114
- package/dist/externalVersion.js +6 -6
- package/dist/server/collections/skill-executions.js +21 -0
- package/dist/server/plugin.js +132 -3
- package/dist/server/resources/agent-loop.js +1 -2
- package/dist/server/services/AgentLoopController.js +39 -1
- package/dist/server/services/AgentLoopService.js +3 -0
- package/dist/server/services/AgentRuntimeLifecycle.js +70 -0
- package/dist/server/services/FileManager.js +12 -0
- package/dist/server/services/NativeSubAgentObserver.js +20 -0
- package/dist/server/services/PlanningPromptService.js +95 -0
- package/dist/server/services/SandboxRunner.js +251 -56
- package/dist/server/services/TokenTracker.js +20 -0
- package/dist/server/services/WorkerEnvManager.js +76 -10
- package/dist/server/services/pythonGuardTemplate.js +105 -0
- package/dist/server/services/sandboxCapabilities.js +286 -0
- package/dist/server/skill-hub/plugin.js +98 -24
- package/dist/server/skill-hub/tasks/SkillExecutionTask.js +53 -11
- package/dist/server/utils/skill-settings.js +1 -1
- package/package.json +47 -47
- package/src/client-v2/components/AgentRunsTab.tsx +494 -494
- package/src/client-v2/components/TracingTab.tsx +432 -432
- package/src/client-v2/hooks/useApiRequest.ts +121 -121
- package/src/server/__tests__/agent-runtime-lifecycle.test.ts +46 -0
- package/src/server/__tests__/planning-prompt-service.test.ts +23 -0
- package/src/server/__tests__/skill-sandbox-worker-mode.test.ts +15 -0
- package/src/server/collections/skill-executions.ts +21 -0
- package/src/server/plugin.ts +151 -0
- package/src/server/resources/agent-loop.ts +1 -2
- package/src/server/resources/agent-monitor.ts +482 -482
- package/src/server/services/AgentLoopController.ts +50 -1
- package/src/server/services/AgentLoopService.ts +4 -0
- package/src/server/services/AgentRuntimeLifecycle.ts +64 -0
- package/src/server/services/ExecutionSpanService.ts +110 -110
- package/src/server/services/FileManager.ts +16 -1
- package/src/server/services/NativeSubAgentObserver.ts +528 -507
- package/src/server/services/PlanningPromptService.ts +72 -0
- package/src/server/services/SandboxRunner.ts +341 -74
- package/src/server/services/TokenTracker.ts +26 -0
- package/src/server/services/WorkerEnvManager.ts +95 -9
- package/src/server/services/pythonGuardTemplate.ts +87 -0
- package/src/server/services/sandboxCapabilities.ts +348 -0
- package/src/server/skill-hub/plugin.ts +106 -23
- package/src/server/skill-hub/tasks/SkillExecutionTask.ts +51 -6
- package/src/server/utils/skill-settings.ts +1 -0
|
@@ -71,11 +71,13 @@ class SkillExecutionTask {
|
|
|
71
71
|
this.app = app;
|
|
72
72
|
}
|
|
73
73
|
async run() {
|
|
74
|
-
var _a, _b, _c, _d, _e;
|
|
74
|
+
var _a, _b, _c, _d, _e, _f;
|
|
75
75
|
const skill = this.execution.get("skill") || this.execution.skill;
|
|
76
76
|
const execId = String(this.execution.get("id"));
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
const workerId = String(this.execution.get("workerId") || "");
|
|
78
|
+
if (this.execution.get("status") !== "running" || !workerId) {
|
|
79
|
+
this.app.logger.warn(`[skill-hub] Task ${execId}: refused execution without an active worker claim.`);
|
|
80
|
+
return;
|
|
79
81
|
}
|
|
80
82
|
const abortController = new TaskAbortController();
|
|
81
83
|
const abortChannel = `skill-hub.abort.${execId}`;
|
|
@@ -83,6 +85,21 @@ class SkillExecutionTask {
|
|
|
83
85
|
this.app.logger.info(`[skill-hub] Task ${execId}: received abort signal`);
|
|
84
86
|
abortController.abort();
|
|
85
87
|
};
|
|
88
|
+
const configuredHeartbeat = Number.parseInt(process.env.SKILL_HUB_HEARTBEAT_INTERVAL_MS || "", 10);
|
|
89
|
+
const heartbeatIntervalMs = Number.isFinite(configuredHeartbeat) && configuredHeartbeat > 0 ? configuredHeartbeat : 1e4;
|
|
90
|
+
const heartbeat = setInterval(() => {
|
|
91
|
+
this.updateIfOwned(execId, workerId, { heartbeatAt: /* @__PURE__ */ new Date() }).then((updated) => {
|
|
92
|
+
if (!updated) {
|
|
93
|
+
this.app.logger.warn(`[skill-hub] Task ${execId}: worker claim was lost; aborting stale worker.`);
|
|
94
|
+
abortController.abort();
|
|
95
|
+
}
|
|
96
|
+
}).catch((error) => {
|
|
97
|
+
this.app.logger.warn(`[skill-hub] Task ${execId}: heartbeat update failed`, {
|
|
98
|
+
error: error instanceof Error ? error : new Error(String(error))
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
}, heartbeatIntervalMs);
|
|
102
|
+
(_a = heartbeat.unref) == null ? void 0 : _a.call(heartbeat);
|
|
86
103
|
try {
|
|
87
104
|
await this.app.pubSubManager.subscribe(abortChannel, abortCallback);
|
|
88
105
|
const inputArgs = (0, import_json_fields.parseJsonText)(this.execution.get("inputArgs"), {});
|
|
@@ -98,7 +115,7 @@ class SkillExecutionTask {
|
|
|
98
115
|
const pluginSkillName = (skill.get ? skill.get("pluginSource") : skill.pluginSource) || skillName;
|
|
99
116
|
const orchestratorPlugin = this.app.pm.get("plugin-agent-orchestrator");
|
|
100
117
|
const skillHub = orchestratorPlugin == null ? void 0 : orchestratorPlugin.skillHub;
|
|
101
|
-
let pluginTemplate = typeof (skillHub == null ? void 0 : skillHub.resolveSkillTemplate) === "function" ? skillHub.resolveSkillTemplate(pluginSkillName) : (
|
|
118
|
+
let pluginTemplate = typeof (skillHub == null ? void 0 : skillHub.resolveSkillTemplate) === "function" ? skillHub.resolveSkillTemplate(pluginSkillName) : (_b = skillHub == null ? void 0 : skillHub.skillTemplates) == null ? void 0 : _b.get(pluginSkillName);
|
|
102
119
|
if (!pluginTemplate && skillHub) {
|
|
103
120
|
const allPlugins = this.app.pm.getPlugins();
|
|
104
121
|
for (const [, pInstance] of allPlugins) {
|
|
@@ -122,9 +139,9 @@ class SkillExecutionTask {
|
|
|
122
139
|
language = pluginTemplate.language;
|
|
123
140
|
if (pluginTemplate.timeoutSeconds) timeoutSeconds = pluginTemplate.timeoutSeconds;
|
|
124
141
|
if (pluginTemplate.maxOutputSizeMb) maxOutputSizeMb = pluginTemplate.maxOutputSizeMb;
|
|
125
|
-
const packageRoot = (
|
|
142
|
+
const packageRoot = (_c = pluginTemplate.skillPackage) == null ? void 0 : _c.rootDir;
|
|
126
143
|
if (packageRoot) {
|
|
127
|
-
const mountMode = ((
|
|
144
|
+
const mountMode = ((_d = pluginTemplate.skillPackage) == null ? void 0 : _d.mountMode) || "reference";
|
|
128
145
|
if (mountMode === "copy") {
|
|
129
146
|
skillDir = (0, import_path.resolve)(workDir, "skill");
|
|
130
147
|
this.skillRepoService.copyDirectoryTo(packageRoot, skillDir);
|
|
@@ -145,7 +162,10 @@ class SkillExecutionTask {
|
|
|
145
162
|
skillDir = workDir;
|
|
146
163
|
}
|
|
147
164
|
const code = this.renderTemplate(rawCodeTemplate, inputArgs, execId, skillDir);
|
|
148
|
-
await this.
|
|
165
|
+
if (!await this.updateIfOwned(execId, workerId, { executedCode: code })) {
|
|
166
|
+
abortController.abort();
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
149
169
|
let packageWhitelist = [];
|
|
150
170
|
try {
|
|
151
171
|
const workerConfig = await this.app.db.getRepository("skillWorkerConfigs").findOne();
|
|
@@ -236,17 +256,23 @@ class SkillExecutionTask {
|
|
|
236
256
|
} else {
|
|
237
257
|
status = result.success ? "succeeded" : "failed";
|
|
238
258
|
}
|
|
239
|
-
await this.
|
|
259
|
+
const completed = await this.updateIfOwned(execId, workerId, {
|
|
240
260
|
status,
|
|
241
261
|
stdout: result.stdout,
|
|
242
262
|
stderr: result.stderr,
|
|
243
263
|
outputFiles: (0, import_json_fields.stringifyJsonText)(result.files, []),
|
|
244
264
|
durationMs: result.durationMs
|
|
245
265
|
});
|
|
266
|
+
if (!completed) {
|
|
267
|
+
this.app.logger.warn(
|
|
268
|
+
`[skill-hub] Task ${execId}: discarded result from a worker that lost its claim.`
|
|
269
|
+
);
|
|
270
|
+
return;
|
|
271
|
+
}
|
|
246
272
|
await this.app.pubSubManager.publish(`skill-hub.done.${execId}`, {
|
|
247
273
|
status,
|
|
248
|
-
stdout: (
|
|
249
|
-
stderr: (
|
|
274
|
+
stdout: (_e = result.stdout) == null ? void 0 : _e.slice(0, 3e3),
|
|
275
|
+
stderr: (_f = result.stderr) == null ? void 0 : _f.slice(0, 1e3),
|
|
250
276
|
files: result.files,
|
|
251
277
|
durationMs: result.durationMs
|
|
252
278
|
});
|
|
@@ -255,10 +281,14 @@ class SkillExecutionTask {
|
|
|
255
281
|
);
|
|
256
282
|
} catch (error) {
|
|
257
283
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
258
|
-
await this.
|
|
284
|
+
const failed = await this.updateIfOwned(execId, workerId, {
|
|
259
285
|
status: "failed",
|
|
260
286
|
stderr: errorMessage
|
|
261
287
|
});
|
|
288
|
+
if (!failed) {
|
|
289
|
+
this.app.logger.warn(`[skill-hub] Task ${execId}: discarded error from a worker that lost its claim.`);
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
262
292
|
await this.app.pubSubManager.publish(`skill-hub.done.${execId}`, {
|
|
263
293
|
status: "failed",
|
|
264
294
|
stderr: errorMessage,
|
|
@@ -267,12 +297,24 @@ class SkillExecutionTask {
|
|
|
267
297
|
});
|
|
268
298
|
this.app.logger.error(`[skill-hub] Execution ${execId} error: ${errorMessage}`);
|
|
269
299
|
} finally {
|
|
300
|
+
clearInterval(heartbeat);
|
|
270
301
|
try {
|
|
271
302
|
await this.app.pubSubManager.unsubscribe(abortChannel, abortCallback);
|
|
272
303
|
} catch {
|
|
273
304
|
}
|
|
274
305
|
}
|
|
275
306
|
}
|
|
307
|
+
async updateIfOwned(execId, workerId, values) {
|
|
308
|
+
const model = this.app.db.getModel("skillExecutions");
|
|
309
|
+
const [affected] = await model.update(values, {
|
|
310
|
+
where: {
|
|
311
|
+
id: execId,
|
|
312
|
+
status: "running",
|
|
313
|
+
workerId
|
|
314
|
+
}
|
|
315
|
+
});
|
|
316
|
+
return affected > 0;
|
|
317
|
+
}
|
|
276
318
|
renderTemplate(template, args, execId, skillDir) {
|
|
277
319
|
let code = template;
|
|
278
320
|
for (const [key, value] of Object.entries(args)) {
|
|
@@ -35,7 +35,7 @@ function isRecord(value) {
|
|
|
35
35
|
return Boolean(value) && typeof value === "object" && !Array.isArray(value);
|
|
36
36
|
}
|
|
37
37
|
function isOrchestratorToolName(name) {
|
|
38
|
-
return name === "dispatch-sub-agent-task" || name === "external_rag_search" || name === "skill_hub_execute" || name.startsWith("skill_hub_") || name.startsWith("browser_") || name.startsWith("drawio-");
|
|
38
|
+
return name === "dispatch-sub-agent-task" || name === "external_rag_search" || name === "skill_hub_execute" || name.startsWith("skill_hub_") || name.startsWith("agent_loop_") || name.startsWith("browser_") || name.startsWith("drawio-");
|
|
39
39
|
}
|
|
40
40
|
function isRetiredOrchestratorToolName(name) {
|
|
41
41
|
return name === "orchestrator_plan_goal" || name === "orchestrator_execute_plan" || name === "orchestrator_status" || name === "orchestrator_cancel" || name.startsWith("delegate_") || name.startsWith("dispatch_subagents_");
|
package/package.json
CHANGED
|
@@ -1,47 +1,47 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "plugin-agent-orchestrator",
|
|
3
|
-
"displayName": "Agent Orchestrator",
|
|
4
|
-
"displayName.zh-CN": "代理协调器",
|
|
5
|
-
"displayName.vi-VN": "Điều phối Agent",
|
|
6
|
-
"description": "Native AI Employee sub-agent monitoring, policy, and memory context layer for NocoBase plugin-ai.",
|
|
7
|
-
"version": "1.0.
|
|
8
|
-
"license": "Apache-2.0",
|
|
9
|
-
"main": "dist/server/index.js",
|
|
10
|
-
"keywords": [
|
|
11
|
-
"AI",
|
|
12
|
-
"Agent",
|
|
13
|
-
"Orchestrator",
|
|
14
|
-
"Multi-Agent",
|
|
15
|
-
"Swarm"
|
|
16
|
-
],
|
|
17
|
-
"files": [
|
|
18
|
-
"dist",
|
|
19
|
-
"src",
|
|
20
|
-
"client.js",
|
|
21
|
-
"server.js",
|
|
22
|
-
"client.d.ts",
|
|
23
|
-
"server.d.ts",
|
|
24
|
-
"client-v2.js",
|
|
25
|
-
"client-v2.d.ts"
|
|
26
|
-
],
|
|
27
|
-
"nocobase": {
|
|
28
|
-
"supportedVersions": [
|
|
29
|
-
"2.x"
|
|
30
|
-
],
|
|
31
|
-
"editionLevel": 0
|
|
32
|
-
},
|
|
33
|
-
"dependencies": {
|
|
34
|
-
"adm-zip": "^0.5.10",
|
|
35
|
-
"simple-git": "^3.22.0",
|
|
36
|
-
"zod": "^3.23.0"
|
|
37
|
-
},
|
|
38
|
-
"peerDependencies": {
|
|
39
|
-
"@nocobase/client": "2.x",
|
|
40
|
-
"@nocobase/server": "2.x",
|
|
41
|
-
"@nocobase/database": "2.x",
|
|
42
|
-
"@nocobase/ai": "2.x",
|
|
43
|
-
"@nocobase/plugin-ai": "2.x",
|
|
44
|
-
"@nocobase/client-v2": "2.x",
|
|
45
|
-
"@nocobase/flow-engine": "2.x"
|
|
46
|
-
}
|
|
47
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "plugin-agent-orchestrator",
|
|
3
|
+
"displayName": "Agent Orchestrator",
|
|
4
|
+
"displayName.zh-CN": "代理协调器",
|
|
5
|
+
"displayName.vi-VN": "Điều phối Agent",
|
|
6
|
+
"description": "Native AI Employee sub-agent monitoring, policy, and memory context layer for NocoBase plugin-ai.",
|
|
7
|
+
"version": "1.0.35",
|
|
8
|
+
"license": "Apache-2.0",
|
|
9
|
+
"main": "dist/server/index.js",
|
|
10
|
+
"keywords": [
|
|
11
|
+
"AI",
|
|
12
|
+
"Agent",
|
|
13
|
+
"Orchestrator",
|
|
14
|
+
"Multi-Agent",
|
|
15
|
+
"Swarm"
|
|
16
|
+
],
|
|
17
|
+
"files": [
|
|
18
|
+
"dist",
|
|
19
|
+
"src",
|
|
20
|
+
"client.js",
|
|
21
|
+
"server.js",
|
|
22
|
+
"client.d.ts",
|
|
23
|
+
"server.d.ts",
|
|
24
|
+
"client-v2.js",
|
|
25
|
+
"client-v2.d.ts"
|
|
26
|
+
],
|
|
27
|
+
"nocobase": {
|
|
28
|
+
"supportedVersions": [
|
|
29
|
+
"2.x"
|
|
30
|
+
],
|
|
31
|
+
"editionLevel": 0
|
|
32
|
+
},
|
|
33
|
+
"dependencies": {
|
|
34
|
+
"adm-zip": "^0.5.10",
|
|
35
|
+
"simple-git": "^3.22.0",
|
|
36
|
+
"zod": "^3.23.0"
|
|
37
|
+
},
|
|
38
|
+
"peerDependencies": {
|
|
39
|
+
"@nocobase/client": "2.x",
|
|
40
|
+
"@nocobase/server": "2.x",
|
|
41
|
+
"@nocobase/database": "2.x",
|
|
42
|
+
"@nocobase/ai": "2.x",
|
|
43
|
+
"@nocobase/plugin-ai": "2.x",
|
|
44
|
+
"@nocobase/client-v2": "2.x",
|
|
45
|
+
"@nocobase/flow-engine": "2.x"
|
|
46
|
+
}
|
|
47
|
+
}
|