evolcore 0.0.43-test.5 → 0.0.43-test.6
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 +126 -43
- package/dist/agents/baseagent-availability.js +19 -4
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +14 -3
- package/dist/agents/codex-runner.js +6 -6
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +73 -10
- package/dist/cli/agent-create.js +16 -6
- package/dist/cli/aun-commands.js +9 -1
- package/dist/cli/daemon-commands.js +30 -1
- package/dist/cli/ecmsg-gateway.js +3 -1
- package/dist/cli/init.js +75 -0
- package/dist/cli/provider-command.js +1 -1
- package/dist/cli/restart-monitor.js +24 -5
- package/dist/cli/task-context.js +38 -1
- package/dist/cli/watch-logs.js +6 -4
- package/dist/config/boot-log.js +6 -4
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-manager.js +1 -1
- package/dist/config/peer-role-resolver.js +1 -1
- package/dist/config/provider-identity-migration.js +92 -17
- package/dist/config/provider-local-sync.js +2 -0
- package/dist/config/providers-config.js +13 -0
- package/dist/config/providers-management.js +100 -10
- package/dist/config/role-service.js +8 -8
- package/dist/config/role-store.js +22 -22
- package/dist/config/schema-migration.js +80 -87
- package/dist/config/snapshot.js +70 -41
- package/dist/core/agent-runtime.js +44 -7
- package/dist/core/baseagent-loader.js +114 -11
- package/dist/core/channel-loader.js +36 -13
- package/dist/core/channel-runtime.js +112 -42
- package/dist/core/command/command-handler.js +5 -5
- package/dist/core/command/menu-handler.js +8 -3
- package/dist/core/command/menu-protocol.js +82 -11
- package/dist/core/command/role-menu.js +27 -15
- package/dist/core/daemon-control.js +42 -15
- package/dist/core/daemon-lifecycle.js +411 -67
- package/dist/core/handoff/dispatcher.js +9 -3
- package/dist/core/handoff/runtime.js +130 -42
- package/dist/core/handoff/store.js +190 -2
- package/dist/core/handoff/types.js +5 -0
- package/dist/core/initialization/service.js +4 -4
- package/dist/core/ipc-registration.js +5 -4
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/message/aun-ipc-sender.js +2 -2
- package/dist/core/message/message-bridge.js +53 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +10 -2
- package/dist/core/message/send-routing.js +12 -2
- package/dist/core/ownership/owner-resolver.js +1 -0
- package/dist/core/permission/ec-command-parser.js +11 -1
- package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
- package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
- package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
- package/dist/core/session/session-fs-store.js +164 -3
- package/dist/core/session/session-idle-monitor.js +9 -1
- package/dist/core/session/session-manager.js +36 -2
- package/dist/directory/owner-directory-admission.js +26 -1
- package/dist/directory/owner-directory-cache.js +57 -16
- package/dist/directory/owner-directory-query-operation.js +4 -1
- package/dist/ecweb/runtime/lifecycle.js +9 -7
- package/dist/ecweb/runtime/supervisor.js +44 -27
- package/dist/index.js +548 -251
- package/dist/proxy/manager.js +38 -17
- package/dist/proxy/service-supervisor.js +65 -31
- package/dist/trigger/application-service.js +3 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +78 -5
- package/dist/utils/cross-platform.js +152 -4
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +64 -1
- package/dist/utils/startup-trace.js +160 -19
- package/kits/docs/aun/ABILITY_CALLING.md +3 -3
- package/kits/docs/evolcore/INDEX.md +3 -2
- package/kits/docs/evolcore/ctl.md +2 -1
- package/kits/docs/evolcore/group.md +2 -2
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/msg.md +13 -6
- package/kits/docs/evolcore/provider.md +21 -3
- package/kits/docs/evolcore/response.md +1 -1
- package/kits/eck_manifest.json +19 -7
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/06-channel.md +5 -6
- package/kits/schemas/daemon.schema.1.json +5 -0
- package/kits/schemas/daemon.schema.2.json +5 -0
- package/kits/schemas/daemon.schema.3.json +2 -1
- package/kits/schemas/daemon.schema.4.json +2 -1
- package/kits/schemas/daemon.schema.5.json +2 -1
- package/kits/schemas/daemon.schema.6.json +1 -1
- package/kits/schemas/daemon.schema.7.json +1 -1
- package/kits/schemas/daemon.schema.8.json +2 -1
- package/kits/schemas/daemon.schema.9.json +2 -1
- package/kits/schemas/role-registry.schema.1.json +2 -2
- package/kits/schemas/single-session.schema.1.json +1 -1
- package/kits/schemas/single-session.schema.2.json +1 -1
- package/kits/schemas/single-session.schema.3.json +1 -1
- package/kits/skills/aid-ability/SKILL.md +7 -7
- package/kits/skills/ec-group/SKILL.md +8 -5
- 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/system-fragments/commands.md +5 -5
- package/kits/templates/system-fragments/reply.md +2 -1
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +1 -1
- package/package.json +4 -3
package/dist/index.js
CHANGED
|
@@ -46,7 +46,7 @@ import { startDaemonControlAid } from './core/daemon-control.js';
|
|
|
46
46
|
import { createDelegationAuthorizer } from './core/auth/delegation-authorization.js';
|
|
47
47
|
import { registerProxyIpcExecutor } from './proxy/ipc-service.js';
|
|
48
48
|
import { ownerResolver, getDaemonOwners, getPrimaryOwner } from './core/ownership/owner-resolver.js';
|
|
49
|
-
import {
|
|
49
|
+
import { StartupTaskQueue, StartupGate, discoverStartupWork, recoverStartupHandoffs, resumePendingSessions, createDaemonShutdown, daemonConversationTotalExecutionMs, daemonConversationWatchdogMs, daemonIdleTimeoutMs, startupTaskReadiness, } from './core/daemon-lifecycle.js';
|
|
50
50
|
import { createLifecycleNoticeService } from './core/lifecycle-notice.js';
|
|
51
51
|
import { BootstrapService, createBootstrapCompletionHandler, createBootstrapOwnerBoundHandler } from './core/bootstrap-service.js';
|
|
52
52
|
import { MessageCache } from './core/message/message-cache.js';
|
|
@@ -78,7 +78,7 @@ import { EvolAgentRegistry } from './core/evolagent-registry.js';
|
|
|
78
78
|
import { createAgentInitializationRuntime, createAgentReloadRuntime, createAgentRuntimeOperations, createStartupAgentRunners, completeStartupAgentRuntime, bindAgentCreationOwner, loadStartupAgentRegistry, recoverIncompleteAgentInitializations, } from './core/agent-runtime.js';
|
|
79
79
|
import { IpcServer } from './ipc.js';
|
|
80
80
|
import { installChannelSdkConsoleFilter, logger, logOwnershipEvent, ownershipErrorCode, setChannelLogsEnabled, setLogLevel } from './utils/logger.js';
|
|
81
|
-
import { StartupTracer } from './utils/startup-trace.js';
|
|
81
|
+
import { StartupTracer, startRequestedStartupCpuProfile } from './utils/startup-trace.js';
|
|
82
82
|
import { DiagService } from './core/command/diag-service.js';
|
|
83
83
|
import { createEcwebSupervisor } from './ecweb/runtime/supervisor.js';
|
|
84
84
|
import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
|
|
@@ -100,6 +100,7 @@ export { resolvePersistedRestartDelivery } from './core/message/outbound.js';
|
|
|
100
100
|
export function readEvolcoreVersion() {
|
|
101
101
|
return readInstalledEvolcoreVersion();
|
|
102
102
|
}
|
|
103
|
+
let startupCpuProfile;
|
|
103
104
|
async function main() {
|
|
104
105
|
// 启动甘特图埋点。firstPhase 之前的时间(node 启动 + 模块加载 + tsx/dist 编译)
|
|
105
106
|
// 全部记进 daemon.bootstrap;计时器消费 `ec start` 传入的一次性 traceId,
|
|
@@ -184,6 +185,11 @@ async function main() {
|
|
|
184
185
|
process.exit(0);
|
|
185
186
|
}
|
|
186
187
|
}
|
|
188
|
+
// Diagnostic opt-in is consumed only by the elected daemon, never an importing test or losing process.
|
|
189
|
+
trace.mark('daemon.startupCpuProfile');
|
|
190
|
+
startupCpuProfile = await startRequestedStartupCpuProfile(trace.id);
|
|
191
|
+
if (startupCpuProfile)
|
|
192
|
+
trace.setMeta('startupCpuProfile', startupCpuProfile.file);
|
|
187
193
|
// ── 自动迁移 ──
|
|
188
194
|
trace.mark('daemon.migrations');
|
|
189
195
|
migrateIdentitiesIfNeeded();
|
|
@@ -206,7 +212,7 @@ async function main() {
|
|
|
206
212
|
trace.mark('daemon.configInit');
|
|
207
213
|
const configSnapshotsEnabled = await initializeStartupConfig(message => {
|
|
208
214
|
console.error(message);
|
|
209
|
-
|
|
215
|
+
throw new Error(message);
|
|
210
216
|
});
|
|
211
217
|
const daemonCfg = loadDaemonConfig();
|
|
212
218
|
if (daemonCfg.debug?.logLevel) {
|
|
@@ -242,6 +248,20 @@ async function main() {
|
|
|
242
248
|
const processLevelOwners = getDaemonOwners;
|
|
243
249
|
const bindBootstrapMode = process.env.EVOLCORE_BIND_BOOTSTRAP === '1';
|
|
244
250
|
const paths = resolvePaths();
|
|
251
|
+
let startupCancelled = false;
|
|
252
|
+
let normalTaskState = 'pending';
|
|
253
|
+
let startupEcwebState = 'waiting';
|
|
254
|
+
const priorityStartupGate = new StartupGate();
|
|
255
|
+
const normalStartupGate = new StartupGate();
|
|
256
|
+
// Audit needs genuine task Ready; optional services can also start degraded.
|
|
257
|
+
const taskReadyGate = new StartupGate();
|
|
258
|
+
const waitForBackgroundStartup = async () => await normalStartupGate.promise !== 'cancelled' && !startupCancelled;
|
|
259
|
+
onShutdown(() => {
|
|
260
|
+
startupCancelled = true;
|
|
261
|
+
priorityStartupGate.settle('cancelled');
|
|
262
|
+
normalStartupGate.settle('cancelled');
|
|
263
|
+
taskReadyGate.settle('cancelled');
|
|
264
|
+
});
|
|
245
265
|
// ECWeb has one lifecycle owner: the daemon. The CLI may have started an
|
|
246
266
|
// instance just before spawning us; the supervisor adopts it when healthy,
|
|
247
267
|
// otherwise starts one and keeps it alive for the daemon's lifetime.
|
|
@@ -250,6 +270,7 @@ async function main() {
|
|
|
250
270
|
const ecwebConfig = ecwebService(daemonCfg.services);
|
|
251
271
|
{
|
|
252
272
|
ecwebSupervisor = createEcwebSupervisor({
|
|
273
|
+
startupTrace: trace,
|
|
253
274
|
port: ecwebConfig?.port ?? DEFAULT_ECWEB_PORT,
|
|
254
275
|
enabled: ecwebConfig?.enabled === true,
|
|
255
276
|
runtimeMode: ecwebConfig ? serviceRuntimeMode(ecwebConfig) : 'managed',
|
|
@@ -263,12 +284,16 @@ async function main() {
|
|
|
263
284
|
return;
|
|
264
285
|
try {
|
|
265
286
|
const service = ecwebService(loadDaemonConfig().services);
|
|
266
|
-
void
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
287
|
+
void priorityStartupGate.promise.then(() => {
|
|
288
|
+
if (startupCancelled)
|
|
289
|
+
return;
|
|
290
|
+
return ecwebSupervisor.configure({
|
|
291
|
+
enabled: service?.enabled === true,
|
|
292
|
+
port: service?.port ?? DEFAULT_ECWEB_PORT,
|
|
293
|
+
runtimeMode: service ? serviceRuntimeMode(service) : 'managed',
|
|
294
|
+
restart: service?.runtime?.restart,
|
|
295
|
+
health: service?.health,
|
|
296
|
+
});
|
|
272
297
|
}).catch((error) => logger.warn(`ECWeb 配置热应用失败: ${error?.message || error}`));
|
|
273
298
|
}
|
|
274
299
|
catch (error) {
|
|
@@ -276,11 +301,20 @@ async function main() {
|
|
|
276
301
|
}
|
|
277
302
|
});
|
|
278
303
|
onShutdown(removeEcwebConfigListener);
|
|
279
|
-
void
|
|
304
|
+
void trace.track('daemon.ecwebLaunch', async () => {
|
|
305
|
+
await priorityStartupGate.promise;
|
|
306
|
+
if (!startupCancelled) {
|
|
307
|
+
startupEcwebState = 'starting';
|
|
308
|
+
await ecwebSupervisor.start();
|
|
309
|
+
startupEcwebState = 'ready';
|
|
310
|
+
}
|
|
311
|
+
}).catch((error) => {
|
|
312
|
+
startupEcwebState = 'failed';
|
|
280
313
|
logger.warn(`ECWeb supervisor 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
|
|
281
314
|
});
|
|
282
315
|
}
|
|
283
316
|
if (bindBootstrapMode && process.env.EVOLCORE_WEB_INIT !== '1' && daemonCfg.aid && loadAllAgents().agents.length === 0) {
|
|
317
|
+
priorityStartupGate.settle('ready');
|
|
284
318
|
await runBindBootstrapDaemon(daemonCfg);
|
|
285
319
|
return;
|
|
286
320
|
}
|
|
@@ -291,6 +325,8 @@ async function main() {
|
|
|
291
325
|
let agentRuntimeState = runtimeStatus.state;
|
|
292
326
|
let agentRuntimeError = runtimeStatus.error;
|
|
293
327
|
const startupAgents = [...agentRegistry.runnableAgents()];
|
|
328
|
+
const controlAid = daemonCfg.aid || '__daemon__';
|
|
329
|
+
const daemonTriggerAid = startupAgents.some(agent => agent.aid === controlAid) ? `${controlAid}#daemon` : controlAid;
|
|
294
330
|
// 进程级设置独立来自 daemon.json,不进入 Agent 覆盖链。
|
|
295
331
|
const globalSettings = {
|
|
296
332
|
idleMonitor: daemonCfg.idleMonitor,
|
|
@@ -302,6 +338,7 @@ async function main() {
|
|
|
302
338
|
trace.mark('daemon.eventBus');
|
|
303
339
|
const eventBus = new EventBus();
|
|
304
340
|
const daemonPluginLifecycle = new PluginHandle('daemon');
|
|
341
|
+
daemonPluginLifecycle.defer(() => startupCpuProfile?.stop('shutdown'), 'startup CPU profile');
|
|
305
342
|
logger.info('✓ Event bus initialized');
|
|
306
343
|
// 把所有事件录到 events.log(受 EVENT_LOG 环境变量控制)
|
|
307
344
|
daemonPluginLifecycle.subscribe(eventBus, '*', (event) => logger.event(event));
|
|
@@ -331,6 +368,23 @@ async function main() {
|
|
|
331
368
|
sessionManager.registerFileAdapter(new CodexSessionFileAdapter());
|
|
332
369
|
sessionManager.registerFileAdapter(new GeminiSessionFileAdapter());
|
|
333
370
|
sessionManager.registerFileAdapter(new EcagentSessionFileAdapter());
|
|
371
|
+
let capturedStartupQueue;
|
|
372
|
+
const startupQueueCaptured = new Promise(resolve => { capturedStartupQueue = resolve; });
|
|
373
|
+
let discoveredStartupWork;
|
|
374
|
+
const startupWorkPromise = trace.track('daemon.startupWorkDiscovery', () => discoverStartupWork({
|
|
375
|
+
agentAids: startupAgents.map(agent => agent.aid), daemonTriggerAid,
|
|
376
|
+
primaryAid: primaryAgent?.aid, sessionsRoot: paths.sessionsDir, queuePath: daemonQueuePath(),
|
|
377
|
+
onQueueCaptured: capturedStartupQueue,
|
|
378
|
+
})).then(plan => {
|
|
379
|
+
discoveredStartupWork = plan;
|
|
380
|
+
trace.setMeta('priorityAgents', String(plan.priorityAids.size));
|
|
381
|
+
trace.setMeta('recoveringTriggerOwners', String(plan.triggerAids.size));
|
|
382
|
+
logger.info(`[startup] Recovery priority: agents=${plan.priorityAids.size}/${startupAgents.length}`
|
|
383
|
+
+ ` triggerOwners=${plan.triggerAids.size} pendingSessions=${plan.pendingSessions.length}`);
|
|
384
|
+
if (!plan.priorityAids.size)
|
|
385
|
+
priorityStartupGate.settle('ready');
|
|
386
|
+
return plan;
|
|
387
|
+
});
|
|
334
388
|
// Agent 插件系统:每个 EvolAgent × 每个 baseagent 一个独立 runner(H1/H2 修复)
|
|
335
389
|
const agentLoader = new AgentLoader();
|
|
336
390
|
agentLoader.register(new ClaudeAgentPlugin());
|
|
@@ -353,8 +407,10 @@ async function main() {
|
|
|
353
407
|
const channelInstancesByAgent = new Map();
|
|
354
408
|
const runnerResultsByAgent = new Map();
|
|
355
409
|
const runnerSettledAgents = new Set();
|
|
410
|
+
const activeRunnerSettledAgents = new Set();
|
|
356
411
|
let startupChannelsRegistered = false;
|
|
357
|
-
let
|
|
412
|
+
let checkStartupTaskReady = () => { };
|
|
413
|
+
const settleStartupTaskReady = trace.startTask('daemon.taskReady');
|
|
358
414
|
const resolveStartupOperation = (aid) => {
|
|
359
415
|
if (startupCancelled || (startupChannelsRegistered && runnerSettledAgents.has(aid))) {
|
|
360
416
|
startupOperationReadyResolvers.get(aid)?.(runnerResultsByAgent.get(aid) ?? []);
|
|
@@ -379,10 +435,10 @@ async function main() {
|
|
|
379
435
|
startupOperationReadyResolvers.set(agent.aid, resolve);
|
|
380
436
|
}));
|
|
381
437
|
}
|
|
382
|
-
|
|
438
|
+
// Status has a config-only snapshot immediately. Slow machine detection is
|
|
439
|
+
// observational and must not gate IPC or other backends' runners/channels.
|
|
440
|
+
const baseagentSnapshot = await getBaseagentSnapshot({ loaded: [], probe: false });
|
|
383
441
|
const refreshLoadedBaseagents = () => {
|
|
384
|
-
if (!baseagentSnapshot)
|
|
385
|
-
return;
|
|
386
442
|
const loaded = new Set(loadedBaseagentIds(agentMap.keys()));
|
|
387
443
|
for (const baseagent of baseagentSnapshot.baseagents)
|
|
388
444
|
baseagent.loaded = loaded.has(baseagent.id);
|
|
@@ -392,33 +448,48 @@ async function main() {
|
|
|
392
448
|
process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
|
|
393
449
|
const startupRunnersStartedAtMs = Date.now();
|
|
394
450
|
trace.mark('daemon.agentRunnerDispatch');
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
}
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
451
|
+
void trace.track('daemon.baseagentProbeComplete', () => getBaseagentSnapshot({ loaded: [], probe: true }))
|
|
452
|
+
.then(snapshot => { Object.assign(baseagentSnapshot, snapshot); refreshLoadedBaseagents(); })
|
|
453
|
+
.catch(error => logger.warn(`[startup] Baseagent inventory probe failed: ${error}`));
|
|
454
|
+
const startupRunnersPromise = trace.track('daemon.agentRunnersReady', async () => {
|
|
455
|
+
const work = await startupWorkPromise;
|
|
456
|
+
return createStartupAgentRunners({
|
|
457
|
+
agentRegistry,
|
|
458
|
+
agentLoader,
|
|
459
|
+
sessionManager,
|
|
460
|
+
primaryAgent,
|
|
461
|
+
agentInstances,
|
|
462
|
+
agentMap,
|
|
463
|
+
isCancelled: () => startupCancelled,
|
|
464
|
+
startupPriority: { aids: work.priorityAids, waitForDeferred: () => priorityStartupGate.promise },
|
|
465
|
+
configureInstances: instances => {
|
|
466
|
+
for (const instance of instances) {
|
|
467
|
+
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
468
|
+
configureRunnerCallbacks?.(instance);
|
|
469
|
+
}
|
|
470
|
+
},
|
|
471
|
+
onAgentReady: (agent, instances, timing) => {
|
|
472
|
+
activeRunnerSettledAgents.add(agent.aid);
|
|
473
|
+
startupRunnerInstances.set(agent.aid, instances);
|
|
474
|
+
bindStartupAgentChannels(agent, instances);
|
|
475
|
+
refreshLoadedBaseagents();
|
|
476
|
+
startupRunnerReadyResolvers.get(agent.aid)?.(instances);
|
|
477
|
+
trace.addSpan('daemon.agentRunnerActive', timing.startedAtMs, timing.completedAtMs, `aid=${agent.aid}; runner=${agent.baseagent}`, instances.length ? 'ok' : 'failed');
|
|
478
|
+
logger.info(`[startup] Active runner ${instances.length ? 'ready' : 'unavailable'}: aid=${agent.aid} baseagent=${agent.baseagent} duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
479
|
+
checkStartupTaskReady();
|
|
480
|
+
},
|
|
481
|
+
onAgentCreated: (agent, instances, timing) => {
|
|
482
|
+
runnerResultsByAgent.set(agent.aid, instances);
|
|
483
|
+
runnerSettledAgents.add(agent.aid);
|
|
484
|
+
startupRunnerInstances.set(agent.aid, instances);
|
|
485
|
+
refreshLoadedBaseagents();
|
|
486
|
+
resolveStartupOperation(agent.aid);
|
|
487
|
+
trace.addSpan('daemon.agentRunner', timing.startedAtMs, timing.completedAtMs, `aid=${agent.aid}; runners=${instances.map(instance => instance.baseagent).join(',') || 'none'}`, instances.length ? 'ok' : 'failed');
|
|
488
|
+
logger.info(`[startup] Agent runners ready: aid=${agent.aid} runners=${instances.length}`
|
|
489
|
+
+ ` duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
490
|
+
checkStartupTaskReady();
|
|
491
|
+
},
|
|
492
|
+
});
|
|
422
493
|
}).then(result => {
|
|
423
494
|
if (result.runtimeError) {
|
|
424
495
|
agentRuntimeState = 'error';
|
|
@@ -426,7 +497,8 @@ async function main() {
|
|
|
426
497
|
}
|
|
427
498
|
logger.info(`[startup] Agent runner batch complete: agents=${startupAgents.length}`
|
|
428
499
|
+ ` runners=${agentMap.size} duration=${Date.now() - startupRunnersStartedAtMs}ms`);
|
|
429
|
-
trace.
|
|
500
|
+
trace.setMeta('activeAgents', String(startupAgents.length));
|
|
501
|
+
trace.setMeta('runners', String(agentMap.size));
|
|
430
502
|
return result;
|
|
431
503
|
});
|
|
432
504
|
void startupRunnersPromise.catch(error => {
|
|
@@ -435,15 +507,19 @@ async function main() {
|
|
|
435
507
|
agentRuntimeError = message;
|
|
436
508
|
logger.error(`[startup] Agent runner batch failed: ${message}`);
|
|
437
509
|
for (const agent of startupAgents) {
|
|
438
|
-
if (!
|
|
439
|
-
agent.
|
|
440
|
-
|
|
510
|
+
if (!runnerSettledAgents.has(agent.aid)) {
|
|
511
|
+
if (!activeRunnerSettledAgents.has(agent.aid)) {
|
|
512
|
+
agent.status = 'error';
|
|
513
|
+
agent.error = message;
|
|
514
|
+
activeRunnerSettledAgents.add(agent.aid);
|
|
515
|
+
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
516
|
+
}
|
|
441
517
|
runnerSettledAgents.add(agent.aid);
|
|
442
|
-
runnerResultsByAgent.set(agent.aid, []);
|
|
443
|
-
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
518
|
+
runnerResultsByAgent.set(agent.aid, startupRunnerInstances.get(agent.aid) ?? []);
|
|
444
519
|
resolveStartupOperation(agent.aid);
|
|
445
520
|
}
|
|
446
521
|
}
|
|
522
|
+
checkStartupTaskReady();
|
|
447
523
|
});
|
|
448
524
|
// 交互路由器
|
|
449
525
|
const interactionRouter = new InteractionRouter();
|
|
@@ -464,11 +540,17 @@ async function main() {
|
|
|
464
540
|
trace.mark('daemon.channelCreate');
|
|
465
541
|
const channelLoader = new ChannelLoader(daemonCfg.debug, daemonCfg.aun?.defaultEncrypt);
|
|
466
542
|
await registerBuiltinChannelPlugins(channelLoader);
|
|
543
|
+
const connectionQueue = new StartupTaskQueue(2, 50);
|
|
544
|
+
const schedulerQueue = new StartupTaskQueue(2, 50);
|
|
545
|
+
channelLoader.setConnectionAdmission(instance => connectionQueue.run(() => instance.connect(), () => !startupCancelled && !instance.lifecycle?.signal.aborted));
|
|
546
|
+
daemonPluginLifecycle.defer(() => { connectionQueue.stop(); schedulerQueue.stop(); }, 'startup admission');
|
|
467
547
|
// Create channel instances: 每个 self-agent 各自的 channels
|
|
468
548
|
const evolagentInstances = [];
|
|
469
549
|
for (const agent of startupAgents) {
|
|
470
550
|
try {
|
|
471
|
-
const
|
|
551
|
+
const aun = await channelLoader.createAunForAgent(agent);
|
|
552
|
+
const external = await channelLoader.createExternalForAgent(agent);
|
|
553
|
+
const instances = [...aun, ...external];
|
|
472
554
|
channelInstancesByAgent.set(agent.aid, instances);
|
|
473
555
|
evolagentInstances.push(...instances);
|
|
474
556
|
bindStartupAgentChannels(agent, startupRunnerInstances.get(agent.aid) ?? []);
|
|
@@ -528,7 +610,9 @@ async function main() {
|
|
|
528
610
|
}
|
|
529
611
|
}
|
|
530
612
|
});
|
|
531
|
-
|
|
613
|
+
// ownerResolver.stop() 交给 daemon shutdown 在发出下线通知之后执行:信号回调
|
|
614
|
+
// 比 shutdown 先注册,在这里清空共识会让下线通知过不了出站准入。
|
|
615
|
+
onShutdown(() => { stopOwnerNotifications(); });
|
|
532
616
|
// 创建命令处理器
|
|
533
617
|
const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
|
|
534
618
|
cmdHandler.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
@@ -550,6 +634,14 @@ async function main() {
|
|
|
550
634
|
return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
|
|
551
635
|
}, primaryRunnerKey);
|
|
552
636
|
responseEngine.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
637
|
+
// A persisted session can use a standby backend even when the Agent's active
|
|
638
|
+
// backend is already ready. Wait for the actual session binding before lookup.
|
|
639
|
+
responseEngine.setRunnerReadiness(async (aid, baseagent) => {
|
|
640
|
+
if (!agentMap.has(`${aid}::${baseagent}`))
|
|
641
|
+
await startupOperationReady.get(aid);
|
|
642
|
+
if (startupCancelled)
|
|
643
|
+
throw new Error('Daemon is shutting down');
|
|
644
|
+
});
|
|
553
645
|
const processor = responseEngine;
|
|
554
646
|
configureRunnerCallbacks = instance => {
|
|
555
647
|
instance.agent.setCompactStartCallback?.((sessionId) => {
|
|
@@ -580,6 +672,7 @@ async function main() {
|
|
|
580
672
|
// 设置交互路由器
|
|
581
673
|
processor.setInteractionRouter(interactionRouter);
|
|
582
674
|
// 创建消息队列
|
|
675
|
+
const startupHintsReady = new Set();
|
|
583
676
|
const messageQueue = new MessageQueue(async (message) => {
|
|
584
677
|
const owner = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
585
678
|
if (owner)
|
|
@@ -590,6 +683,27 @@ async function main() {
|
|
|
590
683
|
}, {
|
|
591
684
|
persistencePath: daemonQueuePath(),
|
|
592
685
|
dedupPath: daemonMessageDedupPath(),
|
|
686
|
+
blockedReason: message => {
|
|
687
|
+
const aid = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
688
|
+
if (!aid || !startupRunnerReady.has(aid))
|
|
689
|
+
return;
|
|
690
|
+
if (!startupHintsReady.has(aid))
|
|
691
|
+
return 'startup observer hint registration';
|
|
692
|
+
const baseagent = message.baseagent || agentRegistry.get(aid)?.baseagent;
|
|
693
|
+
if (!activeRunnerSettledAgents.has(aid)
|
|
694
|
+
|| (baseagent && !agentMap.has(`${aid}::${baseagent}`) && !runnerSettledAgents.has(aid))) {
|
|
695
|
+
return 'Agent runner initialization';
|
|
696
|
+
}
|
|
697
|
+
const channelType = message.channelType || message.channel.split('#', 1)[0];
|
|
698
|
+
if (channelType !== 'aun' && channelType !== 'daemon') {
|
|
699
|
+
const transport = channelInstancesByAgent.get(aid)?.find(instance => instance.adapter.channelKey === message.channel || instance.adapter.channelName === message.channel);
|
|
700
|
+
if (transport && transport.channel.getStatus?.().connected !== true)
|
|
701
|
+
return 'channel transport initialization';
|
|
702
|
+
}
|
|
703
|
+
if (channelType === 'aun' && ownerResolver.snapshot(aid).consensusStatus === 'unavailable') {
|
|
704
|
+
return 'AUN authorization snapshot';
|
|
705
|
+
}
|
|
706
|
+
},
|
|
593
707
|
});
|
|
594
708
|
// 设置中断回调(精确中断正在处理的 agent)
|
|
595
709
|
messageQueue.setInterruptCallback(async (sessionKey, baseagent, evolagentName, reason = 'new_message', timeout, strict, target) => {
|
|
@@ -603,6 +717,8 @@ async function main() {
|
|
|
603
717
|
messageQueue.setEventBus(eventBus);
|
|
604
718
|
// Restore persisted input before Trigger schedulers start. Trigger-owned work
|
|
605
719
|
// is deliberately dropped here and reclaimed from active.json by its scheduler.
|
|
720
|
+
// Capture queued inputs before restorePersisted rewrites their snapshot.
|
|
721
|
+
await startupQueueCaptured;
|
|
606
722
|
messageQueue.restorePersisted(false);
|
|
607
723
|
const droppedTriggerSessionIds = new Set(messageQueue.consumeDroppedTriggerSessionIds());
|
|
608
724
|
// 进程退出时立即刷盘队列状态(防止 debounce 期间的消息丢失)
|
|
@@ -700,9 +816,8 @@ async function main() {
|
|
|
700
816
|
}
|
|
701
817
|
catch { }
|
|
702
818
|
const triggerStartupAgents = startupAgents;
|
|
703
|
-
const controlAid = daemonCfg.aid || '__daemon__';
|
|
704
819
|
const daemonTriggerOwner = {
|
|
705
|
-
aid:
|
|
820
|
+
aid: daemonTriggerAid,
|
|
706
821
|
originPeerId: controlAid,
|
|
707
822
|
baseagent: primaryAgent?.baseagent || 'codex',
|
|
708
823
|
projectPath: primaryAgent?.projectPath || process.cwd(),
|
|
@@ -775,7 +890,9 @@ async function main() {
|
|
|
775
890
|
await startupRunnerReady.get(agent.aid);
|
|
776
891
|
if (startupCancelled || agent.status === 'error' || agent.status === 'disabled')
|
|
777
892
|
return;
|
|
778
|
-
await triggerSchedulers.ensureStarted(agent.aid, () =>
|
|
893
|
+
await triggerSchedulers.ensureStarted(agent.aid, async () => {
|
|
894
|
+
await schedulerQueue.run(() => startTriggerScheduler(agent), () => !startupCancelled && agent.status !== 'disabled' && agent.status !== 'error');
|
|
895
|
+
});
|
|
779
896
|
};
|
|
780
897
|
const ensureDaemonTriggerSchedulerStarted = async () => {
|
|
781
898
|
const primaryRunners = primaryAgent ? await startupRunnerReady.get(primaryAgent.aid) : undefined;
|
|
@@ -783,8 +900,14 @@ async function main() {
|
|
|
783
900
|
return;
|
|
784
901
|
if (primaryAgent && (!primaryRunners?.length || primaryAgent.status === 'error'))
|
|
785
902
|
return;
|
|
786
|
-
await triggerSchedulers.ensureStarted(daemonTriggerOwner.aid, () =>
|
|
903
|
+
await triggerSchedulers.ensureStarted(daemonTriggerOwner.aid, async () => {
|
|
904
|
+
await schedulerQueue.run(() => startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }), () => !startupCancelled);
|
|
905
|
+
});
|
|
787
906
|
};
|
|
907
|
+
const startupTriggerReady = new Set();
|
|
908
|
+
const startupTriggerFailed = new Set();
|
|
909
|
+
const startupSessionsReady = new Set();
|
|
910
|
+
const startupTriggerPromises = new Map();
|
|
788
911
|
const defaultPolicy = createDefaultChannelPolicy();
|
|
789
912
|
processor.registerChannel(daemonChannel, defaultPolicy, { channelType: 'daemon' });
|
|
790
913
|
cmdHandler.registerAdapter(daemonChannel);
|
|
@@ -841,7 +964,10 @@ async function main() {
|
|
|
841
964
|
};
|
|
842
965
|
const registerChannelInstance = (inst) => {
|
|
843
966
|
registerChannelRuntimeInstance(inst, channelRuntimeDependencies);
|
|
967
|
+
// Initial instances are observed below; hot-loaded instances use the same entry.
|
|
968
|
+
channelConnectionRuntime?.observeChannel(inst);
|
|
844
969
|
};
|
|
970
|
+
let channelConnectionRuntime;
|
|
845
971
|
// ── 注册所有渠道实例 ──
|
|
846
972
|
trace.mark('daemon.channelRegister');
|
|
847
973
|
for (const inst of channelInstances) {
|
|
@@ -868,39 +994,42 @@ async function main() {
|
|
|
868
994
|
preloadChannelThreads(channelInstances, sessionManager);
|
|
869
995
|
const connectedChannels = new Set();
|
|
870
996
|
const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
|
|
997
|
+
const upmsg = daemonCfg.debug?.upmsg ?? true;
|
|
871
998
|
const { sendOnlineNoticeForChannel, trySendPendingRestartNotice, summarizeConnectedChannels, } = createChannelStartupNotifications({
|
|
872
999
|
channelInstances,
|
|
873
1000
|
agentRegistry,
|
|
874
1001
|
commandHandler: cmdHandler,
|
|
875
1002
|
connectedChannels,
|
|
876
1003
|
pendingFile,
|
|
877
|
-
upmsg
|
|
1004
|
+
upmsg,
|
|
878
1005
|
});
|
|
879
|
-
// ChannelLoader deliberately does not await onConnected. Keep the initial
|
|
880
|
-
// recovery promises so restored ordinary messages cannot start ahead of
|
|
881
|
-
// pending priority hints for the same session.
|
|
882
1006
|
const startupObserverRecoveries = [];
|
|
883
|
-
// handoff 启动恢复是否还在收集 hint。与"队列是否已放行"是两件事:
|
|
884
|
-
// 队列有超时兜底会提前放行,而恢复可能还在等渠道。
|
|
885
1007
|
let startupRecoveryPending = true;
|
|
886
|
-
// AUN 上下线系统提示(volatile)。系统行为,无配置开关。
|
|
887
1008
|
const lifecycleNotices = createLifecycleNoticeService({
|
|
1009
|
+
enabled: upmsg,
|
|
888
1010
|
channelInstances,
|
|
889
1011
|
resolveAgent: (channelKey, channelName) => agentRegistry.resolveByChannel(channelKey) ?? agentRegistry.resolveByChannel(channelName),
|
|
890
1012
|
});
|
|
891
|
-
|
|
1013
|
+
channelConnectionRuntime = createChannelConnectionRuntime({
|
|
892
1014
|
...channelRuntimeDependencies,
|
|
893
1015
|
channelInstances,
|
|
894
1016
|
connectedChannels,
|
|
895
1017
|
bootstrapService,
|
|
896
|
-
ensureTriggerSchedulerStarted,
|
|
897
1018
|
sendOnlineNoticeForChannel,
|
|
898
1019
|
sendLifecycleNoticeForChannel: instance => lifecycleNotices.online(instance),
|
|
899
1020
|
trySendPendingRestartNotice,
|
|
900
1021
|
sessionsDir: paths.sessionsDir,
|
|
901
|
-
startupObserverRecoveries,
|
|
902
1022
|
isStartupRecoveryPending: () => startupRecoveryPending,
|
|
1023
|
+
isCancelled: () => startupCancelled,
|
|
1024
|
+
refreshAunAuthorization: async (aid) => {
|
|
1025
|
+
const view = await ownerResolver.refresh(aid, { source: 'startup' });
|
|
1026
|
+
return view.consensusStatus !== 'unavailable';
|
|
1027
|
+
},
|
|
903
1028
|
});
|
|
1029
|
+
const { markChannelConnected, unregisterRuntimeChannel, queuePendingObserverHints } = channelConnectionRuntime;
|
|
1030
|
+
for (const instance of channelInstances)
|
|
1031
|
+
channelConnectionRuntime.observeChannel(instance);
|
|
1032
|
+
daemonPluginLifecycle.defer(() => channelConnectionRuntime?.stop(), 'channel startup followups');
|
|
904
1033
|
// Bind the per-HOME IPC endpoint before any AUN connection is attempted.
|
|
905
1034
|
// A failed bind (for example, a stale Windows named pipe) must abort startup
|
|
906
1035
|
// without creating a second AUN session that can kick the old daemon.
|
|
@@ -917,7 +1046,6 @@ async function main() {
|
|
|
917
1046
|
let pendingShutdownReason;
|
|
918
1047
|
let pendingShutdownTraceId;
|
|
919
1048
|
trace.mark('daemon.baseagentProbe');
|
|
920
|
-
baseagentSnapshot = await baseagentSnapshotPromise;
|
|
921
1049
|
refreshLoadedBaseagents();
|
|
922
1050
|
const getStatusSnapshot = () => {
|
|
923
1051
|
const now = Date.now();
|
|
@@ -982,6 +1110,26 @@ async function main() {
|
|
|
982
1110
|
getProcessOwners: processLevelOwners,
|
|
983
1111
|
getAgentRuntimeState: () => agentRuntimeState,
|
|
984
1112
|
getAgentRuntimeError: () => agentRuntimeError,
|
|
1113
|
+
getStartupProgress: () => ({
|
|
1114
|
+
phase: normalTaskState === 'failed' ? 'failed' : !discoveredStartupWork ? 'classifying' : normalTaskState === 'ready' ? 'ready'
|
|
1115
|
+
: priorityStartupGate.status === 'pending' ? 'recovering' : 'loading',
|
|
1116
|
+
priorityRelease: priorityStartupGate.status,
|
|
1117
|
+
optionalRelease: normalStartupGate.status,
|
|
1118
|
+
ecweb: startupEcwebState === 'waiting' && ecwebSupervisor?.status().enabled ? 'waiting'
|
|
1119
|
+
: startupEcwebState === 'failed' ? 'failed' : ecwebSupervisor?.status().state ?? 'disabled',
|
|
1120
|
+
agents: startupAgents.map(agent => ({
|
|
1121
|
+
aid: agent.aid, priority: discoveredStartupWork?.priorityAids.has(agent.aid) ?? false,
|
|
1122
|
+
runner: agentMap.has(`${agent.aid}::${agent.baseagent}`) ? 'ready'
|
|
1123
|
+
: activeRunnerSettledAgents.has(agent.aid) ? 'failed'
|
|
1124
|
+
: !discoveredStartupWork || (!discoveredStartupWork.priorityAids.has(agent.aid) && priorityStartupGate.status === 'pending') ? 'waiting' : 'starting',
|
|
1125
|
+
aun: channelInstancesByAgent.get(agent.aid)?.some(inst => inst.channelType === 'aun' && inst.channel.getStatus?.().connected === true) ?? false,
|
|
1126
|
+
recovery: startupHintsReady.has(agent.aid) && startupSessionsReady.has(agent.aid),
|
|
1127
|
+
trigger: startupTriggerFailed.has(agent.aid) ? 'failed' : startupTriggerReady.has(agent.aid) ? 'ready' : discoveredStartupWork?.triggerAids.has(agent.aid) ? 'recovering'
|
|
1128
|
+
: normalStartupGate.status === 'pending' ? 'waiting' : 'starting',
|
|
1129
|
+
})),
|
|
1130
|
+
triggers: { loaded: startupTriggerReady.size, total: startupAgents.length + 1,
|
|
1131
|
+
recovering: discoveredStartupWork?.triggerAids.size ?? 0 },
|
|
1132
|
+
}),
|
|
985
1133
|
daemonAid: daemonCfg.aid,
|
|
986
1134
|
getControlAidState: () => controlChannel?.getAidState(),
|
|
987
1135
|
getHost: () => hostProvider.getSnapshot().host,
|
|
@@ -1054,13 +1202,13 @@ async function main() {
|
|
|
1054
1202
|
setAgentRuntimeError: error => { agentRuntimeError = error; },
|
|
1055
1203
|
});
|
|
1056
1204
|
globalThis.__evolcore_hotLoadAgent = async (aid) => {
|
|
1057
|
-
await
|
|
1205
|
+
await startupOperationReady.get(aid);
|
|
1058
1206
|
if (startupCancelled)
|
|
1059
1207
|
throw new Error('Daemon is shutting down');
|
|
1060
1208
|
return agentRuntimeOperations.hotLoad(aid);
|
|
1061
1209
|
};
|
|
1062
1210
|
globalThis.__evolcore_resyncAgents = async () => {
|
|
1063
|
-
await Promise.all(
|
|
1211
|
+
await Promise.all(startupOperationReady.values());
|
|
1064
1212
|
if (startupCancelled)
|
|
1065
1213
|
throw new Error('Daemon is shutting down');
|
|
1066
1214
|
return agentRuntimeOperations.resync();
|
|
@@ -1188,206 +1336,339 @@ async function main() {
|
|
|
1188
1336
|
console.error('[EvolCore] ✓ Starting IPC server...');
|
|
1189
1337
|
await ipcServer.start();
|
|
1190
1338
|
console.error('[EvolCore] ✓ IPC server started');
|
|
1191
|
-
|
|
1192
|
-
trace.
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
|
|
1197
|
-
|
|
1198
|
-
|
|
1199
|
-
|
|
1200
|
-
|
|
1201
|
-
|
|
1202
|
-
|
|
1339
|
+
let stopReadinessObservers = () => { };
|
|
1340
|
+
const startupTaskRuntimePromise = trace.track('daemon.taskRuntimeStartup', async () => {
|
|
1341
|
+
// Let the main flow publish ready.signal and install shutdown first.
|
|
1342
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
1343
|
+
if (startupCancelled)
|
|
1344
|
+
return;
|
|
1345
|
+
// Control handlers only need the registered IPC/runtime services. Historical
|
|
1346
|
+
// work classification gates Agent admission, not the control transport.
|
|
1347
|
+
trace.point('daemon.controlChannel');
|
|
1348
|
+
controlChannel = startDaemonControlAid({
|
|
1349
|
+
daemonCfg,
|
|
1350
|
+
cmdHandler,
|
|
1351
|
+
bindService,
|
|
1352
|
+
diagService,
|
|
1353
|
+
getProcessOwners: getDaemonOwners,
|
|
1354
|
+
ecwebSupervisor,
|
|
1355
|
+
startupTrace: trace,
|
|
1356
|
+
waitForServices: waitForBackgroundStartup,
|
|
1357
|
+
connectChannel: channel => trace.track('daemon.controlChannelConnect', () => connectionQueue.run(() => channel.connect(), () => !startupCancelled)),
|
|
1358
|
+
onServiceProxyManager: manager => {
|
|
1359
|
+
const authorizeManagedOperation = createDelegationAuthorizer({
|
|
1360
|
+
agentDelegationRegistry,
|
|
1361
|
+
sessionManager,
|
|
1362
|
+
getProcessOwners: getDaemonOwners,
|
|
1363
|
+
});
|
|
1364
|
+
registerProxyIpcExecutor(ipcServer, {
|
|
1365
|
+
manager,
|
|
1366
|
+
authorizeManagedOperation,
|
|
1367
|
+
getSession: sessionId => sessionManager.getSessionById(sessionId),
|
|
1368
|
+
});
|
|
1369
|
+
},
|
|
1370
|
+
});
|
|
1371
|
+
const startupWork = await startupWorkPromise;
|
|
1372
|
+
if (startupCancelled)
|
|
1373
|
+
return;
|
|
1374
|
+
if (startupWork.sessionScanFailed) {
|
|
1375
|
+
// Exceptional compatibility fallback; healthy starts reuse asynchronous discovery.
|
|
1376
|
+
startupWork.pendingSessions = sessionManager.getPendingProcessingSessions();
|
|
1377
|
+
}
|
|
1378
|
+
// ── 连接所有渠道(后台首连,AUN/任意渠道故障不阻塞 daemon 主流程)──
|
|
1379
|
+
trace.point('daemon.channelConnectDispatch');
|
|
1380
|
+
logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
|
|
1381
|
+
const connectOptions = {
|
|
1382
|
+
concurrency: 2,
|
|
1383
|
+
// The shared queue already spaces control, Agent and external connections.
|
|
1384
|
+
intervalMs: 0,
|
|
1385
|
+
beforeConnect: async (instance) => {
|
|
1386
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1387
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1388
|
+
if (!owner)
|
|
1389
|
+
return !startupCancelled;
|
|
1390
|
+
// Transport and authenticated control messages do not require a model runner.
|
|
1391
|
+
return !startupCancelled && owner.status !== 'disabled';
|
|
1392
|
+
},
|
|
1393
|
+
shouldConnect: (instance) => {
|
|
1394
|
+
if (startupCancelled || !channelInstances.includes(instance))
|
|
1395
|
+
return false;
|
|
1396
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1397
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1398
|
+
return !owner || owner.status !== 'disabled';
|
|
1399
|
+
},
|
|
1400
|
+
onConnected: markChannelConnected,
|
|
1401
|
+
connect: (instance) => trace.track('daemon.channelConnect', () => connectionQueue.run(() => instance.connect(), () => !startupCancelled && channelInstances.includes(instance) && !instance.lifecycle?.signal.aborted), instance.adapter.channelName),
|
|
1402
|
+
onFailed: (inst, error) => {
|
|
1403
|
+
logger.warn(`[startup] ${inst.adapter.channelName} initial connect failed: ${error}`);
|
|
1404
|
+
},
|
|
1405
|
+
};
|
|
1406
|
+
const isPriorityChannel = (instance) => {
|
|
1407
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey);
|
|
1408
|
+
return !!owner && (startupWork.requiredExternalAids.has(owner.aid)
|
|
1409
|
+
|| startupWork.requiredChannelKeys.has(instance.adapter.channelKey)
|
|
1410
|
+
|| startupWork.requiredChannelKeys.has(instance.adapter.channelName));
|
|
1411
|
+
};
|
|
1412
|
+
// Partition outside connectAll's workers so a deferred channel cannot hold
|
|
1413
|
+
// a slot required by a recovering Agent. All groups share actual admission.
|
|
1414
|
+
const connectAfter = async (instances, gate) => {
|
|
1415
|
+
if (gate)
|
|
1416
|
+
await gate.promise;
|
|
1417
|
+
if (startupCancelled)
|
|
1418
|
+
return [];
|
|
1419
|
+
return channelLoader.connectAll(instances, connectOptions);
|
|
1420
|
+
};
|
|
1421
|
+
const aunInstances = channelInstances.filter(inst => inst.channelType === 'aun');
|
|
1422
|
+
const externalInstances = channelInstances.filter(inst => inst.channelType !== 'aun');
|
|
1423
|
+
const aunConnections = Promise.all([
|
|
1424
|
+
connectAfter(aunInstances.filter(inst => startupWork.priorityAids.has(agentRegistry.resolveByChannel(inst.adapter.channelKey)?.aid ?? ''))),
|
|
1425
|
+
connectAfter(aunInstances.filter(inst => !startupWork.priorityAids.has(agentRegistry.resolveByChannel(inst.adapter.channelKey)?.aid ?? '')), priorityStartupGate),
|
|
1426
|
+
]).then(groups => groups.flat());
|
|
1427
|
+
const externalConnections = Promise.all([
|
|
1428
|
+
connectAfter(externalInstances.filter(isPriorityChannel)),
|
|
1429
|
+
connectAfter(externalInstances.filter(inst => !isPriorityChannel(inst)), normalStartupGate),
|
|
1430
|
+
]).then(groups => groups.flat());
|
|
1431
|
+
const connectAllPromise = trace.track('daemon.channelConnectionsReady', () => Promise.all([aunConnections, externalConnections]).then(groups => groups.flat()));
|
|
1432
|
+
connectAllPromise.then((connected) => {
|
|
1433
|
+
const channelSummary = summarizeConnectedChannels(connected);
|
|
1434
|
+
logger.info(`✅ ${connected.length} channel(s) connected: ${channelSummary}`);
|
|
1435
|
+
eventBus.publish({
|
|
1436
|
+
type: 'system:started',
|
|
1437
|
+
channels: connected.map(c => c.toLowerCase()),
|
|
1438
|
+
timestamp: Date.now()
|
|
1439
|
+
});
|
|
1440
|
+
}).catch((e) => {
|
|
1441
|
+
logger.warn(`[startup] channel connection task failed unexpectedly: ${e}`);
|
|
1442
|
+
});
|
|
1443
|
+
// Single scheduler startup entry. Runner waits occur before bounded admission.
|
|
1444
|
+
trace.point('daemon.triggerSchedulerDispatch');
|
|
1445
|
+
void trace.track('daemon.triggerSchedulersReady', () => new Promise(resolve => setImmediate(resolve)).then(() => {
|
|
1446
|
+
const owners = [
|
|
1447
|
+
{ aid: daemonTriggerOwner.aid, start: ensureDaemonTriggerSchedulerStarted },
|
|
1448
|
+
...triggerStartupAgents.map(agent => ({ aid: agent.aid, start: () => ensureTriggerSchedulerStarted(agent) })),
|
|
1449
|
+
];
|
|
1450
|
+
for (const owner of owners) {
|
|
1451
|
+
const starting = trace.track('daemon.triggerSchedulerReady', async () => {
|
|
1452
|
+
if (!startupWork.triggerAids.has(owner.aid) && !await waitForBackgroundStartup())
|
|
1453
|
+
return;
|
|
1454
|
+
if (startupCancelled)
|
|
1455
|
+
return;
|
|
1456
|
+
await owner.start();
|
|
1457
|
+
if (triggerSchedulers.get(owner.aid))
|
|
1458
|
+
startupTriggerReady.add(owner.aid);
|
|
1459
|
+
checkStartupTaskReady();
|
|
1460
|
+
}, owner.aid).catch(e => {
|
|
1461
|
+
startupTriggerFailed.add(owner.aid);
|
|
1462
|
+
logger.warn(`[startup] trigger scheduler start failed for ${owner.aid}: ${e}`);
|
|
1463
|
+
checkStartupTaskReady();
|
|
1464
|
+
});
|
|
1465
|
+
startupTriggerPromises.set(owner.aid, starting);
|
|
1466
|
+
}
|
|
1467
|
+
return Promise.all(startupTriggerPromises.values()).then(() => {
|
|
1468
|
+
// scheduler 起来之后再采一次 session:idle trigger 身份:idle monitor 的
|
|
1469
|
+
// activate() 早于这里执行,那时列表还是空的。
|
|
1470
|
+
sessionIdleMonitor.refreshTriggerIdentities();
|
|
1471
|
+
});
|
|
1472
|
+
}));
|
|
1473
|
+
sessionIdleMonitor.activate();
|
|
1474
|
+
relationIdleMonitor.start();
|
|
1475
|
+
// 首轮 SDK 自动生成的会话名必须走与 `ec thread rename` 相同的出口:
|
|
1476
|
+
// 更新话题索引、落盘并给对端发 `topic.renamed`。只调 `renameSession` 的话,
|
|
1477
|
+
// 名字只在本地存活——对端看不到,话题索引也停在占位名上。
|
|
1478
|
+
// 必须放在 registerDaemonIpc 之后:系统消息发送器在那里才注册到 CommandHandler。
|
|
1479
|
+
responseEngine.setSessionTitleSyncer(async (session, newName) => {
|
|
1480
|
+
if ((session.channelType || session.channel.split('#', 1)[0]) !== 'aun')
|
|
1203
1481
|
return false;
|
|
1204
|
-
const
|
|
1205
|
-
|
|
1482
|
+
const selfAid = session.selfAID;
|
|
1483
|
+
const peer = session.channelId;
|
|
1484
|
+
if (!selfAid || !peer)
|
|
1206
1485
|
return false;
|
|
1207
|
-
|
|
1208
|
-
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
|
|
1486
|
+
const { ThreadService } = await import('./core/thread/thread-service.js');
|
|
1487
|
+
const { notifyThreadRename } = await import('./core/thread/thread-operation.js');
|
|
1488
|
+
const { sessionTopicThreadId } = await import('./core/thread/topic-id.js');
|
|
1489
|
+
const svc = new ThreadService(sessionManager);
|
|
1490
|
+
const threadId = sessionTopicThreadId(session) ?? '';
|
|
1491
|
+
try {
|
|
1492
|
+
const result = await svc.renameThread({ selfAid, peer, threadId, name: newName });
|
|
1493
|
+
await notifyThreadRename({
|
|
1494
|
+
selfAid,
|
|
1495
|
+
peer,
|
|
1496
|
+
threadId,
|
|
1497
|
+
result,
|
|
1498
|
+
threadService: svc,
|
|
1499
|
+
sendSystemMsg: cmdHandler.getThreadSystemMsgSender(),
|
|
1500
|
+
});
|
|
1501
|
+
return true;
|
|
1502
|
+
}
|
|
1503
|
+
catch (error) {
|
|
1504
|
+
// 主会话目录还没落盘(首轮尚未持久化)时没有可改的对象,退回纯本地改名。
|
|
1505
|
+
logger.debug(`[Daemon] session title sync skipped: ${error instanceof Error ? error.message : String(error)}`);
|
|
1212
1506
|
return false;
|
|
1213
|
-
|
|
1214
|
-
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1215
|
-
return !owner || owner.status === 'running';
|
|
1216
|
-
},
|
|
1217
|
-
onConnected: markChannelConnected,
|
|
1218
|
-
onFailed: (inst, error) => {
|
|
1219
|
-
logger.warn(`[startup] ${inst.adapter.channelName} initial connect failed: ${error}`);
|
|
1220
|
-
},
|
|
1221
|
-
});
|
|
1222
|
-
connectAllPromise.then((connected) => {
|
|
1223
|
-
const channelSummary = summarizeConnectedChannels(connected);
|
|
1224
|
-
logger.info(`✅ ${connected.length} channel(s) connected: ${channelSummary}`);
|
|
1225
|
-
eventBus.publish({
|
|
1226
|
-
type: 'system:started',
|
|
1227
|
-
channels: connected.map(c => c.toLowerCase()),
|
|
1228
|
-
timestamp: Date.now()
|
|
1507
|
+
}
|
|
1229
1508
|
});
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1239
|
-
|
|
1240
|
-
|
|
1241
|
-
|
|
1242
|
-
|
|
1243
|
-
|
|
1244
|
-
|
|
1245
|
-
|
|
1246
|
-
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
|
|
1509
|
+
// 统一 channel:health 跨通道通知(仅 auth_error)
|
|
1510
|
+
registerChannelHealthNotifications({ eventBus, channelInstances, agentRegistry });
|
|
1511
|
+
// Local recovery registration runs independently of transport and remote delivery.
|
|
1512
|
+
trace.point('daemon.handoffRecovery');
|
|
1513
|
+
const recoveryAids = triggerStartupAgents.map(agent => agent.aid);
|
|
1514
|
+
const recoverStartupQueue = async () => {
|
|
1515
|
+
await recoverStartupHandoffs({
|
|
1516
|
+
channelInstances,
|
|
1517
|
+
recoveryAids,
|
|
1518
|
+
agentRegistry,
|
|
1519
|
+
queuePendingObserverHints,
|
|
1520
|
+
startupObserverRecoveries,
|
|
1521
|
+
handoffRuntime,
|
|
1522
|
+
cleanupAgentHandoffs: async (aid, options) => {
|
|
1523
|
+
const snapshots = await handoffRuntime.prepareRecovery(aid, {
|
|
1524
|
+
...options, snapshots: startupWork.handoffSnapshots.get(aid),
|
|
1525
|
+
});
|
|
1526
|
+
startupWork.handoffSnapshots.delete(aid);
|
|
1527
|
+
return snapshots;
|
|
1528
|
+
},
|
|
1529
|
+
trace,
|
|
1530
|
+
setStartupRecoveryPending: value => { startupRecoveryPending = value; },
|
|
1531
|
+
onAgentHintsRecovered: aid => {
|
|
1532
|
+
startupHintsReady.add(aid);
|
|
1533
|
+
messageQueue.startRestored();
|
|
1534
|
+
checkStartupTaskReady();
|
|
1535
|
+
},
|
|
1536
|
+
beforeAgentRecovery: async (aid) => {
|
|
1537
|
+
if (!startupWork.priorityAids.has(aid))
|
|
1538
|
+
await priorityStartupGate.promise;
|
|
1539
|
+
},
|
|
1540
|
+
waitForNormalReady: async () => await taskReadyGate.promise === 'ready' && !startupCancelled,
|
|
1541
|
+
isCancelled: () => startupCancelled,
|
|
1542
|
+
});
|
|
1543
|
+
};
|
|
1544
|
+
void trace.track('daemon.handoffRecoveryComplete', recoverStartupQueue)
|
|
1545
|
+
.catch(error => logger.error('[Handoff] startup recovery coordinator failed:', error));
|
|
1546
|
+
trace.point('daemon.resumeSessions');
|
|
1547
|
+
void trace.track('daemon.resumeSessionsComplete', async () => {
|
|
1548
|
+
// Scheduler dispatch registers its promises in the next I/O turn.
|
|
1549
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
1550
|
+
await Promise.all(startupAgents.map(async (agent) => {
|
|
1551
|
+
const pendingSessions = startupWork.pendingSessions.filter(session => (session.selfAID || agentRegistry.resolveByChannel(session.channel)?.aid) === agent.aid);
|
|
1552
|
+
// Only an unfinished session explicitly bound to a standby backend needs
|
|
1553
|
+
// complete assembly. Idle Agents keep the active-runner Ready contract.
|
|
1554
|
+
if (pendingSessions.some(session => session.baseagent && session.baseagent !== agent.baseagent)) {
|
|
1555
|
+
await startupOperationReady.get(agent.aid);
|
|
1556
|
+
}
|
|
1557
|
+
else
|
|
1558
|
+
await startupRunnerReady.get(agent.aid);
|
|
1559
|
+
if (startupWork.triggerAids.has(agent.aid))
|
|
1560
|
+
await startupTriggerPromises.get(agent.aid);
|
|
1561
|
+
if (startupCancelled)
|
|
1562
|
+
return;
|
|
1563
|
+
resumePendingSessions({ sessionManager, messageQueue, droppedTriggerSessionIds, agentRegistry, agentMap,
|
|
1564
|
+
pendingSessions });
|
|
1565
|
+
startupSessionsReady.add(agent.aid);
|
|
1566
|
+
checkStartupTaskReady();
|
|
1567
|
+
}));
|
|
1568
|
+
// Stale marker cleanup is maintenance, not task admission.
|
|
1569
|
+
if (await waitForBackgroundStartup()) {
|
|
1570
|
+
for (const session of startupWork.staleSessions) {
|
|
1571
|
+
const current = await sessionManager.getSessionById(session.id);
|
|
1572
|
+
if (current?.processingState === session.processingState)
|
|
1573
|
+
sessionManager.clearProcessing(session.id);
|
|
1574
|
+
}
|
|
1575
|
+
}
|
|
1576
|
+
}).catch(error => logger.error(`[Resume] startup runner gate failed: ${error instanceof Error ? error.message : String(error)}`));
|
|
1577
|
+
// Normal ready observes the same gates as task consumption. Standby runners
|
|
1578
|
+
// and service publication continue on their own measured lifecycles.
|
|
1579
|
+
let taskReadinessSettled = false;
|
|
1580
|
+
const finishPriorityStartup = trace.startTask('daemon.priorityTaskReady');
|
|
1581
|
+
priorityStartupGate.releaseAfter(9_000, () => {
|
|
1582
|
+
logger.warn('[startup] Priority recovery still pending after 9s; admitting idle Agents and ECWeb without reporting Ready');
|
|
1257
1583
|
});
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1584
|
+
void priorityStartupGate.promise.then(outcome => {
|
|
1585
|
+
trace.setMeta('priorityRelease', outcome);
|
|
1586
|
+
finishPriorityStartup(outcome === 'ready' ? 'ok' : outcome === 'cancelled' ? 'cancelled' : 'skipped');
|
|
1587
|
+
});
|
|
1588
|
+
normalStartupGate.releaseAfter(30_000, () => {
|
|
1589
|
+
logger.warn('[startup] Normal Ready still pending after 30s; admitting optional startup in degraded mode');
|
|
1590
|
+
});
|
|
1591
|
+
checkStartupTaskReady = () => {
|
|
1592
|
+
if (startupCancelled || taskReadinessSettled)
|
|
1593
|
+
return;
|
|
1594
|
+
const agentStates = startupAgents.filter(agent => agent.status !== 'disabled').map(agent => {
|
|
1595
|
+
const runnerReady = agentMap.has(`${agent.aid}::${agent.baseagent}`);
|
|
1596
|
+
const aun = channelInstancesByAgent.get(agent.aid)?.find(instance => instance.channelType === 'aun');
|
|
1597
|
+
return { aid: agent.aid,
|
|
1598
|
+
runnerReady,
|
|
1599
|
+
runnerFailed: activeRunnerSettledAgents.has(agent.aid) && !runnerReady,
|
|
1600
|
+
aunReady: aun?.channel.getStatus?.().connected === true,
|
|
1601
|
+
recoveryReady: startupHintsReady.has(agent.aid) && startupSessionsReady.has(agent.aid),
|
|
1602
|
+
authorizationReady: ownerResolver.snapshot(agent.aid).consensusStatus !== 'unavailable',
|
|
1603
|
+
};
|
|
1274
1604
|
});
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1605
|
+
const controlAunReady = !daemonCfg.aid || controlChannel?.getStatus().connected === true;
|
|
1606
|
+
const priorityState = startupTaskReadiness({ ipcReady: true, controlAunReady,
|
|
1607
|
+
agents: agentStates.filter(agent => startupWork.priorityAids.has(agent.aid)) });
|
|
1608
|
+
const triggersReady = [...startupWork.triggerAids].every(aid => startupTriggerReady.has(aid));
|
|
1609
|
+
const priorityChannelsReady = externalInstances.filter(inst => startupWork.requiredChannelKeys.has(inst.adapter.channelKey) || startupWork.requiredChannelKeys.has(inst.adapter.channelName))
|
|
1610
|
+
.every(inst => inst.channel.getStatus?.().connected === true);
|
|
1611
|
+
const triggerRecoveryFailed = [...startupWork.triggerAids].some(aid => startupTriggerFailed.has(aid));
|
|
1612
|
+
if (priorityState === 'failed' || triggerRecoveryFailed)
|
|
1613
|
+
priorityStartupGate.settle('failed');
|
|
1614
|
+
else if (priorityState === 'ready' && triggersReady && priorityChannelsReady)
|
|
1615
|
+
priorityStartupGate.settle('ready');
|
|
1616
|
+
let state = startupTaskReadiness({
|
|
1617
|
+
ipcReady: true, // Registered handlers, bound endpoint and ready.signal above.
|
|
1618
|
+
controlAunReady,
|
|
1619
|
+
agents: agentStates,
|
|
1279
1620
|
});
|
|
1280
|
-
|
|
1621
|
+
if (triggerRecoveryFailed)
|
|
1622
|
+
state = 'failed';
|
|
1623
|
+
if (state === 'ready' && (!triggersReady || !priorityChannelsReady))
|
|
1624
|
+
state = 'pending';
|
|
1625
|
+
if (state === 'pending')
|
|
1626
|
+
return;
|
|
1627
|
+
normalTaskState = state;
|
|
1628
|
+
taskReadinessSettled = true;
|
|
1629
|
+
taskReadyGate.settle(state);
|
|
1630
|
+
normalStartupGate.settle(state);
|
|
1631
|
+
if (state === 'ready') {
|
|
1632
|
+
trace.tasksReady();
|
|
1633
|
+
void startupCpuProfile?.stop('task-ready');
|
|
1634
|
+
logger.info(`[startup] Tasks ready: activeAgents=${startupAgents.length} duration=${Date.now() - trace.startedAtMs}ms`);
|
|
1635
|
+
}
|
|
1636
|
+
else {
|
|
1637
|
+
void startupCpuProfile?.stop('startup-failed');
|
|
1638
|
+
logger.warn(`[startup] Tasks unavailable: ${triggerRecoveryFailed ? 'unfinished Trigger recovery failed' : 'an active Agent runner failed'}`);
|
|
1639
|
+
}
|
|
1640
|
+
settleStartupTaskReady(state === 'ready' ? 'ok' : 'failed');
|
|
1641
|
+
stopReadinessObservers();
|
|
1642
|
+
};
|
|
1643
|
+
const stopOwnerReadinessObserver = ownerResolver.onUpdate(checkStartupTaskReady);
|
|
1644
|
+
const stopChannelReadinessObserver = eventBus.subscribe('channel:connected', checkStartupTaskReady);
|
|
1645
|
+
const stopControlReadinessObserver = controlChannel?.onTransportState(checkStartupTaskReady);
|
|
1646
|
+
stopReadinessObservers = () => {
|
|
1647
|
+
stopOwnerReadinessObserver();
|
|
1648
|
+
stopChannelReadinessObserver();
|
|
1649
|
+
stopControlReadinessObserver?.();
|
|
1650
|
+
};
|
|
1651
|
+
daemonPluginLifecycle.defer(stopReadinessObservers, 'startup task readiness');
|
|
1652
|
+
checkStartupTaskReady();
|
|
1281
1653
|
});
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1287
|
-
|
|
1288
|
-
|
|
1289
|
-
const selfAid = session.selfAID;
|
|
1290
|
-
const peer = session.channelId;
|
|
1291
|
-
if (!selfAid || !peer)
|
|
1292
|
-
return false;
|
|
1293
|
-
const { ThreadService } = await import('./core/thread/thread-service.js');
|
|
1294
|
-
const { notifyThreadRename } = await import('./core/thread/thread-operation.js');
|
|
1295
|
-
const { sessionTopicThreadId } = await import('./core/thread/topic-id.js');
|
|
1296
|
-
const svc = new ThreadService(sessionManager);
|
|
1297
|
-
const threadId = sessionTopicThreadId(session) ?? '';
|
|
1298
|
-
try {
|
|
1299
|
-
const result = await svc.renameThread({ selfAid, peer, threadId, name: newName });
|
|
1300
|
-
await notifyThreadRename({
|
|
1301
|
-
selfAid,
|
|
1302
|
-
peer,
|
|
1303
|
-
threadId,
|
|
1304
|
-
result,
|
|
1305
|
-
threadService: svc,
|
|
1306
|
-
sendSystemMsg: cmdHandler.getThreadSystemMsgSender(),
|
|
1307
|
-
});
|
|
1308
|
-
return true;
|
|
1309
|
-
}
|
|
1310
|
-
catch (error) {
|
|
1311
|
-
// 主会话目录还没落盘(首轮尚未持久化)时没有可改的对象,退回纯本地改名。
|
|
1312
|
-
logger.debug(`[Daemon] session title sync skipped: ${error instanceof Error ? error.message : String(error)}`);
|
|
1313
|
-
return false;
|
|
1314
|
-
}
|
|
1654
|
+
void startupTaskRuntimePromise.catch(error => {
|
|
1655
|
+
normalTaskState = 'failed';
|
|
1656
|
+
priorityStartupGate.settle('failed');
|
|
1657
|
+
normalStartupGate.settle('failed');
|
|
1658
|
+
taskReadyGate.settle('failed');
|
|
1659
|
+
settleStartupTaskReady('failed');
|
|
1660
|
+
logger.error('[startup] Task runtime dispatch failed:', error);
|
|
1315
1661
|
});
|
|
1316
|
-
// 统一 channel:health 跨通道通知(仅 auth_error)
|
|
1317
|
-
registerChannelHealthNotifications({ eventBus, channelInstances, agentRegistry });
|
|
1318
|
-
// Trigger scheduler 已在队列恢复之后启动;这里只协调其余持久化工作。
|
|
1319
|
-
// runnableAgents() only returns pre-start `stopped` agents. Reuse the stable
|
|
1320
|
-
// startup snapshot because channel connection may already mark them running.
|
|
1321
|
-
//
|
|
1322
|
-
// handoff 清理与恢复都不在就绪判据里:它们只影响历史 handoff 的到期回收和
|
|
1323
|
-
// 队列兑现,控制面(IPC + 已注册的 handler)在此期间已完全可用。
|
|
1324
|
-
// 重启前读回的队列消息由 releaseRestoredQueue 放行(等 hint 恢复 + 渠道首连,
|
|
1325
|
-
// 最多 30s 兜底),所以提前宣告 ready 不会让排队消息抢跑。
|
|
1326
|
-
trace.mark('daemon.handoffRecovery');
|
|
1327
|
-
const recoveryAids = triggerStartupAgents.map(agent => agent.aid);
|
|
1328
|
-
// TTL 清理是纯本地 I/O,不依赖任何渠道:直接并发跑,不要挂在 connectAllPromise 后面。
|
|
1329
|
-
// 挂在后面意味着网关宕机/认证退避期间过期 handoff 永远回收不掉,而这正是它要解决的问题。
|
|
1330
|
-
void cleanupStartupHandoffs(recoveryAids, handoffRuntime)
|
|
1331
|
-
.catch(error => logger.error('[Handoff] startup TTL cleanup failed:', error));
|
|
1332
|
-
// 队列放行要等 observer hint 恢复完:hint 是同一 session 的优先提示,先放行
|
|
1333
|
-
// 普通消息会让恢复出的回复抢到提示前面。hint 恢复本身不依赖渠道连上,
|
|
1334
|
-
// 所以这个信号不会被"某条通道卡住"拖住。
|
|
1335
|
-
let markStartupHintsRecovered = () => { };
|
|
1336
|
-
const startupHintsRecovered = new Promise(resolve => { markStartupHintsRecovered = resolve; });
|
|
1337
|
-
const recoverStartupQueue = async () => {
|
|
1338
|
-
await recoverStartupHandoffs({
|
|
1339
|
-
channelInstances,
|
|
1340
|
-
recoveryAids,
|
|
1341
|
-
agentRegistry,
|
|
1342
|
-
queuePendingObserverHints,
|
|
1343
|
-
startupObserverRecoveries,
|
|
1344
|
-
handoffRuntime,
|
|
1345
|
-
setStartupRecoveryPending: value => { startupRecoveryPending = value; },
|
|
1346
|
-
onStartupHintsRecovered: () => markStartupHintsRecovered(),
|
|
1347
|
-
});
|
|
1348
|
-
};
|
|
1349
|
-
void connectAllPromise
|
|
1350
|
-
.then(recoverStartupQueue, recoverStartupQueue)
|
|
1351
|
-
.catch(error => logger.error('[Handoff] startup recovery coordinator failed:', error));
|
|
1352
|
-
// 队列放行独立于 handoff 兑现:正常情况下等 hint 恢复完 + 渠道首连结束,
|
|
1353
|
-
// 超时则先放行。详见 releaseRestoredQueue 的注释——connectAll 没有总时限,
|
|
1354
|
-
// 不能让它决定重启前消息的命运。
|
|
1355
|
-
void releaseRestoredQueue({
|
|
1356
|
-
channelConnectSettled: Promise.all([startupHintsRecovered, connectAllPromise]),
|
|
1357
|
-
pendingCount: () => messageQueue.getTotalQueueLength(),
|
|
1358
|
-
startRestoredQueue: () => messageQueue.startRestored(),
|
|
1359
|
-
}).catch(error => logger.error('[Queue] restored queue release failed:', error));
|
|
1360
|
-
trace.mark('daemon.resumeSessions');
|
|
1361
|
-
void startupRunnersPromise.then(() => {
|
|
1362
|
-
if (startupCancelled)
|
|
1363
|
-
return;
|
|
1364
|
-
resumePendingSessions({ sessionManager, messageQueue, droppedTriggerSessionIds, agentRegistry, agentMap });
|
|
1365
|
-
}).catch(error => logger.error(`[Resume] startup runner gate failed: ${error instanceof Error ? error.message : String(error)}`));
|
|
1366
1662
|
trace.mark('daemon.cpuTracking');
|
|
1367
1663
|
ipcServer.startCpuTracking();
|
|
1368
|
-
// IPC
|
|
1369
|
-
// registered, so the ready signal can safely expose the control plane.
|
|
1370
|
-
//
|
|
1371
|
-
// 就绪判据 = 控制面可用(IPC 已绑定、命令/菜单 handler 已注册、trigger
|
|
1372
|
-
// scheduler 已启动、channel 实例已在后台连接),不包含以下几类"历史数据整理":
|
|
1373
|
-
// - handoff 到期回收 / 启动恢复(见上方 recoverStartupQueue,后台继续)
|
|
1374
|
-
// - ecweb 代理(由 daemon 监督,独立生命周期)
|
|
1375
|
-
// - 各渠道首次连接的完成(连不上会记 WARN,不影响控制面)
|
|
1376
|
-
// 这些工作过去排在 ready 之前,任一环节变慢(例如 handoff 目录里堆了上百个
|
|
1377
|
-
// 快照、某条 AUN 通道认证退避)都会把 CLI 的 30s 等待顶穿,报出"启动失败"
|
|
1378
|
-
// 的红叉,而 daemon 其实几十秒后自己就绪了。
|
|
1379
|
-
//
|
|
1380
|
-
// 代价:ready 之后的一小段时间里,历史 handoff 尚未恢复完、被延后的排队消息
|
|
1381
|
-
// 尚未启动。此时 IPC 接受的命令照常执行,但依赖"重启前未完成的 handoff 已回填"
|
|
1382
|
-
// 的逻辑(例如 `ec handoff list` 看到待兑现项)可能短暂看不到恢复结果。
|
|
1664
|
+
// IPC status is available while work classification and task recovery continue.
|
|
1383
1665
|
trace.mark('daemon.readySignal');
|
|
1384
1666
|
const readySignalPath = resolvePaths().readySignal;
|
|
1385
1667
|
fs.writeFileSync(readySignalPath, String(Date.now()));
|
|
1386
1668
|
logger.info(`✓ Ready signal written: ${readySignalPath}`);
|
|
1387
|
-
// 甘特图记录在写 ready 之后落盘:此时各阶段都已闭合。
|
|
1388
1669
|
trace.setMeta('channelInstances', String(channelInstances.length));
|
|
1389
1670
|
trace.setMeta('agents', String(agentRegistry.list().length));
|
|
1390
|
-
trace.
|
|
1671
|
+
trace.ready();
|
|
1391
1672
|
// 配置 reload 走 IPC `evolagent.reload` 触发,不再用 watchFile。
|
|
1392
1673
|
// 双 rename 原子写下 watchFile 的语义会被破坏,且新结构有 N 个 config.json 要监控;
|
|
1393
1674
|
// 显式触发更可控。
|
|
@@ -1397,6 +1678,7 @@ async function main() {
|
|
|
1397
1678
|
beginShutdown: () => lifecycleNotices.beginShutdown(),
|
|
1398
1679
|
sendOffline: signal => lifecycleNotices.sendOffline(signal),
|
|
1399
1680
|
},
|
|
1681
|
+
stopOwnership: () => ownerResolver.stop(),
|
|
1400
1682
|
ipcServer,
|
|
1401
1683
|
readySignalPath,
|
|
1402
1684
|
bindService,
|
|
@@ -1415,12 +1697,26 @@ async function main() {
|
|
|
1415
1697
|
startupRunners: Promise.allSettled([startupRunnersPromise, startupAgentRuntimePromise]),
|
|
1416
1698
|
cancelStartup: () => {
|
|
1417
1699
|
startupCancelled = true;
|
|
1700
|
+
priorityStartupGate.settle('cancelled');
|
|
1701
|
+
normalStartupGate.settle('cancelled');
|
|
1702
|
+
taskReadyGate.settle('cancelled');
|
|
1703
|
+
void startupCpuProfile?.stop('shutdown');
|
|
1704
|
+
stopReadinessObservers();
|
|
1705
|
+
settleStartupTaskReady('cancelled');
|
|
1706
|
+
connectionQueue.stop();
|
|
1707
|
+
schedulerQueue.stop();
|
|
1708
|
+
channelConnectionRuntime?.stop();
|
|
1418
1709
|
for (const aid of startupRunnerReady.keys()) {
|
|
1419
1710
|
startupRunnerReadyResolvers.get(aid)?.([]);
|
|
1420
1711
|
startupOperationReadyResolvers.get(aid)?.([]);
|
|
1421
1712
|
}
|
|
1422
1713
|
},
|
|
1423
|
-
|
|
1714
|
+
// Control AUN is created in a background I/O turn. Resolve it
|
|
1715
|
+
// at shutdown time rather than capturing the initial undefined value.
|
|
1716
|
+
controlChannel: {
|
|
1717
|
+
prepareShutdown: () => controlChannel?.prepareShutdown(),
|
|
1718
|
+
disconnect: () => controlChannel?.disconnect(),
|
|
1719
|
+
},
|
|
1424
1720
|
sessionManager,
|
|
1425
1721
|
removeAll,
|
|
1426
1722
|
exit: code => process.exit(code),
|
|
@@ -1462,10 +1758,11 @@ async function main() {
|
|
|
1462
1758
|
// 仅在直接执行时启动;导入此模块(如单元测试)时不触发 main()。
|
|
1463
1759
|
import { isMainScript, onShutdown } from './utils/cross-platform.js';
|
|
1464
1760
|
if (isMainScript(import.meta.url)) {
|
|
1465
|
-
main().catch((error) => {
|
|
1761
|
+
main().catch(async (error) => {
|
|
1466
1762
|
const msg = `Fatal error: ${error?.stack || error}`;
|
|
1467
1763
|
logger.error('Fatal error:', error);
|
|
1468
1764
|
console.error(msg); // ensure it lands in stdout.log for self-heal diagnostics
|
|
1765
|
+
await startupCpuProfile?.stop('startup-failed');
|
|
1469
1766
|
process.exit(1);
|
|
1470
1767
|
});
|
|
1471
1768
|
}
|