plugin-agent-orchestrator 1.1.3 → 1.1.5
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 +204 -114
- package/dist/client/index.js +1 -1
- package/dist/client-v2/117.7565cff57c39318a.js +10 -0
- package/dist/client-v2/214.106635011859dede.js +10 -0
- package/dist/client-v2/253.59577b40d9875be0.js +10 -0
- package/dist/client-v2/264.7ed8bee71fa5935c.js +10 -0
- package/dist/client-v2/{41.ba6e080cc0488143.js → 41.3deb9e57a0f64fc4.js} +1 -1
- package/dist/client-v2/418.41ed200e7d6da332.js +10 -0
- package/dist/client-v2/53.349fff8db80b19d4.js +10 -0
- package/dist/client-v2/619.0a2144aaffefe018.js +10 -0
- package/dist/client-v2/{70.bda9518881c05360.js → 70.ffff2997c10fd4b0.js} +1 -1
- package/dist/client-v2/{794.9bbb8d3a61b2bdf2.js → 794.a67a2614405ba627.js} +1 -1
- package/dist/client-v2/981.e4a1f41cfc94a856.js +10 -0
- package/dist/client-v2/{993.82778b6fd6db3cb1.js → 993.b0688fdc5ccb000a.js} +1 -1
- package/dist/client-v2/index.js +1 -1
- package/dist/externalVersion.js +8 -7
- package/dist/locale/en-US.json +199 -123
- package/dist/locale/vi-VN.json +199 -123
- package/dist/locale/zh-CN.json +199 -123
- package/dist/server/collections/agent-execution-spans.js +55 -0
- package/dist/server/collections/agent-harness-profile-versions.js +56 -0
- package/dist/server/collections/agent-harness-profiles.js +12 -0
- package/dist/server/collections/agent-loop-action-approvals.js +69 -0
- package/dist/server/collections/agent-loop-artifacts.js +55 -0
- package/dist/server/collections/agent-loop-circuit-states.js +53 -0
- package/dist/server/collections/agent-loop-control-settings.js +51 -0
- package/dist/server/collections/agent-loop-events.js +27 -0
- package/dist/server/collections/agent-loop-path-locks.js +57 -0
- package/dist/server/collections/agent-loop-patterns.js +72 -0
- package/dist/server/collections/agent-loop-runs.js +170 -3
- package/dist/server/collections/agent-loop-steps.js +76 -0
- package/dist/server/collections/agent-loop-usage-buckets.js +52 -0
- package/dist/server/collections/agent-loop-worktrees.js +55 -0
- package/dist/server/collections/skill-executions.js +8 -0
- package/dist/server/migrations/{20260427000000-change-packages-to-text.js → 20260427000002-change-packages-to-text.js} +2 -0
- package/dist/server/migrations/20260429000000-add-llm-fields.js +3 -2
- package/dist/server/migrations/{20260429000000-fix-inputargs-json-to-text.js → 20260429000001-fix-inputargs-json-to-text.js} +14 -6
- package/dist/server/migrations/20260503000000-add-orchestrator-trace-fields.js +2 -1
- package/dist/server/migrations/20260524000000-add-agent-loop-fields-to-skill-executions.js +2 -1
- package/dist/server/migrations/20260803010000-backfill-loop-control-plane-data.js +262 -0
- package/dist/server/plugin.js +54 -150
- package/dist/server/resources/agent-harness-profile.js +117 -0
- package/dist/server/resources/agent-knowledge-insights.js +1 -3
- package/dist/server/resources/agent-loop-approval.js +108 -0
- package/dist/server/resources/agent-loop-artifact.js +86 -0
- package/dist/server/resources/agent-loop-events-stream.js +130 -0
- package/dist/server/resources/agent-loop.js +183 -139
- package/dist/server/resources/resource-helpers.js +63 -0
- package/dist/server/resources/tracing.js +121 -107
- package/dist/server/services/AgentMemoryContextService.js +34 -0
- package/dist/server/services/DurableCircuitBreakerService.js +229 -0
- package/dist/server/services/HarnessCompiler.js +175 -0
- package/dist/server/services/HarnessProfileService.js +233 -0
- package/dist/server/services/HarnessSchema.js +194 -0
- package/dist/server/services/LoopBudgetService.js +269 -0
- package/dist/server/services/LoopControlService.js +139 -0
- package/dist/server/services/LoopPatternSchema.js +195 -0
- package/dist/server/services/LoopPatternService.js +132 -0
- package/dist/server/services/LoopRunRepository.js +285 -0
- package/dist/server/services/LoopRunStateMachine.js +478 -0
- package/dist/server/services/LoopSchedulerService.js +193 -0
- package/dist/server/services/LoopTriggerService.js +165 -0
- package/dist/server/services/LoopWorkerService.js +699 -0
- package/dist/server/services/NativeSubAgentObserver.js +165 -23
- package/dist/server/services/PathLockService.js +288 -0
- package/dist/server/services/PluginAiRuntimeAdapter.js +226 -0
- package/dist/server/services/ToolLoopDetectionService.js +210 -0
- package/dist/server/services/VerificationSchema.js +59 -0
- package/dist/server/services/VerificationService.js +235 -0
- package/dist/server/services/harness-runtime-policy.js +139 -0
- package/dist/server/skill-hub/actions/git-import.js +13 -7
- package/dist/server/skill-hub/plugin.js +36 -3
- package/dist/server/skill-hub/services/RegistrySkillSnapshotService.js +1 -5
- package/dist/server/skill-hub/tasks/SkillExecutionTask.js +29 -0
- package/dist/server/utils/ensure-indexes.js +111 -0
- package/dist/server/utils/loop-pattern-context.js +56 -0
- package/package.json +53 -53
- package/src/client/ApprovalsTab.tsx +2 -0
- package/src/client/OrchestratorSettings.tsx +55 -0
- package/src/client/skill-hub/components/GitSkillImport.tsx +3 -3
- package/src/client/skill-hub/components/SkillMetrics.tsx +15 -10
- package/src/client/skill-hub/index.tsx +0 -52
- package/src/client-v2/components/AgentRunsTab.tsx +100 -18
- package/src/client-v2/components/ApprovalsTab.tsx +337 -0
- package/src/client-v2/components/HarnessProfilesTab.tsx +385 -100
- package/src/client-v2/components/MemoryInspectorTab.tsx +141 -125
- package/src/client-v2/components/TracingTab.tsx +160 -77
- package/src/client-v2/hooks/useApiRequest.ts +28 -8
- package/src/client-v2/pages/ApprovalsPage.tsx +10 -0
- package/src/client-v2/plugin.tsx +6 -6
- package/src/client-v2/skill-hub/components/SkillMetrics.tsx +11 -6
- package/src/locale/en-US.json +199 -123
- package/src/locale/vi-VN.json +199 -123
- package/src/locale/zh-CN.json +199 -123
- package/src/server/__tests__/circuit-breaker.test.ts +248 -169
- package/src/server/__tests__/harness-compiler.test.ts +214 -0
- package/src/server/__tests__/harness-profile-service.test.ts +167 -0
- package/src/server/__tests__/harness-runtime-policy.test.ts +293 -0
- package/src/server/__tests__/harness-tool-plan.test.ts +172 -0
- package/src/server/__tests__/loop-approval-decision.test.ts +512 -0
- package/src/server/__tests__/loop-approval-expiry.test.ts +258 -0
- package/src/server/__tests__/loop-budget-service.test.ts +255 -0
- package/src/server/__tests__/loop-control-plane-backfill.test.ts +266 -0
- package/src/server/__tests__/loop-pattern-schema.test.ts +73 -0
- package/src/server/__tests__/loop-pattern-service.test.ts +148 -0
- package/src/server/__tests__/loop-run-state-machine.test.ts +101 -0
- package/src/server/__tests__/loop-trigger-service.test.ts +148 -0
- package/src/server/__tests__/loop-worker-claim.test.ts +341 -0
- package/src/server/__tests__/loop-worker-execution.test.ts +317 -0
- package/src/server/__tests__/native-sub-agent-observer.test.ts +288 -4
- package/src/server/__tests__/path-lock-service.test.ts +254 -0
- package/src/server/__tests__/skill-execution-task-policy.test.ts +140 -0
- package/src/server/__tests__/smoke.test.ts +162 -121
- package/src/server/__tests__/tool-loop-detection.test.ts +275 -0
- package/src/server/collections/agent-execution-spans.ts +55 -0
- package/src/server/collections/agent-harness-profile-versions.ts +26 -0
- package/src/server/collections/agent-harness-profiles.ts +71 -59
- package/src/server/collections/agent-loop-action-approvals.ts +39 -0
- package/src/server/collections/agent-loop-artifacts.ts +25 -0
- package/src/server/collections/agent-loop-circuit-states.ts +23 -0
- package/src/server/collections/agent-loop-control-settings.ts +21 -0
- package/src/server/collections/agent-loop-events.ts +98 -71
- package/src/server/collections/agent-loop-path-locks.ts +27 -0
- package/src/server/collections/agent-loop-patterns.ts +42 -0
- package/src/server/collections/agent-loop-runs.ts +170 -3
- package/src/server/collections/agent-loop-steps.ts +76 -0
- package/src/server/collections/agent-loop-usage-buckets.ts +22 -0
- package/src/server/collections/agent-loop-worktrees.ts +25 -0
- package/src/server/collections/skill-executions.ts +8 -0
- package/src/server/migrations/{20260427000000-change-packages-to-text.ts → 20260427000002-change-packages-to-text.ts} +52 -49
- package/src/server/migrations/20260429000000-add-llm-fields.ts +47 -46
- package/src/server/migrations/{20260429000000-fix-inputargs-json-to-text.ts → 20260429000001-fix-inputargs-json-to-text.ts} +45 -38
- package/src/server/migrations/20260503000000-add-orchestrator-trace-fields.ts +33 -32
- package/src/server/migrations/20260524000000-add-agent-loop-fields-to-skill-executions.ts +31 -30
- package/src/server/migrations/20260803010000-backfill-loop-control-plane-data.ts +293 -0
- package/src/server/plugin.ts +55 -167
- package/src/server/resources/agent-harness-profile.ts +94 -0
- package/src/server/resources/agent-knowledge-insights.ts +5 -3
- package/src/server/resources/agent-loop-approval.ts +84 -0
- package/src/server/resources/agent-loop-artifact.ts +56 -0
- package/src/server/resources/agent-loop-events-stream.ts +105 -0
- package/src/server/resources/agent-loop.ts +204 -143
- package/src/server/resources/agent-monitor.ts +482 -482
- package/src/server/resources/resource-helpers.ts +33 -0
- package/src/server/resources/tracing.ts +266 -258
- package/src/server/services/AgentMemoryContextService.ts +44 -0
- package/src/server/services/DurableCircuitBreakerService.ts +239 -0
- package/src/server/services/ExecutionSpanService.ts +2 -0
- package/src/server/services/HarnessCompiler.ts +170 -0
- package/src/server/services/HarnessProfileService.ts +239 -0
- package/src/server/services/HarnessSchema.ts +194 -0
- package/src/server/services/LoopBudgetService.ts +275 -0
- package/src/server/services/LoopControlService.ts +124 -0
- package/src/server/services/LoopPatternSchema.ts +185 -0
- package/src/server/services/LoopPatternService.ts +143 -0
- package/src/server/services/LoopRunRepository.ts +336 -0
- package/src/server/services/LoopRunStateMachine.ts +529 -0
- package/src/server/services/LoopSchedulerService.ts +199 -0
- package/src/server/services/LoopTriggerService.ts +157 -0
- package/src/server/services/LoopWorkerService.ts +822 -0
- package/src/server/services/NativeSubAgentObserver.ts +186 -21
- package/src/server/services/PathLockService.ts +321 -0
- package/src/server/services/PluginAiRuntimeAdapter.ts +332 -0
- package/src/server/services/ToolLoopDetectionService.ts +213 -0
- package/src/server/services/VerificationSchema.ts +31 -0
- package/src/server/services/VerificationService.ts +264 -0
- package/src/server/services/harness-runtime-policy.ts +141 -0
- package/src/server/skill-hub/actions/__tests__/git-import.test.ts +15 -1
- package/src/server/skill-hub/actions/git-import.ts +9 -3
- package/src/server/skill-hub/plugin.ts +41 -3
- package/src/server/skill-hub/services/RegistrySkillSnapshotService.ts +235 -239
- package/src/server/skill-hub/services/__tests__/RegistrySkillSnapshotService.test.ts +61 -63
- package/src/server/skill-hub/tasks/SkillExecutionTask.ts +43 -2
- package/src/server/utils/ensure-indexes.ts +96 -0
- package/src/server/utils/logging.ts +62 -63
- package/src/server/utils/loop-pattern-context.ts +20 -0
- package/dist/client-v2/214.79650a549273f163.js +0 -10
- package/dist/client-v2/253.9f0537713cee9e6c.js +0 -10
- package/dist/client-v2/264.718a107e43fc163c.js +0 -10
- package/dist/client-v2/373.f5d5292e53c4e832.js +0 -10
- package/dist/client-v2/418.ce8f5b2b8a229d1d.js +0 -10
- package/dist/client-v2/53.7c29c28043e9112d.js +0 -10
- package/dist/client-v2/619.bd3c5698b40705c3.js +0 -10
- package/dist/client-v2/677.a991ce0250ff5c77.js +0 -10
- package/dist/client-v2/925.f5370de8f6632d65.js +0 -10
- package/dist/server/services/AgentHarness.js +0 -81
- package/dist/server/services/AgentLoopController.js +0 -1023
- package/dist/server/services/AgentLoopRepository.js +0 -192
- package/dist/server/services/AgentLoopService.js +0 -142
- package/dist/server/services/AgentPlanValidator.js +0 -99
- package/dist/server/services/AgentPlannerService.js +0 -99
- package/dist/server/services/CircuitBreaker.js +0 -125
- package/dist/server/services/ContextAggregator.js +0 -201
- package/dist/server/services/PlanningPromptService.js +0 -95
- package/dist/server/tools/agent-loop.js +0 -373
- package/dist/server/tools/orchestrator-plan.js +0 -254
- package/src/client/AIEmployeeSelect.tsx +0 -47
- package/src/client/AIEmployeesContext.tsx +0 -102
- package/src/client/RulesTab.tsx +0 -2
- package/src/client/TracingTab.tsx +0 -436
- package/src/client/skill-hub/components/ExecutionProgress.tsx +0 -51
- package/src/client-v2/components/RulesTab.tsx +0 -2
- package/src/client-v2/pages/AgentRunsPage.tsx +0 -13
- package/src/server/__tests__/agent-loop-controller.test.ts +0 -375
- package/src/server/__tests__/context-aggregator.test.ts +0 -222
- package/src/server/__tests__/parallel-execution.test.ts +0 -318
- package/src/server/__tests__/planning-prompt-service.test.ts +0 -23
- package/src/server/services/AgentHarness.ts +0 -67
- package/src/server/services/AgentLoopController.ts +0 -1263
- package/src/server/services/AgentLoopRepository.ts +0 -178
- package/src/server/services/AgentLoopService.ts +0 -177
- package/src/server/services/AgentPlanValidator.ts +0 -73
- package/src/server/services/AgentPlannerService.ts +0 -80
- package/src/server/services/CircuitBreaker.ts +0 -126
- package/src/server/services/ContextAggregator.ts +0 -239
- package/src/server/services/PlanningPromptService.ts +0 -72
- package/src/server/tools/agent-loop.ts +0 -360
- package/src/server/tools/orchestrator-plan.ts +0 -255
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file is part of the NocoBase (R) project.
|
|
3
|
+
* Copyright (c) 2020-2024 NocoBase Co., Ltd.
|
|
4
|
+
* Authors: NocoBase Team.
|
|
5
|
+
*
|
|
6
|
+
* This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
|
|
7
|
+
* For more information, please refer to: https://www.nocobase.com/agreement.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
var __defProp = Object.defineProperty;
|
|
11
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
12
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
13
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
14
|
+
var __export = (target, all) => {
|
|
15
|
+
for (var name in all)
|
|
16
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
17
|
+
};
|
|
18
|
+
var __copyProps = (to, from, except, desc) => {
|
|
19
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
20
|
+
for (let key of __getOwnPropNames(from))
|
|
21
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
22
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
23
|
+
}
|
|
24
|
+
return to;
|
|
25
|
+
};
|
|
26
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
27
|
+
var agent_loop_worktrees_exports = {};
|
|
28
|
+
__export(agent_loop_worktrees_exports, {
|
|
29
|
+
default: () => agent_loop_worktrees_default
|
|
30
|
+
});
|
|
31
|
+
module.exports = __toCommonJS(agent_loop_worktrees_exports);
|
|
32
|
+
var import_database = require("@nocobase/database");
|
|
33
|
+
var agent_loop_worktrees_default = (0, import_database.defineCollection)({
|
|
34
|
+
name: "agentLoopWorktrees",
|
|
35
|
+
title: "Agent Loop Worktrees",
|
|
36
|
+
fields: [
|
|
37
|
+
{ name: "id", type: "bigInt", autoIncrement: true, primaryKey: true },
|
|
38
|
+
{ name: "runId", type: "bigInt", allowNull: false },
|
|
39
|
+
{ name: "run", type: "belongsTo", target: "agentLoopRuns", foreignKey: "runId", allowNull: false },
|
|
40
|
+
{ name: "repositoryKey", type: "string", length: 200, allowNull: false },
|
|
41
|
+
{ name: "repositoryRoot", type: "string", length: 1e3, allowNull: false },
|
|
42
|
+
{ name: "baseRef", type: "string", length: 200, allowNull: false },
|
|
43
|
+
{ name: "branchName", type: "string", length: 300, allowNull: false },
|
|
44
|
+
{ name: "worktreePath", type: "string", length: 1500, allowNull: false },
|
|
45
|
+
{ name: "provider", type: "string", length: 40, defaultValue: "git" },
|
|
46
|
+
{ name: "status", type: "string", length: 30, defaultValue: "creating" },
|
|
47
|
+
{ name: "patchArtifactId", type: "bigInt" },
|
|
48
|
+
{ name: "cleanupReason", type: "text" },
|
|
49
|
+
{ name: "createdAt", type: "date" },
|
|
50
|
+
{ name: "activatedAt", type: "date" },
|
|
51
|
+
{ name: "removedAt", type: "date" },
|
|
52
|
+
{ name: "updatedAt", type: "date" }
|
|
53
|
+
],
|
|
54
|
+
indexes: [{ unique: true, fields: ["runId"] }, { fields: ["repositoryKey", "status"] }, { fields: ["worktreePath"] }]
|
|
55
|
+
});
|
|
@@ -167,6 +167,14 @@ var skill_executions_default = {
|
|
|
167
167
|
target: "users",
|
|
168
168
|
foreignKey: "triggeredById"
|
|
169
169
|
},
|
|
170
|
+
{
|
|
171
|
+
// Harness-derived overrides resolved when the execution is queued, e.g.
|
|
172
|
+
// { timeoutSeconds, spillMaxInlineBytes }. The worker applies them on top of the skill's
|
|
173
|
+
// own defaults; storing them here keeps the worker from needing harness access.
|
|
174
|
+
name: "runtimePolicy",
|
|
175
|
+
type: "json",
|
|
176
|
+
allowNull: true
|
|
177
|
+
},
|
|
170
178
|
{
|
|
171
179
|
name: "createdAt",
|
|
172
180
|
type: "date"
|
|
@@ -31,6 +31,8 @@ __export(change_packages_to_text_exports, {
|
|
|
31
31
|
module.exports = __toCommonJS(change_packages_to_text_exports);
|
|
32
32
|
var import_server = require("@nocobase/server");
|
|
33
33
|
class ChangePackagesToTextMigration extends import_server.Migration {
|
|
34
|
+
on = "afterLoad";
|
|
35
|
+
appVersion = ">=0.1.0";
|
|
34
36
|
async up() {
|
|
35
37
|
const queryInterface = this.db.sequelize.getQueryInterface();
|
|
36
38
|
const tableName = `${this.db.options.tablePrefix || ""}skillDefinitions`;
|
|
@@ -30,6 +30,7 @@ __export(add_llm_fields_exports, {
|
|
|
30
30
|
});
|
|
31
31
|
module.exports = __toCommonJS(add_llm_fields_exports);
|
|
32
32
|
var import_server = require("@nocobase/server");
|
|
33
|
+
var import_database = require("@nocobase/database");
|
|
33
34
|
class AddLlmFieldsToOrchestratorConfig extends import_server.Migration {
|
|
34
35
|
on = "afterLoad";
|
|
35
36
|
appVersion = ">=0.1.0";
|
|
@@ -42,14 +43,14 @@ class AddLlmFieldsToOrchestratorConfig extends import_server.Migration {
|
|
|
42
43
|
const tableDesc = await queryInterface.describeTable(tableName);
|
|
43
44
|
if (!tableDesc["llmService"]) {
|
|
44
45
|
await queryInterface.addColumn(tableName, "llmService", {
|
|
45
|
-
type:
|
|
46
|
+
type: import_database.DataTypes.STRING(255),
|
|
46
47
|
allowNull: true
|
|
47
48
|
});
|
|
48
49
|
console.log(`[AgentOrchestrator] Added llmService column to ${tableName}`);
|
|
49
50
|
}
|
|
50
51
|
if (!tableDesc["model"]) {
|
|
51
52
|
await queryInterface.addColumn(tableName, "model", {
|
|
52
|
-
type:
|
|
53
|
+
type: import_database.DataTypes.STRING(255),
|
|
53
54
|
allowNull: true
|
|
54
55
|
});
|
|
55
56
|
console.log(`[AgentOrchestrator] Added model column to ${tableName}`);
|
|
@@ -30,20 +30,28 @@ __export(fix_inputargs_json_to_text_exports, {
|
|
|
30
30
|
});
|
|
31
31
|
module.exports = __toCommonJS(fix_inputargs_json_to_text_exports);
|
|
32
32
|
var import_server = require("@nocobase/server");
|
|
33
|
+
var import_database = require("@nocobase/database");
|
|
33
34
|
class FixInputArgsJsonToText extends import_server.Migration {
|
|
34
35
|
on = "afterLoad";
|
|
35
36
|
appVersion = ">=0.1.0";
|
|
36
37
|
async up() {
|
|
37
|
-
|
|
38
|
-
const
|
|
38
|
+
var _a, _b;
|
|
39
|
+
const db = this.db;
|
|
40
|
+
const queryInterface = db.sequelize.getQueryInterface();
|
|
41
|
+
const tableName = `${db.options.tablePrefix || ""}skillExecutions`;
|
|
42
|
+
const tableDesc = await queryInterface.describeTable(tableName).catch(() => null);
|
|
39
43
|
if (!tableDesc) return;
|
|
40
44
|
const col = tableDesc["inputArgs"];
|
|
41
45
|
if (!col) return;
|
|
42
46
|
if (col.type && col.type.toLowerCase().includes("json")) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
if (db.sequelize.getDialect() === "postgres") {
|
|
48
|
+
await db.sequelize.query(
|
|
49
|
+
`ALTER TABLE "${tableName}" ALTER COLUMN "inputArgs" TYPE text USING "inputArgs"::text`
|
|
50
|
+
);
|
|
51
|
+
} else {
|
|
52
|
+
await queryInterface.changeColumn(tableName, "inputArgs", { type: import_database.DataTypes.TEXT });
|
|
53
|
+
}
|
|
54
|
+
(_b = (_a = db.logger) == null ? void 0 : _a.info) == null ? void 0 : _b.call(_a, "[skill-hub] Migration: converted skillExecutions.inputArgs from json to text");
|
|
47
55
|
}
|
|
48
56
|
}
|
|
49
57
|
async down() {
|
|
@@ -30,6 +30,7 @@ __export(add_orchestrator_trace_fields_exports, {
|
|
|
30
30
|
});
|
|
31
31
|
module.exports = __toCommonJS(add_orchestrator_trace_fields_exports);
|
|
32
32
|
var import_server = require("@nocobase/server");
|
|
33
|
+
var import_database = require("@nocobase/database");
|
|
33
34
|
class AddOrchestratorTraceFieldsToSkillExecutions extends import_server.Migration {
|
|
34
35
|
on = "afterLoad";
|
|
35
36
|
appVersion = ">=0.1.0";
|
|
@@ -43,7 +44,7 @@ class AddOrchestratorTraceFieldsToSkillExecutions extends import_server.Migratio
|
|
|
43
44
|
const addIfMissing = async (name) => {
|
|
44
45
|
if (tableDesc[name]) return;
|
|
45
46
|
await queryInterface.addColumn(tableName, name, {
|
|
46
|
-
type:
|
|
47
|
+
type: import_database.DataTypes.STRING(100),
|
|
47
48
|
allowNull: true
|
|
48
49
|
});
|
|
49
50
|
};
|
|
@@ -30,6 +30,7 @@ __export(add_agent_loop_fields_to_skill_executions_exports, {
|
|
|
30
30
|
});
|
|
31
31
|
module.exports = __toCommonJS(add_agent_loop_fields_to_skill_executions_exports);
|
|
32
32
|
var import_server = require("@nocobase/server");
|
|
33
|
+
var import_database = require("@nocobase/database");
|
|
33
34
|
class AddAgentLoopFieldsToSkillExecutions extends import_server.Migration {
|
|
34
35
|
on = "afterLoad";
|
|
35
36
|
appVersion = ">=0.1.0";
|
|
@@ -43,7 +44,7 @@ class AddAgentLoopFieldsToSkillExecutions extends import_server.Migration {
|
|
|
43
44
|
const addIfMissing = async (name) => {
|
|
44
45
|
if (tableDesc[name]) return;
|
|
45
46
|
await queryInterface.addColumn(tableName, name, {
|
|
46
|
-
type:
|
|
47
|
+
type: import_database.DataTypes.STRING(100),
|
|
47
48
|
allowNull: true
|
|
48
49
|
});
|
|
49
50
|
};
|
|
@@ -0,0 +1,262 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file is part of the NocoBase (R) project.
|
|
3
|
+
* Copyright (c) 2020-2024 NocoBase Co., Ltd.
|
|
4
|
+
* Authors: NocoBase Team.
|
|
5
|
+
*
|
|
6
|
+
* This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
|
|
7
|
+
* For more information, please refer to: https://www.nocobase.com/agreement.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
var __defProp = Object.defineProperty;
|
|
11
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
12
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
13
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
14
|
+
var __export = (target, all) => {
|
|
15
|
+
for (var name in all)
|
|
16
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
17
|
+
};
|
|
18
|
+
var __copyProps = (to, from, except, desc) => {
|
|
19
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
20
|
+
for (let key of __getOwnPropNames(from))
|
|
21
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
22
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
23
|
+
}
|
|
24
|
+
return to;
|
|
25
|
+
};
|
|
26
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
27
|
+
var backfill_loop_control_plane_data_exports = {};
|
|
28
|
+
__export(backfill_loop_control_plane_data_exports, {
|
|
29
|
+
backfillLoopControlPlaneData: () => backfillLoopControlPlaneData,
|
|
30
|
+
default: () => BackfillLoopControlPlaneData
|
|
31
|
+
});
|
|
32
|
+
module.exports = __toCommonJS(backfill_loop_control_plane_data_exports);
|
|
33
|
+
var import_server = require("@nocobase/server");
|
|
34
|
+
var import_HarnessSchema = require("../services/HarnessSchema");
|
|
35
|
+
var import_LoopPatternSchema = require("../services/LoopPatternSchema");
|
|
36
|
+
var import_ensure_indexes = require("../utils/ensure-indexes");
|
|
37
|
+
const LEGACY_TERMINAL_STATUSES = /* @__PURE__ */ new Set(["succeeded", "failed", "rejected", "canceled"]);
|
|
38
|
+
const CONTROL_PLANE_STATUSES = /* @__PURE__ */ new Set([
|
|
39
|
+
"queued",
|
|
40
|
+
"preparing",
|
|
41
|
+
"waiting_lock",
|
|
42
|
+
"running",
|
|
43
|
+
"waiting_approval",
|
|
44
|
+
"verifying",
|
|
45
|
+
"waiting_human",
|
|
46
|
+
"paused",
|
|
47
|
+
"blocked",
|
|
48
|
+
"succeeded",
|
|
49
|
+
"failed",
|
|
50
|
+
"canceled"
|
|
51
|
+
]);
|
|
52
|
+
const LEGACY_PLAN_STATUSES = /* @__PURE__ */ new Set([
|
|
53
|
+
"planning",
|
|
54
|
+
"waiting_plan_approval",
|
|
55
|
+
"approved",
|
|
56
|
+
"waiting_user",
|
|
57
|
+
"needs_replan",
|
|
58
|
+
"rejected"
|
|
59
|
+
]);
|
|
60
|
+
const BACKFILL_BATCH_SIZE = 500;
|
|
61
|
+
async function* iterateInBatches(repository, options = {}) {
|
|
62
|
+
let page = 1;
|
|
63
|
+
for (; ; ) {
|
|
64
|
+
const batch = await repository.find({ ...options, sort: ["id"], page, pageSize: BACKFILL_BATCH_SIZE });
|
|
65
|
+
if (!batch.length) return;
|
|
66
|
+
for (const record of batch) {
|
|
67
|
+
yield record;
|
|
68
|
+
}
|
|
69
|
+
if (batch.length < BACKFILL_BATCH_SIZE) return;
|
|
70
|
+
page += 1;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function readValue(record, key) {
|
|
74
|
+
return typeof record.get === "function" ? record.get(key) : record[key];
|
|
75
|
+
}
|
|
76
|
+
function asObject(value) {
|
|
77
|
+
return value && typeof value === "object" && !Array.isArray(value) ? value : {};
|
|
78
|
+
}
|
|
79
|
+
function positiveInteger(value) {
|
|
80
|
+
const parsed = typeof value === "number" ? value : Number(value);
|
|
81
|
+
return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : null;
|
|
82
|
+
}
|
|
83
|
+
function stringValue(value) {
|
|
84
|
+
return typeof value === "string" ? value : "";
|
|
85
|
+
}
|
|
86
|
+
function isPublishedValidVersion(version) {
|
|
87
|
+
return readValue(version, "status") === "published" && (0, import_HarnessSchema.validateHarnessSettings)(readValue(version, "settings")).success;
|
|
88
|
+
}
|
|
89
|
+
async function backfillHarnessProfiles(db) {
|
|
90
|
+
const profiles = db.getRepository("agentHarnessProfiles");
|
|
91
|
+
const versions = db.getRepository("agentHarnessProfileVersions");
|
|
92
|
+
if (!profiles || !versions) return;
|
|
93
|
+
for await (const profile of iterateInBatches(profiles)) {
|
|
94
|
+
const profileId = positiveInteger(readValue(profile, "id"));
|
|
95
|
+
if (!profileId) continue;
|
|
96
|
+
await db.sequelize.transaction(async (transaction) => {
|
|
97
|
+
const allVersions = await versions.find({ filter: { profileId }, sort: ["-version"], transaction });
|
|
98
|
+
const currentVersionId = positiveInteger(readValue(profile, "currentVersionId"));
|
|
99
|
+
const current = currentVersionId ? await versions.findOne({ filterByTk: currentVersionId, transaction }) : null;
|
|
100
|
+
if (current && isPublishedValidVersion(current)) return;
|
|
101
|
+
const published = allVersions.find(isPublishedValidVersion);
|
|
102
|
+
if (published) {
|
|
103
|
+
const publishedId = positiveInteger(readValue(published, "id"));
|
|
104
|
+
if (publishedId && currentVersionId !== publishedId) {
|
|
105
|
+
await profiles.update({
|
|
106
|
+
filterByTk: profileId,
|
|
107
|
+
values: { currentVersionId: publishedId },
|
|
108
|
+
transaction
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
const settingsResult = (0, import_HarnessSchema.validateHarnessSettings)(readValue(profile, "settings"));
|
|
114
|
+
if (!settingsResult.success) return;
|
|
115
|
+
const settings = settingsResult.data;
|
|
116
|
+
const nextVersion = allVersions.reduce((maximum, version2) => Math.max(maximum, Number(readValue(version2, "version")) || 0), 0) + 1;
|
|
117
|
+
const version = await versions.create({
|
|
118
|
+
values: {
|
|
119
|
+
profileId,
|
|
120
|
+
version: nextVersion,
|
|
121
|
+
schemaVersion: positiveInteger(readValue(profile, "schemaVersion")) || 1,
|
|
122
|
+
status: "published",
|
|
123
|
+
settings,
|
|
124
|
+
publishedAt: readValue(profile, "updatedAt") || readValue(profile, "createdAt") || /* @__PURE__ */ new Date()
|
|
125
|
+
},
|
|
126
|
+
transaction
|
|
127
|
+
});
|
|
128
|
+
const versionId = positiveInteger(readValue(version, "id"));
|
|
129
|
+
if (versionId) {
|
|
130
|
+
await profiles.update({
|
|
131
|
+
filterByTk: profileId,
|
|
132
|
+
values: { currentVersionId: versionId },
|
|
133
|
+
transaction
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
function hasLegacyPlanFields(run, status) {
|
|
140
|
+
const metadata = asObject(readValue(run, "metadata"));
|
|
141
|
+
return LEGACY_PLAN_STATUSES.has(status) || Boolean(stringValue(readValue(run, "planSource")).trim()) || Boolean(stringValue(readValue(run, "plannerModel")).trim()) || Boolean(stringValue(metadata.planSource).trim()) || Boolean(stringValue(metadata.plannerModel).trim()) || Boolean(stringValue(metadata.approvalMode).trim());
|
|
142
|
+
}
|
|
143
|
+
function isValidControlPlaneRun(run) {
|
|
144
|
+
const runtimeVersion = stringValue(readValue(run, "runtimeVersion"));
|
|
145
|
+
const status = stringValue(readValue(run, "status"));
|
|
146
|
+
const patternId = positiveInteger(readValue(run, "patternId"));
|
|
147
|
+
return runtimeVersion === "control-plane-v2" && CONTROL_PLANE_STATUSES.has(status) && !hasLegacyPlanFields(run, status) && patternId !== null && import_LoopPatternSchema.loopPatternPolicySchema.safeParse(readValue(run, "policySnapshot")).success;
|
|
148
|
+
}
|
|
149
|
+
async function backfillLegacyRuns(db) {
|
|
150
|
+
const runs = db.getRepository("agentLoopRuns");
|
|
151
|
+
const steps = db.getRepository("agentLoopSteps");
|
|
152
|
+
const events = db.getRepository("agentLoopEvents");
|
|
153
|
+
if (!runs || !steps || !events) return;
|
|
154
|
+
for await (const run of iterateInBatches(runs)) {
|
|
155
|
+
const runId = positiveInteger(readValue(run, "id"));
|
|
156
|
+
if (!runId || isValidControlPlaneRun(run)) continue;
|
|
157
|
+
const metadata = asObject(readValue(run, "metadata"));
|
|
158
|
+
const statusValue = stringValue(readValue(run, "status"));
|
|
159
|
+
const preservedLegacyStatus = stringValue(metadata.legacyStatus);
|
|
160
|
+
const legacyStatus = preservedLegacyStatus || statusValue || "unknown";
|
|
161
|
+
const isTerminal = LEGACY_TERMINAL_STATUSES.has(legacyStatus);
|
|
162
|
+
const correlationKey = `legacy-runtime-retired:${runId}`;
|
|
163
|
+
if (readValue(run, "runtimeVersion") === "legacy-plan-v1" && metadata.legacyRuntimeRetired === true) continue;
|
|
164
|
+
await db.sequelize.transaction(async (transaction) => {
|
|
165
|
+
await runs.update({
|
|
166
|
+
filterByTk: runId,
|
|
167
|
+
values: {
|
|
168
|
+
runtimeVersion: "legacy-plan-v1",
|
|
169
|
+
recordMode: "legacy-plan",
|
|
170
|
+
...isTerminal ? {} : {
|
|
171
|
+
status: "blocked",
|
|
172
|
+
blockedReason: "The legacy plan runtime was retired. This historical run is read-only.",
|
|
173
|
+
lockedBy: null,
|
|
174
|
+
lockedUntil: null
|
|
175
|
+
},
|
|
176
|
+
metadata: {
|
|
177
|
+
...metadata,
|
|
178
|
+
legacyStatus,
|
|
179
|
+
legacyRuntimeRetired: true
|
|
180
|
+
}
|
|
181
|
+
},
|
|
182
|
+
transaction
|
|
183
|
+
});
|
|
184
|
+
await steps.update({
|
|
185
|
+
filter: { runId },
|
|
186
|
+
values: { runtimeVersion: "legacy-plan-v1" },
|
|
187
|
+
transaction
|
|
188
|
+
});
|
|
189
|
+
if (!isTerminal) {
|
|
190
|
+
const existingEvent = await events.findOne({
|
|
191
|
+
filter: { runId, type: "legacy_runtime_retired", correlationKey },
|
|
192
|
+
transaction
|
|
193
|
+
});
|
|
194
|
+
if (!existingEvent) {
|
|
195
|
+
await events.create({
|
|
196
|
+
values: {
|
|
197
|
+
runId,
|
|
198
|
+
type: "legacy_runtime_retired",
|
|
199
|
+
title: "Legacy runtime retired",
|
|
200
|
+
content: "The nonterminal plan-era run was blocked during the Loop Control Plane cutover.",
|
|
201
|
+
status: "blocked",
|
|
202
|
+
payload: { legacyStatus },
|
|
203
|
+
actorType: "system",
|
|
204
|
+
actorIdentity: "loop-control-plane-migration",
|
|
205
|
+
correlationKey,
|
|
206
|
+
createdAt: /* @__PURE__ */ new Date()
|
|
207
|
+
},
|
|
208
|
+
transaction
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
async function backfillSpanRunLinks(db) {
|
|
216
|
+
const spans = db.getRepository("agentExecutionSpans");
|
|
217
|
+
if (!spans) return;
|
|
218
|
+
for await (const span of iterateInBatches(spans)) {
|
|
219
|
+
if (positiveInteger(readValue(span, "agentLoopRunId"))) continue;
|
|
220
|
+
const runId = positiveInteger(asObject(readValue(span, "metadata")).agentLoopRunId);
|
|
221
|
+
const spanId = positiveInteger(readValue(span, "id"));
|
|
222
|
+
if (!runId || !spanId) continue;
|
|
223
|
+
await spans.update({
|
|
224
|
+
filterByTk: spanId,
|
|
225
|
+
values: { agentLoopRunId: runId }
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
async function ensureGlobalControl(db) {
|
|
230
|
+
const controls = db.getRepository("agentLoopControlSettings");
|
|
231
|
+
if (!controls) return;
|
|
232
|
+
const existing = await controls.findOne({ filter: { key: "global" } });
|
|
233
|
+
if (existing) return;
|
|
234
|
+
await controls.create({
|
|
235
|
+
values: {
|
|
236
|
+
key: "global",
|
|
237
|
+
acceptNewRuns: true,
|
|
238
|
+
state: "running",
|
|
239
|
+
globalMaxConcurrency: 5,
|
|
240
|
+
createdAt: /* @__PURE__ */ new Date(),
|
|
241
|
+
updatedAt: /* @__PURE__ */ new Date()
|
|
242
|
+
}
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
async function backfillLoopControlPlaneData(db) {
|
|
246
|
+
await backfillHarnessProfiles(db);
|
|
247
|
+
await backfillLegacyRuns(db);
|
|
248
|
+
await backfillSpanRunLinks(db);
|
|
249
|
+
await ensureGlobalControl(db);
|
|
250
|
+
}
|
|
251
|
+
class BackfillLoopControlPlaneData extends import_server.Migration {
|
|
252
|
+
on = "afterLoad";
|
|
253
|
+
appVersion = ">=0.1.0";
|
|
254
|
+
async up() {
|
|
255
|
+
await backfillLoopControlPlaneData(this.db);
|
|
256
|
+
await (0, import_ensure_indexes.ensureAgentOrchestratorIndexes)(this.db);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
260
|
+
0 && (module.exports = {
|
|
261
|
+
backfillLoopControlPlaneData
|
|
262
|
+
});
|