evolcore 0.0.43-test.7 → 0.0.43-test.8
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
|
@@ -2,17 +2,18 @@
|
|
|
2
2
|
* per-aid 事件中心单元注册表:加载 → 解析 → 运行时,生命周期跟随 Trigger 调度器。
|
|
3
3
|
* 包级失败隔离:坏包只废自己(pack.invalid),不影响其它包与 Bus。
|
|
4
4
|
*/
|
|
5
|
+
import fs from 'node:fs';
|
|
5
6
|
import path from 'node:path';
|
|
6
7
|
import { logger } from '../utils/logger.js';
|
|
7
8
|
import { agentEventsDir } from '../paths.js';
|
|
8
9
|
import { resolvePeerRoleDetail } from '../config/peer-role-resolver.js';
|
|
9
|
-
import { BusResolveState, resolvePackBuses } from './bus-resolver.js';
|
|
10
|
+
import { BusResolveState, isBusPlaceholder, resolvePackBuses } from './bus-resolver.js';
|
|
10
11
|
import { CenterConfigStore } from './center-config.js';
|
|
11
12
|
import { EventDispatcher } from './dispatcher.js';
|
|
12
13
|
import { writeEventsIndex } from './index-generator.js';
|
|
13
14
|
import { Ledger, centerLedger, packLedger } from './ledger.js';
|
|
14
15
|
import { buildPackState } from './pack-manager.js';
|
|
15
|
-
import { loadCenterConfig, loadPacks } from './pack-loader.js';
|
|
16
|
+
import { EVENTS_CONFIG_JSON, loadCenterConfig, loadPacks, PACK_JSON } from './pack-loader.js';
|
|
16
17
|
import { EventRuntime } from './runtime.js';
|
|
17
18
|
import { materializeAllowlist } from './admission-materializer.js';
|
|
18
19
|
import { ScriptRunner } from './script-runner.js';
|
|
@@ -20,10 +21,36 @@ import { errorMessage } from './types.js';
|
|
|
20
21
|
import { readBusResolverContext } from './directory-source.js';
|
|
21
22
|
/** 旧方案残留的订阅 Trigger(labels.kind=bus-subscription),启动时一次性清理。 */
|
|
22
23
|
const LEGACY_SUBSCRIPTION_KIND = 'bus-subscription';
|
|
24
|
+
/** 解析上下文签名:只有 owner/pa/paRoles 三要素参与(fetchedAt 等时间戳字段不参与,
|
|
25
|
+
* 否则目录每次同步 rewrite 都会触发无意义 reload)。 */
|
|
26
|
+
function resolverSignatureOf(context) {
|
|
27
|
+
const roles = {};
|
|
28
|
+
for (const key of Object.keys(context.paRoles ?? {}).sort()) {
|
|
29
|
+
roles[key] = [...(context.paRoles[key] ?? [])].sort();
|
|
30
|
+
}
|
|
31
|
+
return JSON.stringify({ owner: context.owner ?? null, pa: context.pa ?? null, paRoles: roles });
|
|
32
|
+
}
|
|
23
33
|
export class EventCenterRegistry {
|
|
24
34
|
options;
|
|
25
35
|
units = new Map();
|
|
26
36
|
starts = new Map();
|
|
37
|
+
/** 台账去重:aid → (packId#kind → 签名)。watcher/contacts 触发的 reload 会高频重扫,
|
|
38
|
+
* 相同 revision/错误的重复行(pack.load / pack.invalid / bus.resolve.*)只记一次。 */
|
|
39
|
+
scanLedgerSigs = new Map();
|
|
40
|
+
/** reload 串行队列:aid → 队尾 promise。 */
|
|
41
|
+
reloadQueues = new Map();
|
|
42
|
+
/** 签名未变则跳过 append。 */
|
|
43
|
+
ledgerOnce(aid, key, sig, append) {
|
|
44
|
+
let sigs = this.scanLedgerSigs.get(aid);
|
|
45
|
+
if (!sigs) {
|
|
46
|
+
sigs = new Map();
|
|
47
|
+
this.scanLedgerSigs.set(aid, sigs);
|
|
48
|
+
}
|
|
49
|
+
if (sigs.get(key) === sig)
|
|
50
|
+
return;
|
|
51
|
+
append();
|
|
52
|
+
sigs.set(key, sig);
|
|
53
|
+
}
|
|
27
54
|
constructor(options) {
|
|
28
55
|
this.options = options;
|
|
29
56
|
}
|
|
@@ -57,24 +84,76 @@ export class EventCenterRegistry {
|
|
|
57
84
|
* 在同一时刻对一个还没起来的 Bus 做 authorize 会超时,之后不再重试。结果是
|
|
58
85
|
* 「改完文件 Bus 挂着、订阅丢了」。因此这里复用现有 unit 的 runtime,
|
|
59
86
|
* 由 `reconfigure()` 按 bus 做差集(设计 §8 的热更新表)。
|
|
87
|
+
*
|
|
88
|
+
* 同一 aid 的 reload 串行排队:CLI、watcher、contacts 预检都可能触发,
|
|
89
|
+
* 并发跑 scan/reconfigure 会让 unit.state 与 runtime 内部状态交错。
|
|
60
90
|
*/
|
|
61
91
|
async reload(aid) {
|
|
92
|
+
const prev = this.reloadQueues.get(aid) ?? Promise.resolve();
|
|
93
|
+
const run = prev.then(() => this.reloadNow(aid));
|
|
94
|
+
this.reloadQueues.set(aid, run);
|
|
95
|
+
try {
|
|
96
|
+
await run;
|
|
97
|
+
}
|
|
98
|
+
finally {
|
|
99
|
+
if (this.reloadQueues.get(aid) === run)
|
|
100
|
+
this.reloadQueues.delete(aid);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
async reloadNow(aid) {
|
|
62
104
|
const unit = this.units.get(aid);
|
|
63
105
|
if (!unit) {
|
|
64
106
|
await this.ensureStarted(aid);
|
|
65
107
|
return;
|
|
66
108
|
}
|
|
67
|
-
const scanned = this.scan(aid);
|
|
109
|
+
const scanned = this.scan(aid, 'daemon.reload');
|
|
68
110
|
writeEventsIndex(scanned.eventsDir, scanned.state.enabledPacks, scanned.resolutions);
|
|
111
|
+
// deregister:reload 后消失的包,它登记过的事件不再存在于 catalog。
|
|
112
|
+
// 记账到中心台账——包目录可能已被归档删除,包级 ledger 不再可靠。
|
|
113
|
+
const nextIds = new Set(scanned.state.enabledPacks.map(pack => pack.id));
|
|
114
|
+
for (const pack of unit.state.enabledPacks) {
|
|
115
|
+
if (nextIds.has(pack.id))
|
|
116
|
+
continue;
|
|
117
|
+
const events = pack.register.map(entry => entry.event);
|
|
118
|
+
if (events.length === 0)
|
|
119
|
+
continue;
|
|
120
|
+
centerLedger(scanned.eventsDir).append({
|
|
121
|
+
action: 'deregister', result: 'ok', events, actor: 'daemon.reload', reason: `pack ${pack.id} removed`,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
// bus.rebind:占位符解析结果变了的包(典型场景:Owner / PA 换了,$owner / $pa
|
|
125
|
+
// 指向新 AID)。记下 old → new,否则"订阅突然收不到"只能靠猜。
|
|
126
|
+
const previousResolutions = unit.resolutions;
|
|
127
|
+
for (const [packId, next] of scanned.resolutions) {
|
|
128
|
+
const previous = previousResolutions.get(packId);
|
|
129
|
+
if (!previous)
|
|
130
|
+
continue; // 新包:由 subscribe 台账覆盖
|
|
131
|
+
const moved = [];
|
|
132
|
+
for (const [ref, to] of next) {
|
|
133
|
+
const from = previous.get(ref);
|
|
134
|
+
if (from && from !== to)
|
|
135
|
+
moved.push({ ref, from, to });
|
|
136
|
+
}
|
|
137
|
+
if (moved.length === 0)
|
|
138
|
+
continue;
|
|
139
|
+
centerLedger(scanned.eventsDir).append({
|
|
140
|
+
action: 'bus.rebind', result: 'ok', actor: 'daemon.reload',
|
|
141
|
+
...(moved[0] ? { bus: moved[0].to } : {}),
|
|
142
|
+
reason: moved.map(item => `${item.ref}: ${item.from} → ${item.to}`).join('; ').slice(0, 500),
|
|
143
|
+
});
|
|
144
|
+
}
|
|
69
145
|
// state / resolutions 是 unit 的原地字段:onEvent 闭包与 dispatcher 都从这里
|
|
70
146
|
// 读最新包集合与占位符解析结果,必须一起替换。
|
|
71
147
|
unit.state = scanned.state;
|
|
72
148
|
unit.resolutions = scanned.resolutions;
|
|
149
|
+
unit.contactsWatch = scanned.contactsWatch;
|
|
150
|
+
unit.resolverSignature = scanned.resolverSignature;
|
|
73
151
|
await unit.runtime.reconfigure({
|
|
74
152
|
state: scanned.state,
|
|
75
153
|
center: scanned.center,
|
|
76
154
|
resolutions: scanned.resolutions,
|
|
77
155
|
materializedAllowlist: scanned.materializedAllowlist,
|
|
156
|
+
contactsWatch: scanned.contactsWatch,
|
|
78
157
|
});
|
|
79
158
|
}
|
|
80
159
|
async remove(aid) {
|
|
@@ -83,8 +162,10 @@ export class EventCenterRegistry {
|
|
|
83
162
|
await pending;
|
|
84
163
|
const unit = this.units.get(aid);
|
|
85
164
|
this.units.delete(aid);
|
|
165
|
+
this.scanLedgerSigs.delete(aid);
|
|
86
166
|
if (!unit)
|
|
87
167
|
return;
|
|
168
|
+
this.detachEventsWatcher(unit);
|
|
88
169
|
await Promise.allSettled([unit.runtime.close(), unit.dispatcher.close()]);
|
|
89
170
|
}
|
|
90
171
|
async closeAll() {
|
|
@@ -92,22 +173,37 @@ export class EventCenterRegistry {
|
|
|
92
173
|
}
|
|
93
174
|
/**
|
|
94
175
|
* 扫描 + 校验 + 占位符解析 + center 读取。start 与 reload 共用。
|
|
95
|
-
*
|
|
96
|
-
*
|
|
176
|
+
* 台账副作用(pack.invalid / pack.load / bus.resolve.*)按签名去重:reload 可能由
|
|
177
|
+
* watcher/contacts 高频触发,相同内容重复行没有信息量还刷盘。
|
|
97
178
|
*/
|
|
98
|
-
scan(aid) {
|
|
179
|
+
scan(aid, ledgerActor = 'daemon.start') {
|
|
99
180
|
const agentDirPath = this.options.agentDir(aid);
|
|
100
181
|
const eventsDir = (this.options.eventsDir ?? agentEventsDir)(aid);
|
|
101
182
|
// ① 扫描 + 校验。
|
|
102
183
|
const loaded = loadPacks(eventsDir);
|
|
103
184
|
const state = buildPackState(loaded.valid, loaded.invalid.map(item => ({ id: item.packId, errors: item.errors })));
|
|
104
|
-
// ② 台账:invalid / load
|
|
185
|
+
// ② 台账:invalid / load(签名去重)。
|
|
105
186
|
for (const item of loaded.invalid) {
|
|
106
|
-
const
|
|
107
|
-
|
|
187
|
+
const reason = item.errors.join('; ').slice(0, 500);
|
|
188
|
+
this.ledgerOnce(aid, `${item.packId}#invalid`, reason, () => {
|
|
189
|
+
const ledger = new Ledger(path.join(item.dir, 'ledger.jsonl'));
|
|
190
|
+
ledger.append({ action: 'pack.invalid', result: 'failed', reason });
|
|
191
|
+
});
|
|
108
192
|
}
|
|
109
193
|
for (const pack of state.enabledPacks) {
|
|
110
|
-
|
|
194
|
+
this.ledgerOnce(aid, `${pack.id}#load`, pack.revision, () => {
|
|
195
|
+
packLedger(pack).append({ action: 'pack.load', result: 'ok', actor: ledgerActor, revision: pack.revision });
|
|
196
|
+
});
|
|
197
|
+
// register:本包往 catalog 里登记了哪些事件。与 pack.load 同一时机、同一 revision
|
|
198
|
+
// 去重——包内容没变就不重复记,否则每次 reload 都刷一遍。
|
|
199
|
+
if (pack.register.length > 0) {
|
|
200
|
+
this.ledgerOnce(aid, `${pack.id}#register`, pack.revision, () => {
|
|
201
|
+
packLedger(pack).append({
|
|
202
|
+
action: 'register', result: 'ok', events: pack.register.map(entry => entry.event),
|
|
203
|
+
actor: ledgerActor, revision: pack.revision,
|
|
204
|
+
});
|
|
205
|
+
});
|
|
206
|
+
}
|
|
111
207
|
}
|
|
112
208
|
// ③ 占位符解析(strict 失败 → 该包退出运行;keep-last 沿用上次结果)。
|
|
113
209
|
const context = readBusResolverContext(aid, agentDirPath);
|
|
@@ -115,6 +211,7 @@ export class EventCenterRegistry {
|
|
|
115
211
|
resolveState.load();
|
|
116
212
|
const resolutions = new Map();
|
|
117
213
|
const runnablePacks = [];
|
|
214
|
+
let wantsResolveRefresh = false;
|
|
118
215
|
for (const pack of state.enabledPacks) {
|
|
119
216
|
const refs = [...pack.publish.map(entry => entry.bus), ...pack.subscribe.map(entry => entry.bus)];
|
|
120
217
|
if (refs.length === 0) {
|
|
@@ -123,11 +220,23 @@ export class EventCenterRegistry {
|
|
|
123
220
|
}
|
|
124
221
|
const last = resolveState.get(pack.id);
|
|
125
222
|
const resolution = resolvePackBuses(refs, context, pack.busResolve, last);
|
|
126
|
-
|
|
127
|
-
|
|
223
|
+
if (resolution.failures.length > 0 || resolution.degraded.length > 0)
|
|
224
|
+
wantsResolveRefresh = true;
|
|
225
|
+
if (resolution.failures.length > 0) {
|
|
226
|
+
const sig = resolution.failures.map(failure => `${failure.ref}:${failure.code}`).join(';');
|
|
227
|
+
this.ledgerOnce(aid, `${pack.id}#resolve`, sig, () => {
|
|
228
|
+
for (const failure of resolution.failures) {
|
|
229
|
+
packLedger(pack).append({ action: 'pack.invalid', result: 'failed', reason: `bus resolve failed: ${failure.ref} (${failure.code}: ${failure.message})`, revision: pack.revision });
|
|
230
|
+
}
|
|
231
|
+
});
|
|
128
232
|
}
|
|
129
|
-
|
|
130
|
-
|
|
233
|
+
if (resolution.degraded.length > 0) {
|
|
234
|
+
const sig = resolution.degraded.map(degraded => `${degraded.ref}=${degraded.lastAid}`).sort().join(';');
|
|
235
|
+
this.ledgerOnce(aid, `${pack.id}#degraded`, sig, () => {
|
|
236
|
+
for (const degraded of resolution.degraded) {
|
|
237
|
+
packLedger(pack).append({ action: 'bus.resolve.degraded', result: 'ok', bus: degraded.lastAid, reason: `${degraded.ref} unresolved; keep-last`, revision: pack.revision });
|
|
238
|
+
}
|
|
239
|
+
});
|
|
131
240
|
}
|
|
132
241
|
if (resolution.failures.length > 0 && pack.busResolve === 'strict')
|
|
133
242
|
continue;
|
|
@@ -137,12 +246,15 @@ export class EventCenterRegistry {
|
|
|
137
246
|
}
|
|
138
247
|
resolveState.save();
|
|
139
248
|
const runtimeState = { ...state, enabledPacks: runnablePacks };
|
|
140
|
-
// ④
|
|
249
|
+
// ④ events-config.json。
|
|
141
250
|
const centerResult = loadCenterConfig(eventsDir);
|
|
142
251
|
for (const error of centerResult.errors) {
|
|
143
|
-
logger.warn(`[EventCenter] ${aid}
|
|
252
|
+
logger.warn(`[EventCenter] ${aid} events-config.json: ${error}`);
|
|
144
253
|
}
|
|
145
254
|
const materialized = materializeAllowlist(centerResult.config, agentDirPath, aid, runtimeState.catalog.map(entry => entry.event));
|
|
255
|
+
// contacts 监听需求:包里有占位符引用(含被解析淘汰的包——它们在 enabledPacks 里)
|
|
256
|
+
// 或上次解析有失败/degraded(等 contacts 到位后重解析)。
|
|
257
|
+
const usesPlaceholderRefs = loaded.valid.some(pack => [...pack.publish, ...pack.subscribe].some(entry => isBusPlaceholder(entry.bus)));
|
|
146
258
|
return {
|
|
147
259
|
agentDirPath,
|
|
148
260
|
eventsDir,
|
|
@@ -151,9 +263,27 @@ export class EventCenterRegistry {
|
|
|
151
263
|
center: centerResult.config,
|
|
152
264
|
// 首次启动没有"上一份 allowlist",物化失败必须 fail-closed 等下次重物化。
|
|
153
265
|
materializedAllowlist: materialized.degraded ? {} : materialized.allowlist,
|
|
266
|
+
contactsWatch: usesPlaceholderRefs || wantsResolveRefresh,
|
|
267
|
+
resolverSignature: resolverSignatureOf(context),
|
|
154
268
|
};
|
|
155
269
|
}
|
|
156
270
|
async start(aid) {
|
|
271
|
+
// 已有单元时先关掉:否则新单元会覆盖 units 里的旧条目,而旧 runtime 的
|
|
272
|
+
// Bus/Sub/Pub 三条连接没人关闭——同一进程出现两条 role=bus 的连接,
|
|
273
|
+
// 服务端按"Connection replaced by new session"互相踢,形成 60 秒一次的
|
|
274
|
+
// DEVICE_CONFLICT 循环。ensureStarted 的 starts 去重只挡住并发调用,
|
|
275
|
+
// 挡不住"先后两次 ensureStarted"(例如调度器 started 事件 + pack add)。
|
|
276
|
+
// 关闭已有单元,避免同一 AID 出现两条 Bus 连接(服务端按
|
|
277
|
+
// "Connection replaced by new session" 互相踢,形成 60 秒 DEVICE_CONFLICT 循环)。
|
|
278
|
+
//
|
|
279
|
+
// 注意**不能调 this.remove(aid)**:remove() 会 `await this.starts.get(aid)`,
|
|
280
|
+
// 而 starts 里登记的正是本次 start() 的 Promise —— 自等待死锁,startSubscribers
|
|
281
|
+
// 永远不会执行(现象:Bus running 但从不写 `subscribed`)。这里就地清理。
|
|
282
|
+
const existingUnit = this.units.get(aid);
|
|
283
|
+
if (existingUnit) {
|
|
284
|
+
this.units.delete(aid);
|
|
285
|
+
await Promise.allSettled([existingUnit.runtime.close(), existingUnit.dispatcher.close()]);
|
|
286
|
+
}
|
|
157
287
|
this.cleanupLegacySubscriptionTriggers(aid);
|
|
158
288
|
const scanned = this.scan(aid);
|
|
159
289
|
const { agentDirPath, eventsDir, state: runtimeState, resolutions, center: centerConfig } = scanned;
|
|
@@ -181,8 +311,9 @@ export class EventCenterRegistry {
|
|
|
181
311
|
const dispatcher = new EventDispatcher(scriptRunner);
|
|
182
312
|
const runtime = new EventRuntime({
|
|
183
313
|
aid,
|
|
184
|
-
|
|
314
|
+
getClient: this.options.getClient,
|
|
185
315
|
contactsPath: path.join(agentDirPath, 'directory', 'contacts.json'),
|
|
316
|
+
onContactsChanged: () => this.handleContactsChanged(aid),
|
|
186
317
|
materializeAllowlist: (center, registeredEvents) => materializeAllowlist(center, agentDirPath, aid, registeredEvents),
|
|
187
318
|
onBusRequestRejected: entry => centerLedger(eventsDir).append({
|
|
188
319
|
action: 'bus.request.rejected', result: 'failed', aid: entry.aid, operation: entry.operation,
|
|
@@ -193,6 +324,32 @@ export class EventCenterRegistry {
|
|
|
193
324
|
action: installed ? 'gate.installed' : 'gate.degraded', result: installed ? 'ok' : 'failed', actor: 'daemon',
|
|
194
325
|
...(installed ? {} : { reason: 'sdk_request_handler_unavailable' }),
|
|
195
326
|
}),
|
|
327
|
+
// 热更新退订:包被删/事件被删时记录,否则"什么时候开始收不到"无从追溯。
|
|
328
|
+
onUnsubscribe: ({ busAid, events }) => {
|
|
329
|
+
const live = this.units.get(aid);
|
|
330
|
+
if (!live)
|
|
331
|
+
return;
|
|
332
|
+
const revision = live.state.enabledPacks
|
|
333
|
+
.find(pack => pack.subscribe.some(entry => entry.event === events[0]))?.revision;
|
|
334
|
+
centerLedger(eventsDir).append({
|
|
335
|
+
action: 'unsubscribe', result: 'ok', bus: busAid, events, actor: 'daemon.reload',
|
|
336
|
+
...(revision ? { revision } : {}),
|
|
337
|
+
});
|
|
338
|
+
},
|
|
339
|
+
// Bus 进出 running 的时间线——排查 DEVICE_CONFLICT / 订阅失效时唯一的依据。
|
|
340
|
+
onBusTransition: ({ from, to, detail }) => {
|
|
341
|
+
const entering = to === 'running' && from !== 'running';
|
|
342
|
+
const leaving = from === 'running' && to !== 'running';
|
|
343
|
+
if (!entering && !leaving)
|
|
344
|
+
return;
|
|
345
|
+
centerLedger(eventsDir).append({
|
|
346
|
+
action: entering ? 'bus.start' : 'bus.stop',
|
|
347
|
+
result: 'ok',
|
|
348
|
+
bus: aid,
|
|
349
|
+
actor: 'daemon',
|
|
350
|
+
...(detail ? { reason: detail } : {}),
|
|
351
|
+
});
|
|
352
|
+
},
|
|
196
353
|
// 读 unit 上的实时字段:reload 会原地替换 state / resolutions,
|
|
197
354
|
// 闭包若捕获初值,热更新后仍按旧包集合派发。
|
|
198
355
|
onEvent: event => {
|
|
@@ -205,15 +362,83 @@ export class EventCenterRegistry {
|
|
|
205
362
|
writeEventsIndex(eventsDir, runtimeState.enabledPacks, resolutions);
|
|
206
363
|
const unit = {
|
|
207
364
|
aid, agentDir: agentDirPath, eventsDir, state: runtimeState, centerStore, runtime, dispatcher, resolutions,
|
|
365
|
+
contactsWatch: scanned.contactsWatch,
|
|
366
|
+
resolverSignature: scanned.resolverSignature,
|
|
208
367
|
};
|
|
209
368
|
this.units.set(aid, unit);
|
|
369
|
+
this.attachEventsWatcher(unit);
|
|
210
370
|
await runtime.start({
|
|
211
371
|
state: runtimeState,
|
|
212
372
|
center: centerConfig,
|
|
213
373
|
resolutions,
|
|
214
374
|
materializedAllowlist: scanned.materializedAllowlist,
|
|
375
|
+
contactsWatch: scanned.contactsWatch,
|
|
215
376
|
});
|
|
216
377
|
}
|
|
378
|
+
// ── M2:contacts 变化 → 预检后 reload ─────────────────────────────────
|
|
379
|
+
// runtime 的 contacts watcher(2s 去抖)在 allowlist 重物化之外回调这里。
|
|
380
|
+
// 预检:重读 contacts 比对 owner/pa/paRoles 签名——没变就跳过(目录同步周期性
|
|
381
|
+
// rewrite 同内容文件,fetchedAt/updatedAtMs 每次都变,不能一见写入就 reload)。
|
|
382
|
+
handleContactsChanged(aid) {
|
|
383
|
+
const unit = this.units.get(aid);
|
|
384
|
+
if (!unit || !unit.contactsWatch)
|
|
385
|
+
return;
|
|
386
|
+
let context;
|
|
387
|
+
try {
|
|
388
|
+
context = readBusResolverContext(aid, unit.agentDir);
|
|
389
|
+
}
|
|
390
|
+
catch {
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
393
|
+
if (resolverSignatureOf(context) === unit.resolverSignature)
|
|
394
|
+
return;
|
|
395
|
+
this.reload(aid).catch(error => {
|
|
396
|
+
logger.warn(`[EventCenter] ${aid} contacts-triggered reload failed: ${errorMessage(error)}`);
|
|
397
|
+
});
|
|
398
|
+
}
|
|
399
|
+
// ── M3:events/ 目录监听(改 pack.json/center.json 自动 reload)────────
|
|
400
|
+
// 原生 recursive fs.watch(win32 单句柄;chokidar 在 Windows 有句柄爆炸教训)。
|
|
401
|
+
// 只认包清单与 center.json:.index.md 在监听目录内(reload 自己写,会自触发),
|
|
402
|
+
// ledger/logs/scripts 是运行产物,全排除。error 即降级拆除,回到手动 reload。
|
|
403
|
+
attachEventsWatcher(unit) {
|
|
404
|
+
if (unit.eventsWatcher || this.options.watchEvents === false)
|
|
405
|
+
return;
|
|
406
|
+
// 旧名文件(center.json / 关注的事件.json)首次加载时就地迁移成规范名,磁盘上不再出现,无需监听。
|
|
407
|
+
const watched = new Set([PACK_JSON, EVENTS_CONFIG_JSON]);
|
|
408
|
+
try {
|
|
409
|
+
const watcher = fs.watch(unit.eventsDir, { recursive: true }, (_kind, filename) => {
|
|
410
|
+
const base = filename ? path.basename(filename.toString()) : '';
|
|
411
|
+
if (!watched.has(base))
|
|
412
|
+
return;
|
|
413
|
+
if (unit.eventsReloadTimer)
|
|
414
|
+
clearTimeout(unit.eventsReloadTimer);
|
|
415
|
+
unit.eventsReloadTimer = setTimeout(() => {
|
|
416
|
+
unit.eventsReloadTimer = undefined;
|
|
417
|
+
this.reload(unit.aid).catch(error => {
|
|
418
|
+
logger.warn(`[EventCenter] ${unit.aid} watcher reload failed: ${errorMessage(error)}`);
|
|
419
|
+
});
|
|
420
|
+
}, 2_000);
|
|
421
|
+
unit.eventsReloadTimer.unref?.();
|
|
422
|
+
});
|
|
423
|
+
watcher.on('error', () => this.detachEventsWatcher(unit));
|
|
424
|
+
unit.eventsWatcher = watcher;
|
|
425
|
+
}
|
|
426
|
+
catch {
|
|
427
|
+
// 目录缺失或平台不支持 recursive:不监听即可,手动 reload 仍可用。
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
detachEventsWatcher(unit) {
|
|
431
|
+
if (unit.eventsReloadTimer)
|
|
432
|
+
clearTimeout(unit.eventsReloadTimer);
|
|
433
|
+
unit.eventsReloadTimer = undefined;
|
|
434
|
+
try {
|
|
435
|
+
unit.eventsWatcher?.close();
|
|
436
|
+
}
|
|
437
|
+
catch {
|
|
438
|
+
// 已失效。
|
|
439
|
+
}
|
|
440
|
+
unit.eventsWatcher = undefined;
|
|
441
|
+
}
|
|
217
442
|
/** 一次性清理旧事件总线遗留的订阅 Trigger(事件源 bus:event 已无人发布,纯残留)。 */
|
|
218
443
|
cleanupLegacySubscriptionTriggers(aid) {
|
|
219
444
|
const scheduler = this.options.getScheduler?.(aid);
|