plugin-agent-orchestrator 1.1.5 → 1.1.7
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/client/index.js +1 -1
- package/dist/client-v2/index.js +1 -1
- package/dist/externalVersion.js +7 -7
- package/dist/server/collections/agent-loop-runs.js +6 -0
- package/dist/server/collections/skill-metrics.js +66 -0
- package/dist/server/plugin.js +91 -2
- package/dist/server/resources/agent-loop-events-stream.js +1 -0
- package/dist/server/resources/agent-loop.js +1 -1
- package/dist/server/services/DurableCircuitBreakerService.js +9 -12
- package/dist/server/services/ExecutionSpanService.js +8 -3
- package/dist/server/services/HarnessProfileService.js +23 -26
- package/dist/server/services/LoopBudgetService.js +36 -39
- package/dist/server/services/LoopControlService.js +8 -11
- package/dist/server/services/LoopPatternSchema.js +51 -17
- package/dist/server/services/LoopPatternService.js +31 -11
- package/dist/server/services/LoopRunRepository.js +2 -5
- package/dist/server/services/LoopRunStateMachine.js +31 -34
- package/dist/server/services/LoopSchedulerService.js +4 -7
- package/dist/server/services/LoopTriggerService.js +11 -6
- package/dist/server/services/LoopWorkerService.js +88 -22
- package/dist/server/services/PathLockService.js +19 -22
- package/dist/server/services/PluginAiRuntimeAdapter.js +51 -8
- package/dist/server/services/RunEventBus.js +14 -2
- package/dist/server/services/SkillAccessService.js +50 -1
- package/dist/server/services/TokenTracker.js +17 -1
- package/dist/server/services/ToolLoopDetectionService.js +14 -17
- package/dist/server/services/VerificationService.js +47 -16
- package/dist/server/services/harness-runtime-policy.js +7 -12
- package/dist/server/skill-hub/plugin.js +34 -27
- package/dist/server/utils/ha-lock.js +73 -0
- package/dist/server/utils/loop-pattern-context.js +42 -5
- package/dist/server/utils/record-utils.js +44 -0
- package/package.json +1 -1
- package/src/client/plugin.tsx +1 -1
- package/src/client-v2/plugin.tsx +14 -13
- package/src/server/__tests__/tool-loop-detection.test.ts +1 -0
- package/src/server/collections/agent-loop-runs.ts +7 -0
- package/src/server/collections/skill-metrics.ts +36 -0
- package/src/server/plugin.ts +117 -1
- package/src/server/resources/agent-loop-events-stream.ts +108 -105
- package/src/server/resources/agent-loop.ts +1 -1
- package/src/server/resources/tracing.ts +267 -266
- package/src/server/services/DurableCircuitBreakerService.ts +235 -239
- package/src/server/services/ExecutionSpanService.ts +37 -12
- package/src/server/services/HarnessProfileService.ts +1 -5
- package/src/server/services/LoopBudgetService.ts +271 -275
- package/src/server/services/LoopControlService.ts +120 -124
- package/src/server/services/LoopPatternSchema.ts +60 -14
- package/src/server/services/LoopPatternService.ts +171 -143
- package/src/server/services/LoopRunRepository.ts +1 -5
- package/src/server/services/LoopRunStateMachine.ts +1 -5
- package/src/server/services/LoopSchedulerService.ts +195 -199
- package/src/server/services/LoopTriggerService.ts +7 -5
- package/src/server/services/LoopWorkerService.ts +102 -12
- package/src/server/services/PathLockService.ts +317 -321
- package/src/server/services/PluginAiRuntimeAdapter.ts +59 -4
- package/src/server/services/RunEventBus.ts +13 -0
- package/src/server/services/SkillAccessService.ts +80 -5
- package/src/server/services/TokenTracker.ts +59 -7
- package/src/server/services/ToolLoopDetectionService.ts +8 -11
- package/src/server/services/VerificationSchema.ts +31 -31
- package/src/server/services/VerificationService.ts +60 -11
- package/src/server/services/harness-runtime-policy.ts +2 -9
- package/src/server/skill-hub/plugin.ts +36 -28
- package/src/server/types.ts +5 -39
- package/src/server/utils/ensure-indexes.ts +96 -96
- package/src/server/utils/ha-lock.ts +80 -0
- package/src/server/utils/loop-pattern-context.ts +84 -20
- package/src/server/utils/record-utils.ts +19 -0
|
@@ -1,143 +1,171 @@
|
|
|
1
|
-
import type { Database, Model } from '@nocobase/database';
|
|
2
|
-
import { compileHarness } from './HarnessCompiler';
|
|
3
|
-
import type { CompiledHarness, HarnessLayer } from './HarnessCompiler';
|
|
4
|
-
import { HarnessProfileService } from './HarnessProfileService';
|
|
5
|
-
import { parseLoopPattern } from './LoopPatternSchema';
|
|
6
|
-
import type { LoopPattern } from './LoopPatternSchema';
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return typeof
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
1
|
+
import type { Database, Model } from '@nocobase/database';
|
|
2
|
+
import { compileHarness } from './HarnessCompiler';
|
|
3
|
+
import type { CompiledHarness, HarnessLayer } from './HarnessCompiler';
|
|
4
|
+
import { HarnessProfileService } from './HarnessProfileService';
|
|
5
|
+
import { parseLoopPattern } from './LoopPatternSchema';
|
|
6
|
+
import type { LoopPattern } from './LoopPatternSchema';
|
|
7
|
+
import { read } from '../utils/record-utils';
|
|
8
|
+
|
|
9
|
+
export type WorktreeCapability = {
|
|
10
|
+
available: boolean;
|
|
11
|
+
provider?: string;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export type EmployeeHarnessResolver = (username: string) => Promise<unknown>;
|
|
15
|
+
|
|
16
|
+
export type HarnessSnapshot = {
|
|
17
|
+
tag: string;
|
|
18
|
+
versionId: number;
|
|
19
|
+
version: number;
|
|
20
|
+
schemaVersion: number;
|
|
21
|
+
effective: CompiledHarness;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export type CompiledPatternSnapshot = {
|
|
25
|
+
pattern: LoopPattern;
|
|
26
|
+
roleBindings: {
|
|
27
|
+
leader: string;
|
|
28
|
+
makers: string[];
|
|
29
|
+
verifier: string;
|
|
30
|
+
};
|
|
31
|
+
leaderHarness: HarnessSnapshot;
|
|
32
|
+
makerHarnesses: Record<string, HarnessSnapshot>;
|
|
33
|
+
verifierHarness: HarnessSnapshot;
|
|
34
|
+
policy: LoopPattern['policy'];
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
const platformHarness = {
|
|
38
|
+
tools: {},
|
|
39
|
+
memory: { maxChars: 20_000 },
|
|
40
|
+
delegation: { maxDepth: 8, maxCount: 100 },
|
|
41
|
+
limits: { timeoutMs: 3_600_000, recursionLimit: 100, maxTotalTokens: 1_000_000, maxCost: 1000 },
|
|
42
|
+
isolation: { networkAccess: 'allow' },
|
|
43
|
+
observability: { tracingRetentionDays: 3650 },
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
function toPlain(record: Model | Record<string, unknown>) {
|
|
47
|
+
return typeof (record as Model).toJSON === 'function'
|
|
48
|
+
? ((record as Model).toJSON() as Record<string, unknown>)
|
|
49
|
+
: (record as Record<string, unknown>);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export class LoopPatternService {
|
|
53
|
+
private readonly harnessProfiles: HarnessProfileService;
|
|
54
|
+
|
|
55
|
+
constructor(
|
|
56
|
+
private readonly database: Database,
|
|
57
|
+
private readonly resolveEmployeeHarness: EmployeeHarnessResolver,
|
|
58
|
+
private readonly worktreeCapability: () => Promise<WorktreeCapability>,
|
|
59
|
+
) {
|
|
60
|
+
this.harnessProfiles = new HarnessProfileService(database);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
async get(patternId: number) {
|
|
64
|
+
const record = await this.database.getRepository('agentLoopPatterns').findOne({ filterByTk: patternId });
|
|
65
|
+
if (!record) throw new Error(`Loop pattern ${patternId} was not found.`);
|
|
66
|
+
return { id: Number(read(record, 'id')), pattern: parseLoopPattern(toPlain(record)) };
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
async validate(value: unknown) {
|
|
70
|
+
const pattern = parseLoopPattern(value);
|
|
71
|
+
await this.assertCapabilities(pattern);
|
|
72
|
+
return pattern;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
async compile(patternId: number, perRunHarness?: unknown): Promise<CompiledPatternSnapshot> {
|
|
76
|
+
const { pattern } = await this.get(patternId);
|
|
77
|
+
if (!pattern.enabled) throw new Error(`Loop pattern ${pattern.key} is disabled.`);
|
|
78
|
+
await this.assertCapabilities(pattern);
|
|
79
|
+
|
|
80
|
+
const makerUsernames = pattern.makerUsernames.length ? pattern.makerUsernames : [pattern.leaderUsername];
|
|
81
|
+
// Cache harness profile lookups by tag to avoid redundant DB queries.
|
|
82
|
+
// All makers share the same makerHarnessTag, so this saves N-1 profile queries.
|
|
83
|
+
const profileCache = new Map<string, { id: number; version: number; schemaVersion: number; settings: unknown }>();
|
|
84
|
+
const [leaderHarness, verifierHarness, ...makerSnapshots] = await Promise.all([
|
|
85
|
+
this.compileRole(
|
|
86
|
+
pattern.leaderHarnessTag,
|
|
87
|
+
pattern.leaderUsername,
|
|
88
|
+
pattern.policy.harness,
|
|
89
|
+
perRunHarness,
|
|
90
|
+
profileCache,
|
|
91
|
+
),
|
|
92
|
+
this.compileRole(
|
|
93
|
+
pattern.verifierHarnessTag,
|
|
94
|
+
pattern.verifierUsername,
|
|
95
|
+
pattern.policy.harness,
|
|
96
|
+
perRunHarness,
|
|
97
|
+
profileCache,
|
|
98
|
+
),
|
|
99
|
+
// Every maker gets its own snapshot: employee-level harness overrides differ per username,
|
|
100
|
+
// so reusing the first maker's compilation would grant or deny the wrong tools.
|
|
101
|
+
...makerUsernames.map((username) =>
|
|
102
|
+
this.compileRole(pattern.makerHarnessTag, username, pattern.policy.harness, perRunHarness, profileCache),
|
|
103
|
+
),
|
|
104
|
+
]);
|
|
105
|
+
const makerHarnesses = Object.fromEntries(
|
|
106
|
+
makerUsernames.map((username, index) => [username, makerSnapshots[index]]),
|
|
107
|
+
);
|
|
108
|
+
|
|
109
|
+
return {
|
|
110
|
+
pattern,
|
|
111
|
+
roleBindings: {
|
|
112
|
+
leader: pattern.leaderUsername,
|
|
113
|
+
// The effective list, not the raw pattern array. A pattern with no makers falls back to the
|
|
114
|
+
// leader (line above), and `makerHarnesses` is keyed by that same list; returning the raw
|
|
115
|
+
// empty array here would make the worker iterate zero makers while the harness map holds one,
|
|
116
|
+
// so the execution phase would silently never run.
|
|
117
|
+
makers: [...makerUsernames],
|
|
118
|
+
verifier: pattern.verifierUsername,
|
|
119
|
+
},
|
|
120
|
+
leaderHarness,
|
|
121
|
+
makerHarnesses,
|
|
122
|
+
verifierHarness,
|
|
123
|
+
policy: structuredClone(pattern.policy),
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
private async compileRole(
|
|
128
|
+
tag: string,
|
|
129
|
+
username: string,
|
|
130
|
+
patternHarness: unknown,
|
|
131
|
+
perRunHarness?: unknown,
|
|
132
|
+
profileCache?: Map<string, { id: number; version: number; schemaVersion: number; settings: unknown }>,
|
|
133
|
+
) {
|
|
134
|
+
// Use cache to avoid redundant DB lookups when multiple roles share the same tag.
|
|
135
|
+
let published = profileCache?.get(tag);
|
|
136
|
+
if (!published) {
|
|
137
|
+
const fetched = await this.harnessProfiles.getPublishedByTag(tag);
|
|
138
|
+
if (!fetched) throw new Error(`Harness profile "${tag}" has no published version.`);
|
|
139
|
+
published = {
|
|
140
|
+
id: Number(fetched.id),
|
|
141
|
+
version: Number(fetched.version),
|
|
142
|
+
schemaVersion: Number(fetched.schemaVersion),
|
|
143
|
+
settings: fetched.settings,
|
|
144
|
+
};
|
|
145
|
+
profileCache?.set(tag, published);
|
|
146
|
+
}
|
|
147
|
+
const employeeHarness = await this.resolveEmployeeHarness(username);
|
|
148
|
+
const layers: HarnessLayer[] = [
|
|
149
|
+
{ source: 'platform', settings: platformHarness },
|
|
150
|
+
{ source: `profile:${tag}@${published.version}`, settings: published.settings },
|
|
151
|
+
{ source: 'pattern', settings: patternHarness },
|
|
152
|
+
];
|
|
153
|
+
if (employeeHarness) layers.push({ source: `employee:${username}`, settings: employeeHarness });
|
|
154
|
+
if (perRunHarness) layers.push({ source: 'run', settings: perRunHarness });
|
|
155
|
+
return {
|
|
156
|
+
tag,
|
|
157
|
+
versionId: published.id,
|
|
158
|
+
version: published.version,
|
|
159
|
+
schemaVersion: published.schemaVersion,
|
|
160
|
+
effective: compileHarness(layers),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
private async assertCapabilities(pattern: LoopPattern) {
|
|
165
|
+
if (pattern.autonomyLevel === 'L1') return;
|
|
166
|
+
const capability = await this.worktreeCapability();
|
|
167
|
+
if (!capability.available) {
|
|
168
|
+
throw new Error('L2 and L3 patterns require an available worktree provider.');
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Database, Model } from '@nocobase/database';
|
|
2
2
|
import { getRunEventBus } from './RunEventBus';
|
|
3
|
+
import { read } from '../utils/record-utils';
|
|
3
4
|
|
|
4
5
|
export type LoopRunRecord = Record<string, unknown>;
|
|
5
6
|
|
|
@@ -13,11 +14,6 @@ export class LoopRunAccessError extends Error {
|
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
|
|
16
|
-
function read(record: Model | LoopRunRecord, key: string) {
|
|
17
|
-
const model = record as Model & { get?: (name: string) => unknown };
|
|
18
|
-
return typeof model.get === 'function' ? model.get(key) : (record as LoopRunRecord)[key];
|
|
19
|
-
}
|
|
20
|
-
|
|
21
17
|
function plain(record: Model | LoopRunRecord): LoopRunRecord {
|
|
22
18
|
return typeof (record as Model).toJSON === 'function'
|
|
23
19
|
? ((record as Model).toJSON() as LoopRunRecord)
|
|
@@ -4,6 +4,7 @@ import { LoopControlService } from './LoopControlService';
|
|
|
4
4
|
import { loopPatternPolicySchema } from './LoopPatternSchema';
|
|
5
5
|
import { getRunEventBus } from './RunEventBus';
|
|
6
6
|
import { isPassingVerification } from './VerificationSchema';
|
|
7
|
+
import { read } from '../utils/record-utils';
|
|
7
8
|
|
|
8
9
|
export const loopRunStatuses = [
|
|
9
10
|
'queued',
|
|
@@ -83,11 +84,6 @@ export function assertRunTransition(input: TransitionInput) {
|
|
|
83
84
|
}
|
|
84
85
|
}
|
|
85
86
|
|
|
86
|
-
function read(record: Model | Record<string, unknown>, key: string) {
|
|
87
|
-
const model = record as Model & { get?: (name: string) => unknown };
|
|
88
|
-
return typeof model.get === 'function' ? model.get(key) : (record as Record<string, unknown>)[key];
|
|
89
|
-
}
|
|
90
|
-
|
|
91
87
|
function asStatus(value: unknown): LoopRunStatus {
|
|
92
88
|
if (typeof value === 'string' && (loopRunStatuses as readonly string[]).includes(value)) {
|
|
93
89
|
return value as LoopRunStatus;
|