evolcore 0.0.43-test.7 → 0.0.45
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/CHANGELOG.md +47 -0
- package/bin/ecmsg.js +22 -9
- package/dist/agent-template/jobs.js +62 -0
- package/dist/agent-template/runtime.js +214 -0
- package/dist/agent-template/service.js +465 -0
- package/dist/agent-template/tool-runner.js +45 -0
- package/dist/agent-template/types.js +5 -0
- package/dist/agents/claude-runner.js +1 -1
- package/dist/aun/aid/agentmd.js +56 -1
- package/dist/aun/aid/client.js +3 -1
- package/dist/aun/menu/client.js +3 -2
- package/dist/aun/msg/p2p.js +1 -1
- package/dist/channels/aun.js +47 -32
- package/dist/cli/agent-command.js +5 -0
- package/dist/cli/agent-create.js +5 -1
- package/dist/cli/agent-template.js +124 -0
- package/dist/cli/aun-commands.js +2 -2
- package/dist/cli/ctl-command.js +2 -1
- package/dist/cli/daemon-commands.js +5 -0
- package/dist/cli/ecmsg-gateway.js +2 -2
- package/dist/cli/events-command.js +45 -9
- package/dist/cli/index.js +29 -0
- package/dist/cli/net-check.js +1 -1
- package/dist/cli/restart-monitor.js +115 -36
- package/dist/cli/services-command.js +29 -3
- package/dist/cli/thread-command.js +97 -11
- package/dist/config/boot-log.js +8 -8
- package/dist/config/schema-migration.js +41 -16
- package/dist/core/agent-ipc-registration.js +25 -4
- package/dist/core/agent-runtime.js +2 -0
- package/dist/core/auth/operation-authorizer.js +2 -0
- package/dist/core/auth/operation-catalog.js +11 -2
- package/dist/core/channel-runtime.js +16 -9
- package/dist/core/command/agent-control.js +11 -1
- package/dist/core/command/agent-template-menu.js +147 -0
- package/dist/core/command/command-handler.js +27 -6
- package/dist/core/command/eventcenter-menu.js +158 -28
- package/dist/core/command/menu-catalog.js +8 -1
- package/dist/core/command/menu-handler.js +18 -6
- package/dist/core/command/menu-protocol.js +11 -2
- package/dist/core/daemon-control.js +14 -0
- package/dist/core/daemon-lifecycle.js +262 -189
- package/dist/core/handoff/runtime.js +42 -10
- package/dist/core/ipc-registration.js +5 -1
- package/dist/core/legacy-rename.js +41 -0
- package/dist/core/message/aun-ipc-sender.js +118 -13
- package/dist/core/message/im-renderer.js +88 -1
- package/dist/core/message/message-queue.js +66 -15
- package/dist/core/message/pending-hints.js +29 -5
- package/dist/core/message/response-engine.js +37 -7
- package/dist/core/message/send-routing.js +13 -6
- package/dist/core/pack-auth.js +94 -0
- package/dist/core/pack-install.js +194 -0
- package/dist/core/permission/ec-command-parser.js +49 -16
- package/dist/core/rate-window.js +48 -0
- package/dist/core/relation/peer-identity.js +28 -0
- package/dist/core/session/session-fs-store.js +66 -26
- package/dist/core/session/session-idle-monitor.js +59 -19
- package/dist/core/session/session-manager.js +13 -4
- package/dist/core/thread/thread-route.js +2 -2
- package/dist/core/thread/thread-service.js +52 -3
- package/dist/eck/kit-renderer.js +1 -1
- package/dist/eck/message-renderer.js +2 -0
- package/dist/event-center/admission-materializer.js +22 -12
- package/dist/event-center/bus-gate.js +20 -2
- package/dist/event-center/bus-host.js +46 -29
- package/dist/event-center/bus-resolver.js +1 -1
- package/dist/event-center/center-config.js +41 -14
- package/dist/event-center/daemon.js +1 -2
- package/dist/event-center/directory-source.js +3 -1
- package/dist/event-center/index-generator.js +12 -2
- package/dist/event-center/ipc-operation.js +140 -25
- package/dist/event-center/pack-loader.js +61 -56
- package/dist/event-center/pack-manager.js +2 -2
- package/dist/event-center/registry.js +242 -17
- package/dist/event-center/runtime.js +271 -75
- package/dist/event-center/types.js +20 -4
- package/dist/event-center/validation.js +34 -12
- package/dist/index.js +147 -44
- package/dist/ipc.js +44 -4
- package/dist/paths.js +2 -2
- package/dist/response-system/engines/v1/proactive-flow.js +4 -2
- package/dist/services/index.js +3 -3
- package/dist/services/ipc-operation.js +99 -7
- package/dist/services/pack-manager.js +17 -6
- package/dist/services/router.js +8 -5
- package/dist/services/validation.js +5 -5
- package/dist/trigger/scheduler.js +38 -0
- package/dist/trigger/script-sandbox.js +52 -2
- package/dist/utils/npm-ops.js +2 -1
- package/dist/utils/package-version-info.js +6 -3
- package/kits/docs/aun/ABILITY_CALLING.md +4 -3
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +3 -3
- package/kits/docs/evolcore/agent.md +22 -1
- package/kits/docs/evolcore/event-center.md +30 -10
- package/kits/docs/evolcore/fs.md +4 -3
- package/kits/docs/evolcore/menu-protocol.md +7 -1
- package/kits/docs/evolcore/msg.md +8 -8
- package/kits/docs/evolcore/response.md +2 -2
- package/kits/docs/evolcore/services.md +27 -10
- package/kits/docs/evolcore/thread-chain.md +15 -3
- package/kits/rules/06-channel.md +1 -0
- package/kits/skills/ability/references/calling.md +2 -2
- package/kits/skills/ec-group/SKILL.md +5 -8
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/channel.md +1 -1
- package/kits/templates/system-fragments/commands.md +1 -1
- package/kits/templates/system-fragments/reply.md +1 -0
- package/kits/templates/system-fragments/thread.md +3 -2
- package/package.json +4 -3
- package/scripts/agent-template/index.mjs +40 -0
- package/scripts/agent-template/inspect.mjs +240 -0
- package/scripts/agent-template/overlay.mjs +71 -0
- package/scripts/agent-template/pack.mjs +169 -0
- package/scripts/agent-template/shared/common.mjs +235 -0
- package/scripts/agent-template/shared/evolcore.mjs +75 -0
- package/scripts/agent-template/shared/plan.mjs +129 -0
- package/scripts/agent-template/shared/team-schema.json +70 -0
- package/scripts/agent-template/shared/template-contract.mjs +154 -0
- package/scripts/agent-template/shared/template-package.mjs +265 -0
- package/scripts/agent-template/shared/template-runtime.mjs +80 -0
- package/scripts/agent-template/shared/template.mjs +142 -0
- package/dist/event-center/client-factory.js +0 -50
|
@@ -4,11 +4,19 @@
|
|
|
4
4
|
* 设计:docs/event-center/detailed-design.md §八。
|
|
5
5
|
*/
|
|
6
6
|
import fs from 'node:fs';
|
|
7
|
+
import path from 'node:path';
|
|
7
8
|
import { atomicWriteJson } from '../../utils/atomic-write.js';
|
|
8
9
|
import { loadPacks } from '../../event-center/pack-loader.js';
|
|
9
10
|
import { validatePackJson } from '../../event-center/validation.js';
|
|
10
11
|
import { materializeAllowlist } from '../../event-center/admission-materializer.js';
|
|
11
|
-
|
|
12
|
+
import { EventLog } from '../../event-center/event-log.js';
|
|
13
|
+
const VIEWS = new Set(['center', 'rules', 'packs', 'register', 'subscribers', 'stats', 'publishStats', 'records']);
|
|
14
|
+
/** records 视图可接受的 event-log kind。 */
|
|
15
|
+
const RECORD_KINDS = new Set(['received', 'handled', 'dropped', 'filtered']);
|
|
16
|
+
/** records 视图单次最多返回条数;scan 上限防止大日志拖慢事件循环。 */
|
|
17
|
+
const RECORDS_DEFAULT_LIMIT = 50;
|
|
18
|
+
const RECORDS_MAX_LIMIT = 500;
|
|
19
|
+
const RECORDS_MAX_SCAN = 2000;
|
|
12
20
|
/** menu-protocol 校验:query view / update resource 白名单。 */
|
|
13
21
|
export function validateEventsMenuRequest(request) {
|
|
14
22
|
const type = String(request.type ?? '');
|
|
@@ -24,20 +32,39 @@ export function validateEventsMenuRequest(request) {
|
|
|
24
32
|
return { code: 'INVALID_ARGS', message: `events view must be one of ${[...VIEWS].join(', ')}` };
|
|
25
33
|
}
|
|
26
34
|
const allowed = view === 'center' ? new Set(['view'])
|
|
27
|
-
: view === '
|
|
35
|
+
: view === 'rules' ? new Set(['view', 'event'])
|
|
28
36
|
: view === 'register' ? new Set(['view', 'packId', 'event'])
|
|
29
|
-
: view === '
|
|
30
|
-
: view === '
|
|
31
|
-
: new Set(['view', '
|
|
37
|
+
: view === 'records' ? new Set(['view', 'packId', 'event', 'kind', 'limit', 'includeData'])
|
|
38
|
+
: view === 'subscribers' ? new Set(['view', 'event'])
|
|
39
|
+
: view === 'stats' ? new Set(['view', 'event'])
|
|
40
|
+
: view === 'publishStats' ? new Set(['view', 'packId', 'event'])
|
|
41
|
+
: new Set(['view', 'packId']);
|
|
32
42
|
const unknown = Object.keys(values).find(key => !allowed.has(key));
|
|
33
43
|
if (unknown)
|
|
34
44
|
return { code: 'INVALID_ARGS', message: `events ${String(view ?? 'packs')} does not accept args.${unknown}` };
|
|
35
|
-
if (['
|
|
45
|
+
if (['rules', 'register', 'subscribers', 'stats', 'publishStats'].includes(String(view)) && values.event !== undefined && typeof values.event !== 'string') {
|
|
36
46
|
return { code: 'INVALID_ARGS', message: 'events args.event must be a string' };
|
|
37
47
|
}
|
|
38
|
-
if (['register', 'packs'].includes(String(view)) && values.packId !== undefined && typeof values.packId !== 'string') {
|
|
48
|
+
if (['register', 'packs', 'publishStats'].includes(String(view)) && values.packId !== undefined && typeof values.packId !== 'string') {
|
|
39
49
|
return { code: 'INVALID_ARGS', message: 'events args.packId must be a string' };
|
|
40
50
|
}
|
|
51
|
+
if (view === 'records') {
|
|
52
|
+
if (values.packId !== undefined && (typeof values.packId !== 'string' || !values.packId.trim())) {
|
|
53
|
+
return { code: 'INVALID_ARGS', message: 'events records args.packId must be a non-empty string' };
|
|
54
|
+
}
|
|
55
|
+
if (values.event !== undefined && (typeof values.event !== 'string' || !values.event.trim())) {
|
|
56
|
+
return { code: 'INVALID_ARGS', message: 'events records args.event must be a non-empty string' };
|
|
57
|
+
}
|
|
58
|
+
if (values.kind !== undefined && !RECORD_KINDS.has(String(values.kind))) {
|
|
59
|
+
return { code: 'INVALID_ARGS', message: `events records args.kind must be one of ${[...RECORD_KINDS].join(', ')}` };
|
|
60
|
+
}
|
|
61
|
+
if (values.limit !== undefined && (!Number.isInteger(values.limit) || Number(values.limit) < 1 || Number(values.limit) > RECORDS_MAX_LIMIT)) {
|
|
62
|
+
return { code: 'INVALID_ARGS', message: `events records args.limit must be an integer in [1, ${RECORDS_MAX_LIMIT}]` };
|
|
63
|
+
}
|
|
64
|
+
if (values.includeData !== undefined && typeof values.includeData !== 'boolean') {
|
|
65
|
+
return { code: 'INVALID_ARGS', message: 'events records args.includeData must be a boolean' };
|
|
66
|
+
}
|
|
67
|
+
}
|
|
41
68
|
return undefined;
|
|
42
69
|
}
|
|
43
70
|
if (type === 'menu.update') {
|
|
@@ -60,11 +87,11 @@ export function validateEventsMenuRequest(request) {
|
|
|
60
87
|
else if (rawValue !== undefined && typeof rawValue !== 'boolean') {
|
|
61
88
|
return { code: 'INVALID_ARGS', message: 'events center value must be a boolean' };
|
|
62
89
|
}
|
|
63
|
-
if (!['center', '
|
|
64
|
-
return { code: 'INVALID_ARGS', message: 'events update resource must be "center", "
|
|
90
|
+
if (!['center', 'rules', 'register'].includes(String(resource))) {
|
|
91
|
+
return { code: 'INVALID_ARGS', message: 'events update resource must be "center", "rules" or "register"' };
|
|
65
92
|
}
|
|
66
93
|
const allowed = resource === 'center' ? new Set(['resource', 'enabled', 'admission'])
|
|
67
|
-
: resource === '
|
|
94
|
+
: resource === 'rules' ? new Set(['resource', 'event', 'rule', 'action', 'role', 'aids'])
|
|
68
95
|
: new Set(['resource', 'packId', 'event', 'action', 'description', 'ttl', 'maxTtl', 'schemaVersion', 'contentSchema']);
|
|
69
96
|
const unknown = Object.keys(updateValues).find(key => !allowed.has(key));
|
|
70
97
|
if (unknown)
|
|
@@ -88,11 +115,11 @@ export function validateEventsMenuRequest(request) {
|
|
|
88
115
|
return { code: 'INVALID_ARGS', message: 'events center update requires args.enabled, args.admission or a boolean value' };
|
|
89
116
|
}
|
|
90
117
|
}
|
|
91
|
-
if (resource === '
|
|
118
|
+
if (resource === 'rules') {
|
|
92
119
|
if (typeof updateValues.event !== 'string' || !updateValues.event.trim())
|
|
93
|
-
return { code: 'INVALID_ARGS', message: '
|
|
120
|
+
return { code: 'INVALID_ARGS', message: 'rules update requires args.event' };
|
|
94
121
|
if (!['allow', 'deny'].includes(String(updateValues.rule ?? 'allow')) || !['add', 'remove'].includes(String(updateValues.action)) || !['publish', 'subscribe'].includes(String(updateValues.role)) || !Array.isArray(updateValues.aids) || updateValues.aids.some(item => typeof item !== 'string')) {
|
|
95
|
-
return { code: 'INVALID_ARGS', message: '
|
|
122
|
+
return { code: 'INVALID_ARGS', message: 'rules update requires rule/action/role/aids' };
|
|
96
123
|
}
|
|
97
124
|
}
|
|
98
125
|
if (resource === 'register') {
|
|
@@ -124,24 +151,26 @@ export async function executeEventsQuery(context, args = {}) {
|
|
|
124
151
|
throw unit;
|
|
125
152
|
const view = String(args.view ?? 'packs');
|
|
126
153
|
if (view === 'center') {
|
|
127
|
-
const { config, exists } = unit.centerStore.read();
|
|
154
|
+
const { config, exists, errors: configErrors } = unit.centerStore.read();
|
|
128
155
|
return {
|
|
129
156
|
enabled: config.enabled,
|
|
130
157
|
authMode: config.authMode,
|
|
131
158
|
admission: config.admission,
|
|
132
159
|
configured: exists,
|
|
160
|
+
// 配置非法时上面几个字段来自缺省值。前端必须能区分"没配置"和"配置坏了"。
|
|
161
|
+
...(configErrors.length > 0 ? { configErrors } : {}),
|
|
133
162
|
eventCount: unit.state.catalog.length,
|
|
134
163
|
bus: unit.runtime.busHost.status,
|
|
135
164
|
gateInstalled: unit.runtime.busHost.gateInstalled,
|
|
136
165
|
};
|
|
137
166
|
}
|
|
138
|
-
if (view === '
|
|
167
|
+
if (view === 'rules') {
|
|
139
168
|
const { config } = unit.centerStore.read();
|
|
140
169
|
const event = typeof args.event === 'string' ? args.event : undefined;
|
|
141
|
-
const
|
|
142
|
-
? { [event]: config.
|
|
143
|
-
: config.
|
|
144
|
-
return {
|
|
170
|
+
const rules = event
|
|
171
|
+
? { [event]: config.rules[event] ?? { allow: { publish: [], subscribe: [] }, deny: { publish: [], subscribe: [] } } }
|
|
172
|
+
: config.rules;
|
|
173
|
+
return { rules };
|
|
145
174
|
}
|
|
146
175
|
if (view === 'register') {
|
|
147
176
|
const packId = typeof args.packId === 'string' ? args.packId : undefined;
|
|
@@ -184,6 +213,61 @@ export async function executeEventsQuery(context, args = {}) {
|
|
|
184
213
|
events,
|
|
185
214
|
};
|
|
186
215
|
}
|
|
216
|
+
if (view === 'publishStats') {
|
|
217
|
+
// Bus 侧发布统计按事件包分组:register[] 决定事件属于哪个包(即该事件在本 Bus 目录上的归属)。
|
|
218
|
+
const packId = typeof args.packId === 'string' ? args.packId.trim() : undefined;
|
|
219
|
+
const eventName = typeof args.event === 'string' ? args.event : undefined;
|
|
220
|
+
const packs = packId
|
|
221
|
+
? unit.state.enabledPacks.filter(pack => pack.id === packId)
|
|
222
|
+
: unit.state.enabledPacks;
|
|
223
|
+
if (packId && packs.length === 0) {
|
|
224
|
+
throw { code: 'PACK_NOT_FOUND', message: `pack not found or invalid: ${packId}` };
|
|
225
|
+
}
|
|
226
|
+
const status = unit.runtime.status();
|
|
227
|
+
const aggregate = await unit.runtime.busHost.stats({});
|
|
228
|
+
const packStats = await Promise.all(packs.map(async (pack) => {
|
|
229
|
+
const entries = pack.register.filter(entry => !eventName || entry.event === eventName);
|
|
230
|
+
const events = await Promise.all(entries.map(async (entry) => eventStats(entry.event, await unit.runtime.busHost.stats({ event_name: entry.event }))));
|
|
231
|
+
return { packId: pack.id, events, totals: sumStatsCounts(events) };
|
|
232
|
+
}));
|
|
233
|
+
return {
|
|
234
|
+
bus: { ...status.bus, since: numberOrUndefined(aggregate?.since), asOf: numberOrUndefined(aggregate?.as_of) },
|
|
235
|
+
packs: packStats,
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
if (view === 'records') {
|
|
239
|
+
const packId = typeof args.packId === 'string' ? args.packId.trim() : undefined;
|
|
240
|
+
const eventName = typeof args.event === 'string' ? args.event : undefined;
|
|
241
|
+
const kind = typeof args.kind === 'string' ? args.kind : undefined;
|
|
242
|
+
const requestedLimit = typeof args.limit === 'number' && Number.isInteger(args.limit) ? args.limit : RECORDS_DEFAULT_LIMIT;
|
|
243
|
+
const limit = Math.min(RECORDS_MAX_LIMIT, Math.max(1, requestedLimit));
|
|
244
|
+
const includeData = args.includeData === true;
|
|
245
|
+
const packs = packId
|
|
246
|
+
? unit.state.enabledPacks.filter(pack => pack.id === packId)
|
|
247
|
+
: unit.state.enabledPacks;
|
|
248
|
+
if (packId && packs.length === 0) {
|
|
249
|
+
throw { code: 'PACK_NOT_FOUND', message: `pack not found or invalid: ${packId}` };
|
|
250
|
+
}
|
|
251
|
+
// 每个包最多扫 scan 行;packId 省略时合并所有 enabled 包再按 ts 取最后 limit 条。
|
|
252
|
+
const scan = Math.min(RECORDS_MAX_SCAN, Math.max(limit * 5, 200));
|
|
253
|
+
const perPack = packs.map(pack => ({ packId: pack.id, lines: EventLog.forPack(pack).tail(scan) }));
|
|
254
|
+
const scanned = perPack.reduce((total, item) => total + item.lines.length, 0);
|
|
255
|
+
const matched = perPack
|
|
256
|
+
.flatMap(item => item.lines.map(line => ({ packId: item.packId, ...line })))
|
|
257
|
+
.filter(record => (!eventName || record.event === eventName) && (!kind || record.kind === kind))
|
|
258
|
+
.sort((left, right) => left.ts - right.ts);
|
|
259
|
+
const records = matched.slice(-limit).map(record => {
|
|
260
|
+
if (includeData || record.kind !== 'received')
|
|
261
|
+
return record;
|
|
262
|
+
const { data: _data, ...rest } = record;
|
|
263
|
+
return rest;
|
|
264
|
+
});
|
|
265
|
+
return {
|
|
266
|
+
records,
|
|
267
|
+
scanned,
|
|
268
|
+
truncated: matched.length > limit || perPack.some(item => item.lines.length >= scan),
|
|
269
|
+
};
|
|
270
|
+
}
|
|
187
271
|
// packs
|
|
188
272
|
const resolution = unit.runtime.resolutions;
|
|
189
273
|
return {
|
|
@@ -208,7 +292,8 @@ export async function executeEventsUpdate(context, args = {}) {
|
|
|
208
292
|
throw unit;
|
|
209
293
|
const resource = String(args.resource ?? '');
|
|
210
294
|
if (resource === 'center') {
|
|
211
|
-
|
|
295
|
+
// 严格读:配置非法时拒绝写回,避免用缺省值覆盖磁盘上的原配置。
|
|
296
|
+
const config = unit.centerStore.readStrict();
|
|
212
297
|
if (args.enabled !== undefined && typeof args.enabled !== 'boolean') {
|
|
213
298
|
throw { code: 'INVALID_ARGS', message: 'events center update requires args.enabled (boolean)' };
|
|
214
299
|
}
|
|
@@ -234,14 +319,14 @@ export async function executeEventsUpdate(context, args = {}) {
|
|
|
234
319
|
await unit.runtime.updateCenter(next, materialized);
|
|
235
320
|
return { enabled: next.enabled, bus: unit.runtime.busHost.status, degraded: materialized.degraded, ...(materialized.reason ? { reason: materialized.reason } : {}) };
|
|
236
321
|
}
|
|
237
|
-
if (resource === '
|
|
322
|
+
if (resource === 'rules') {
|
|
238
323
|
const event = typeof args.event === 'string' ? args.event : '';
|
|
239
324
|
const action = args.action === 'remove' ? 'remove' : args.action === 'add' ? 'add' : undefined;
|
|
240
325
|
const role = args.role === 'subscribe' ? 'subscribe' : args.role === 'publish' ? 'publish' : undefined;
|
|
241
326
|
const rule = args.rule === 'deny' ? 'deny' : args.rule === 'allow' || args.rule === undefined ? 'allow' : undefined;
|
|
242
327
|
const aids = Array.isArray(args.aids) && args.aids.every(item => typeof item === 'string') ? args.aids : undefined;
|
|
243
328
|
if (!event || !action || !role || !rule || !aids) {
|
|
244
|
-
throw { code: 'INVALID_ARGS', message: 'events
|
|
329
|
+
throw { code: 'INVALID_ARGS', message: 'events rules update requires event/rule(allow|deny)/action(add|remove)/role(publish|subscribe)/aids[]' };
|
|
245
330
|
}
|
|
246
331
|
if (!unit.state.catalog.some(entry => entry.event === event)) {
|
|
247
332
|
throw { code: 'EVENT_NOT_FOUND', message: `event is not registered: ${event}` };
|
|
@@ -254,7 +339,33 @@ export async function executeEventsUpdate(context, args = {}) {
|
|
|
254
339
|
if (resource === 'register') {
|
|
255
340
|
return await updateEventRegistration(context, unit, args);
|
|
256
341
|
}
|
|
257
|
-
throw { code: 'INVALID_ARGS', message: 'events update resource must be "center", "
|
|
342
|
+
throw { code: 'INVALID_ARGS', message: 'events update resource must be "center", "rules" or "register"' };
|
|
343
|
+
}
|
|
344
|
+
/** register add 自动建包时 packId(= 目录名)的约束:小写字母/数字开头,仅小写字母/数字/短横线。 */
|
|
345
|
+
const PACK_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
|
|
346
|
+
/** SDK 总线目录的 TTL 硬上限(秒)。菜单协议侧超过上限的值不报错,强行钳到 3600。 */
|
|
347
|
+
const TTL_CEILING = 3600;
|
|
348
|
+
/** 菜单协议边界钳制 TTL:数字越界取 [1, 3600],非数字原样透传交由 pack schema 校验报错。 */
|
|
349
|
+
function clampTtl(value) {
|
|
350
|
+
if (typeof value !== 'number' || !Number.isFinite(value))
|
|
351
|
+
return value;
|
|
352
|
+
return Math.min(TTL_CEILING, Math.max(1, Math.round(value)));
|
|
353
|
+
}
|
|
354
|
+
/**
|
|
355
|
+
* register add 遇到不存在的包时自动建包:owner 在客户端注册事件即创建 pack.json。
|
|
356
|
+
* 目录名即 packId(pack-loader 以目录名作为包 id),最小 pack.json 只含空 register[];
|
|
357
|
+
* 纯 register 包不需要 scripts/ 目录。已存在同名目录(含 invalid 包)不覆盖,维持 PACK_NOT_FOUND。
|
|
358
|
+
*/
|
|
359
|
+
function createPack(eventsDir, packId) {
|
|
360
|
+
if (!PACK_ID_PATTERN.test(packId)) {
|
|
361
|
+
throw { code: 'INVALID_ARGS', message: `packId must match /^[a-z0-9][a-z0-9-]{0,63}$/ when creating a new pack: ${packId}` };
|
|
362
|
+
}
|
|
363
|
+
const packDir = path.join(eventsDir, packId);
|
|
364
|
+
if (fs.existsSync(packDir)) {
|
|
365
|
+
throw { code: 'PACK_NOT_FOUND', message: `pack not found or invalid: ${packId}` };
|
|
366
|
+
}
|
|
367
|
+
fs.mkdirSync(packDir, { recursive: true });
|
|
368
|
+
atomicWriteJson(path.join(packDir, 'pack.json'), { v: 1, name: packId, register: [] });
|
|
258
369
|
}
|
|
259
370
|
async function updateEventRegistration(context, unit, args) {
|
|
260
371
|
if (!context.registry)
|
|
@@ -265,9 +376,16 @@ async function updateEventRegistration(context, unit, args) {
|
|
|
265
376
|
if (!packId || !action || !event) {
|
|
266
377
|
throw { code: 'INVALID_ARGS', message: 'events register update requires packId/event/action(add|update|remove)' };
|
|
267
378
|
}
|
|
268
|
-
|
|
269
|
-
if (!loaded)
|
|
270
|
-
|
|
379
|
+
let loaded = loadPacks(unit.eventsDir).valid.find(pack => pack.id === packId);
|
|
380
|
+
if (!loaded) {
|
|
381
|
+
// add 自动建包;update/remove 仍要求包已存在。
|
|
382
|
+
if (action !== 'add')
|
|
383
|
+
throw { code: 'PACK_NOT_FOUND', message: `pack not found or invalid: ${packId}` };
|
|
384
|
+
createPack(unit.eventsDir, packId);
|
|
385
|
+
loaded = loadPacks(unit.eventsDir).valid.find(pack => pack.id === packId);
|
|
386
|
+
if (!loaded)
|
|
387
|
+
throw { code: 'PACK_INVALID', message: `pack created but not loadable: ${packId}` };
|
|
388
|
+
}
|
|
271
389
|
let raw;
|
|
272
390
|
try {
|
|
273
391
|
raw = JSON.parse(fs.readFileSync(loaded.paths.packJson, 'utf8'));
|
|
@@ -294,8 +412,8 @@ async function updateEventRegistration(context, unit, args) {
|
|
|
294
412
|
...(index >= 0 ? current[index] : {}),
|
|
295
413
|
event,
|
|
296
414
|
...(args.description !== undefined ? { description: args.description } : {}),
|
|
297
|
-
...(args.ttl !== undefined ? { ttl: args.ttl } : {}),
|
|
298
|
-
...(args.maxTtl !== undefined ? { maxTtl: args.maxTtl } : {}),
|
|
415
|
+
...(args.ttl !== undefined ? { ttl: clampTtl(args.ttl) } : {}),
|
|
416
|
+
...(args.maxTtl !== undefined ? { maxTtl: clampTtl(args.maxTtl) } : {}),
|
|
299
417
|
...(args.schemaVersion !== undefined ? { schemaVersion: args.schemaVersion } : {}),
|
|
300
418
|
...(args.contentSchema !== undefined ? { contentSchema: args.contentSchema } : {}),
|
|
301
419
|
};
|
|
@@ -336,3 +454,15 @@ function eventStats(event, stats) {
|
|
|
336
454
|
const counts = mapStatsCounts(stats?.counts) ?? {};
|
|
337
455
|
return { event, ...counts };
|
|
338
456
|
}
|
|
457
|
+
/** 按事件包聚合:对包内各事件的数值计数求和;SDK 未返回的项不补造。 */
|
|
458
|
+
function sumStatsCounts(events) {
|
|
459
|
+
const totals = {};
|
|
460
|
+
for (const entry of events) {
|
|
461
|
+
for (const [key, value] of Object.entries(entry)) {
|
|
462
|
+
if (key === 'event' || typeof value !== 'number' || !Number.isFinite(value))
|
|
463
|
+
continue;
|
|
464
|
+
totals[key] = (totals[key] ?? 0) + value;
|
|
465
|
+
}
|
|
466
|
+
}
|
|
467
|
+
return totals;
|
|
468
|
+
}
|
|
@@ -123,9 +123,11 @@ const ENTRIES = [
|
|
|
123
123
|
content: { type: 'string' }, expectedEtag: { type: 'string' }, expectedRelationVersion: { type: 'integer', minimum: 1 },
|
|
124
124
|
} }, control: 'markdown-editor' },
|
|
125
125
|
{ id: 'event.center', type: 'setting', contexts: ['agent'], name: 'events', label: '事件中心', section: 'agent', order: 80, query: { cmd: '/events', args: { view: 'center' }, operation: 'event.center.current', scope: 'agent' }, update: { cmd: '/events', args: { resource: 'center' }, operation: 'event.center.update', scope: 'agent' }, valueSchema: { type: 'boolean' }, control: 'toggle' },
|
|
126
|
-
{ id: 'event.
|
|
126
|
+
{ id: 'event.rules', type: 'setting', contexts: ['agent'], name: 'events', label: '事件规则', section: 'agent', order: 81, query: { cmd: '/events', args: { view: 'rules' }, operation: 'event.rules.current', scope: 'agent' }, update: { cmd: '/events', args: { resource: 'rules' }, operation: 'event.rules.update', scope: 'agent' }, valueSchema: { type: 'object' }, control: 'json' },
|
|
127
127
|
{ id: 'event.packs', type: 'list', contexts: ['agent'], name: 'events', label: '事件包', section: 'agent', order: 82, query: { cmd: '/events', args: { view: 'packs' }, operation: 'event.packs.list', scope: 'agent' }, control: 'list' },
|
|
128
128
|
{ id: 'event.stats', type: 'list', contexts: ['agent'], name: 'events', label: '事件统计', section: 'agent', order: 83, query: { cmd: '/events', args: { view: 'stats' }, operation: 'event.stats.current', scope: 'agent' }, control: 'list' },
|
|
129
|
+
{ id: 'event.publishStats', type: 'list', contexts: ['agent'], name: 'events', label: '事件发布统计', section: 'agent', order: 83.5, query: { cmd: '/events', args: { view: 'publishStats' }, operation: 'event.publishStats.current', scope: 'agent' }, control: 'list' },
|
|
130
|
+
{ id: 'event.records', type: 'list', contexts: ['agent'], name: 'events', label: '事件分发记录', section: 'agent', order: 84, query: { cmd: '/events', args: { view: 'records' }, operation: 'event.records.list', scope: 'agent' }, control: 'list' },
|
|
129
131
|
{ id: 'baseagents.inventory', type: 'list', contexts: ['process'], name: 'baseagents', label: 'Base Agent 清单', section: 'process', order: 9, query: { cmd: '/baseagents', operation: 'system.status', scope: 'process' }, control: 'list' },
|
|
130
132
|
{ id: 'system.status', type: 'list', contexts: ['process'], name: 'system', label: '系统状态', section: 'process', order: 10, query: { cmd: '/system', operation: 'system.status', scope: 'process' }, control: 'list' },
|
|
131
133
|
{ id: 'system.monitor', type: 'list', contexts: ['process'], name: 'system', label: '运行监控快照', section: 'process', order: 11, query: { cmd: '/system', args: { view: 'monitor' }, operation: 'system.status', scope: 'process' }, control: 'list' },
|
|
@@ -140,6 +142,11 @@ const ENTRIES = [
|
|
|
140
142
|
{ id: 'agent.create', type: 'action', contexts: ['process'], name: 'agent', label: '创建 Agent', section: 'process', order: 50, action: { cmd: '/agent', action: 'create', operation: 'agent.create', scope: 'control' } },
|
|
141
143
|
{ id: 'agent.initialize', type: 'action', contexts: ['process'], name: 'agent', label: '初始化 Agent', section: 'process', order: 55, action: { cmd: '/agent', action: 'initialize', operation: 'agent.initialize', scope: 'control' } },
|
|
142
144
|
{ id: 'agent.reload', type: 'action', contexts: ['process'], name: 'agent', label: '重载 Agent', section: 'process', order: 60, action: { cmd: '/agent', action: 'reload', operation: 'agent.reload', scope: 'control' } },
|
|
145
|
+
...['inspect', 'build', 'push', 'pull', 'deploy'].map((action, index) => ({
|
|
146
|
+
id: 'agent.template.' + action, type: 'action', contexts: ['process'], name: 'agent',
|
|
147
|
+
label: 'Agent 模板 ' + action, section: 'process', order: 65 + index,
|
|
148
|
+
action: { cmd: '/agent', action, operation: 'agent.template.' + action, scope: 'process' },
|
|
149
|
+
})),
|
|
143
150
|
{ id: 'agent.delete', type: 'action', contexts: ['process'], name: 'agent', label: '删除 Agent', section: 'process', order: 70, action: { cmd: '/agent', action: 'delete', operation: 'agent.delete', scope: 'control' } },
|
|
144
151
|
];
|
|
145
152
|
function stable(value) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { memoryHelpEntries } from './memory-slash.js';
|
|
2
2
|
import { executeProviderMenu } from './provider-menu.js';
|
|
3
|
+
import { executeTemplateMenu, executeProviderModelCatalog } from './agent-template-menu.js';
|
|
3
4
|
import { getBaseagentSnapshot, loadedBaseagentIds } from '../../agents/baseagent-availability.js';
|
|
4
5
|
import { resolveBaseagentModelSelection } from '../../agents/baseagent.js';
|
|
5
6
|
import { normalizePeer, writeAgentModelConfig } from '../model/config-scope.js';
|
|
@@ -1930,8 +1931,8 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
|
|
|
1930
1931
|
if (!selfAid)
|
|
1931
1932
|
throw { code: 'FORBIDDEN', message: '当前 channel 无绑定 agent' };
|
|
1932
1933
|
const res = this.agentApplicationService
|
|
1933
|
-
? await execAgentQuery({ aid: selfAid }, this.agentApplicationService, agentFullAccessMenuSubject(subject, source))
|
|
1934
|
-
: await execAgentQuery({ aid: selfAid }, undefined, agentFullAccessMenuSubject(subject, source));
|
|
1934
|
+
? await execAgentQuery({ aid: selfAid }, this.agentApplicationService, agentFullAccessMenuSubject(subject, source), this.messageQueue)
|
|
1935
|
+
: await execAgentQuery({ aid: selfAid }, undefined, agentFullAccessMenuSubject(subject, source), this.messageQueue);
|
|
1935
1936
|
if ('error' in res)
|
|
1936
1937
|
throw { code: res.code, message: res.error };
|
|
1937
1938
|
const ag = res.data;
|
|
@@ -2262,6 +2263,12 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
|
|
|
2262
2263
|
const cmdBase = cmd.trim().split(' ')[0];
|
|
2263
2264
|
if (!cmdBase)
|
|
2264
2265
|
return { error: '缺少命令', code: 'MISSING_CMD' };
|
|
2266
|
+
if (cmdBase === '/agent' && args?.view === 'template-job') {
|
|
2267
|
+
return executeTemplateMenu({ name: 'agent', type: 'menu.query', args }, fromControlChannel ? authSubject : undefined, source);
|
|
2268
|
+
}
|
|
2269
|
+
if (cmdBase === '/model' && args?.scope === 'process' && args?.view === 'catalog') {
|
|
2270
|
+
return executeProviderModelCatalog({ name: 'model', type: 'menu.query', args }, fromControlChannel ? authSubject : undefined, source);
|
|
2271
|
+
}
|
|
2265
2272
|
if (cmdBase === '/provider') {
|
|
2266
2273
|
return executeProviderMenu({ name: 'provider', cmd, type: 'menu.query', args }, fromControlChannel ? authSubject : undefined, source);
|
|
2267
2274
|
}
|
|
@@ -2729,8 +2736,8 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
|
|
|
2729
2736
|
if (fromControlChannel) {
|
|
2730
2737
|
if (args?.aid) {
|
|
2731
2738
|
return this.agentApplicationService
|
|
2732
|
-
? await execAgentQuery(args, this.agentApplicationService, agentFullAccessMenuSubject(subject, source))
|
|
2733
|
-
: await execAgentQuery(args, undefined, agentFullAccessMenuSubject(subject, source));
|
|
2739
|
+
? await execAgentQuery(args, this.agentApplicationService, agentFullAccessMenuSubject(subject, source), this.messageQueue)
|
|
2740
|
+
: await execAgentQuery(args, undefined, agentFullAccessMenuSubject(subject, source), this.messageQueue);
|
|
2734
2741
|
}
|
|
2735
2742
|
return this.agentApplicationService
|
|
2736
2743
|
? await execAgentOptions(args, this.agentApplicationService)
|
|
@@ -2740,8 +2747,8 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
|
|
|
2740
2747
|
if (!selfAid)
|
|
2741
2748
|
return { error: '当前 channel 无绑定 agent', code: 'FORBIDDEN' };
|
|
2742
2749
|
return this.agentApplicationService
|
|
2743
|
-
? await execAgentQuery({ ...(args ?? {}), aid: selfAid }, this.agentApplicationService, agentFullAccessMenuSubject(subject, source))
|
|
2744
|
-
: await execAgentQuery({ ...(args ?? {}), aid: selfAid }, undefined, agentFullAccessMenuSubject(subject, source));
|
|
2750
|
+
? await execAgentQuery({ ...(args ?? {}), aid: selfAid }, this.agentApplicationService, agentFullAccessMenuSubject(subject, source), this.messageQueue)
|
|
2751
|
+
: await execAgentQuery({ ...(args ?? {}), aid: selfAid }, undefined, agentFullAccessMenuSubject(subject, source), this.messageQueue);
|
|
2745
2752
|
}
|
|
2746
2753
|
// ── /gateway 查询(只读,列出全部作用域的网关配置;apiKey 已掩码) ──
|
|
2747
2754
|
if (cmdBase === '/gateway') {
|
|
@@ -3902,6 +3909,9 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
|
|
|
3902
3909
|
const cmdBase = cmd.trim().split(' ')[0];
|
|
3903
3910
|
if (!cmdBase)
|
|
3904
3911
|
return { error: '缺少命令', code: 'MISSING_CMD' };
|
|
3912
|
+
if (cmdBase === '/agent' && ['inspect', 'build', 'push', 'pull', 'deploy'].includes(action)) {
|
|
3913
|
+
return executeTemplateMenu({ name: 'agent', type: 'menu.action', id: requestId, action, args }, fromControlChannel ? authSubject : undefined, source);
|
|
3914
|
+
}
|
|
3905
3915
|
if (cmdBase === '/provider') {
|
|
3906
3916
|
return executeProviderMenu({ name: 'provider', cmd, type: 'menu.action', args, action }, fromControlChannel ? authSubject : undefined, source);
|
|
3907
3917
|
}
|
|
@@ -5532,6 +5542,8 @@ function isProcessLevelMenu(name, cmd) {
|
|
|
5532
5542
|
|| cmdToken === '/system' || cmdToken === '/agent' || cmdToken === '/gateway' || cmdToken === '/config' || cmdToken === '/baseagent-models' || cmdToken === '/baseagents';
|
|
5533
5543
|
}
|
|
5534
5544
|
function isProcessContextMenu(payload) {
|
|
5545
|
+
if ((payload?.name === 'model' || payload?.cmd === '/model') && payload?.args?.scope === 'process' && payload?.args?.view === 'catalog')
|
|
5546
|
+
return true;
|
|
5535
5547
|
const isCatalog = payload?.type === 'menu.list' && payload?.args?.view === 'catalog';
|
|
5536
5548
|
const isValueBatch = payload?.type === 'menu.query'
|
|
5537
5549
|
&& payload?.name === 'menu'
|
|
@@ -7,6 +7,7 @@ import { logger } from '../../utils/logger.js';
|
|
|
7
7
|
import { validateIdleSeconds } from '../session/session-idle-monitor.js';
|
|
8
8
|
import { parseFileSearchArgs } from './file-search.js';
|
|
9
9
|
import { validateProviderMenuRequest } from '../../config/provider-menu-request.js';
|
|
10
|
+
import { isTemplateRequest, validateTemplateRequest } from './agent-template-menu.js';
|
|
10
11
|
import { validateTeamWorkspaceItemsArgs } from './team-workspace-items.js';
|
|
11
12
|
import { isTeamMembersMenuRequest, validateTeamMembersMenuRequest } from './team-workspace-members-menu.js';
|
|
12
13
|
import { validateAgentMdMenuRequest } from './agentmd-menu-request.js';
|
|
@@ -75,14 +76,20 @@ export function parseMenuEvent(value) {
|
|
|
75
76
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
76
77
|
throw Object.assign(new Error('Menu event must be an object'), { code: 'INVALID_EVENT' });
|
|
77
78
|
const event = value;
|
|
78
|
-
if (event.type !== 'menu.event' || !['upgrade.progress', 'upgrade.result'].includes(String(event.event))
|
|
79
|
+
if (event.type !== 'menu.event' || !['upgrade.progress', 'upgrade.result', 'template.progress', 'template.result'].includes(String(event.event))
|
|
79
80
|
|| typeof event.requestId !== 'string' || !event.requestId.trim()
|
|
80
81
|
|| typeof event.jobId !== 'string' || !/^job_[a-f0-9-]{36}$/.test(event.jobId)
|
|
81
82
|
|| !Number.isSafeInteger(event.seq) || event.seq < 1
|
|
82
|
-
|| !
|
|
83
|
+
|| !(String(event.event).startsWith('template.')
|
|
84
|
+
? ['building', 'scanning', 'uploading', 'downloading', 'verifying', 'preflight', 'backup', 'applying', 'reloading', 'publishing-profile', 'rollback']
|
|
85
|
+
: ['upgrade-check', 'downloading', 'tarball-check', 'preflight', 'restart']).includes(String(event.phase))
|
|
83
86
|
|| typeof event.status !== String.name.toLowerCase() || typeof event.message !== String.name.toLowerCase()) {
|
|
84
87
|
throw Object.assign(new Error('Invalid Menu event'), { code: 'INVALID_EVENT' });
|
|
85
88
|
}
|
|
89
|
+
if (String(event.event).startsWith('template.') && ((event.event === 'template.progress' && event.status !== 'running')
|
|
90
|
+
|| event.event === 'template.result' && !['succeeded', 'failed'].includes(String(event.status)))) {
|
|
91
|
+
throw Object.assign(new Error('Invalid template event status'), { code: 'INVALID_EVENT' });
|
|
92
|
+
}
|
|
86
93
|
return value;
|
|
87
94
|
}
|
|
88
95
|
export function buildMenuClientProtectedHeaders(input) {
|
|
@@ -418,6 +425,8 @@ export function validateMenuRequest(request) {
|
|
|
418
425
|
if (request.args !== undefined && (!request.args || typeof request.args !== 'object' || Array.isArray(request.args))) {
|
|
419
426
|
return { code: 'INVALID_ARGUMENT', message: 'Menu request args must be an object' };
|
|
420
427
|
}
|
|
428
|
+
if (isTemplateRequest(request))
|
|
429
|
+
return validateTemplateRequest(request);
|
|
421
430
|
if ((request.name === 'aid' || firstCommandToken(request.cmd) === '/aid')
|
|
422
431
|
&& (request.args?.view === 'agentmd'
|
|
423
432
|
|| (typeof request.action === 'string' && request.action.startsWith('agentmd.')))) {
|
|
@@ -14,6 +14,7 @@ import { logger } from '../utils/logger.js';
|
|
|
14
14
|
import { resolvePaths } from '../paths.js';
|
|
15
15
|
import { ownerResolver, OWNERSHIP_AUTHORIZATION_MAX_AGE_MS, OWNERSHIP_CACHE_MAX_AGE_MS } from './ownership/owner-resolver.js';
|
|
16
16
|
import { subscribeUpgradeJob } from '../utils/upgrade-jobs.js';
|
|
17
|
+
import { subscribeTemplateJob } from '../agent-template/service.js';
|
|
17
18
|
import { ecwebInitializationService } from './initialization/service.js';
|
|
18
19
|
const controlMenuDeduper = new MenuRequestDeduper();
|
|
19
20
|
export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diagService, getProcessOwners, ecwebSupervisor, onServiceProxyManager, connectChannel, startupTrace, waitForServices, }) {
|
|
@@ -215,6 +216,19 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
215
216
|
: deduped.value;
|
|
216
217
|
await sendControlMenuResponse(response);
|
|
217
218
|
const upgradeData = 'data' in response ? response.data : undefined;
|
|
219
|
+
if (parsed?.type === 'menu.action' && parsed.name === 'agent'
|
|
220
|
+
&& ['build', 'push', 'pull', 'deploy'].includes(parsed.action) && upgradeData?.jobId) {
|
|
221
|
+
const authorization = resolveControlMenuAuthorization({ peerId: opts.peerId, owners: currentProcessOwners,
|
|
222
|
+
auth: { encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders } });
|
|
223
|
+
if (authorization.allowed)
|
|
224
|
+
subscribeTemplateJob(upgradeData.jobId, authorization.actorAid, async (event) => {
|
|
225
|
+
const permission = await cmdHandler.execMenuForControl({ type: 'menu.query', id: parsed.id, name: 'agent',
|
|
226
|
+
args: { view: 'template-job', jobId: upgradeData.jobId } }, opts.peerId, { encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders });
|
|
227
|
+
if (permission.error)
|
|
228
|
+
throw new Error('Template event authorization expired');
|
|
229
|
+
await controlChannel.sendStructuredOrThrow(opts.channelId, event, menuResponseContext());
|
|
230
|
+
});
|
|
231
|
+
}
|
|
218
232
|
if (parsed?.type === 'menu.action' && parsed.action === 'upgrade' && (parsed.name === 'system' || parsed.cmd === '/system') && upgradeData?.jobId) {
|
|
219
233
|
const jobId = upgradeData.jobId;
|
|
220
234
|
subscribeUpgradeJob(jobId, async (event) => {
|