evolcore 0.0.43-test.6 → 0.0.43-test.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +48 -0
- package/bin/ecmsg.js +171 -54
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/codex/app-server-client.js +22 -0
- package/dist/agents/codex-runner.js +69 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/channels/aun.js +234 -21
- package/dist/cli/agent-create.js +2 -2
- package/dist/cli/daemon-commands.js +6 -66
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +35 -2
- package/dist/cli/events-command.js +73 -0
- package/dist/cli/index.js +31 -14
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/restart-monitor.js +45 -47
- package/dist/cli/services-command.js +111 -0
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +6 -2
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +0 -7
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/schema-migration.js +6 -1
- package/dist/config-store.js +2 -1
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +104 -10
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-catalog.js +20 -0
- package/dist/core/baseagent-loader.js +60 -130
- package/dist/core/channel-loader.js +10 -1
- package/dist/core/channel-runtime.js +4 -3
- package/dist/core/command/agent-control.js +1 -1
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +53 -11
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +338 -0
- package/dist/core/command/menu-catalog.js +8 -0
- package/dist/core/command/menu-handler.js +198 -84
- package/dist/core/command/menu-protocol.js +60 -11
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +8 -5
- package/dist/core/daemon-lifecycle.js +132 -73
- package/dist/core/handoff/runtime.js +3 -3
- package/dist/core/invoke/executors/index.js +13 -0
- package/dist/core/invoke/executors/media.js +283 -0
- package/dist/core/invoke/executors/text.js +198 -0
- package/dist/core/invoke/invoke-service.js +157 -0
- package/dist/core/invoke/style-router.js +48 -0
- package/dist/core/invoke/types.js +19 -0
- package/dist/core/ipc-registration.js +46 -7
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +147 -17
- package/dist/core/message/im-renderer.js +28 -84
- package/dist/core/message/message-bridge.js +4 -0
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/response-engine.js +157 -54
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +43 -5
- package/dist/core/ownership/owner-resolver.js +7 -0
- package/dist/core/permission/ec-command-parser.js +3 -2
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +2 -3
- package/dist/core/task/task-recovery-service.js +13 -2
- package/dist/core/thread/command-parser.js +9 -2
- package/dist/core/thread/thread-operation.js +21 -2
- package/dist/core/thread/thread-route.js +13 -2
- package/dist/directory/owner-directory-admission.js +40 -53
- package/dist/directory/owner-directory-cache.js +89 -113
- package/dist/directory/owner-directory-query-operation.js +8 -10
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +6 -2
- package/dist/ecweb/runtime/supervisor.js +19 -4
- package/dist/event-center/admission-materializer.js +114 -0
- package/dist/event-center/bus-gate.js +136 -0
- package/dist/event-center/bus-host.js +290 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +100 -0
- package/dist/event-center/client-factory.js +50 -0
- package/dist/event-center/daemon.js +45 -0
- package/dist/event-center/directory-source.js +53 -0
- package/dist/event-center/dispatcher.js +157 -0
- package/dist/event-center/event-log.js +110 -0
- package/dist/event-center/index-generator.js +63 -0
- package/dist/event-center/ipc-operation.js +308 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +202 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +238 -0
- package/dist/event-center/runtime.js +641 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +35 -0
- package/dist/event-center/validation.js +413 -0
- package/dist/index.js +285 -99
- package/dist/ipc.js +66 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +5 -1
- package/dist/proxy/service-supervisor.js +13 -4
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/modes/single-session/index.js +1 -1
- package/dist/services/dispatcher.js +100 -0
- package/dist/services/idempotency.js +90 -0
- package/dist/services/identity.js +52 -0
- package/dist/services/index-generator.js +70 -0
- package/dist/services/index.js +449 -0
- package/dist/services/ipc-operation.js +458 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +204 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +95 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +18 -0
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/script-sandbox.js +118 -22
- package/dist/utils/cross-platform.js +24 -10
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/process-introspect.js +45 -9
- package/dist/utils/startup-trace.js +74 -37
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +7 -14
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +2 -0
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/event-center.md +207 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +3 -2
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-protocol.md +21 -0
- package/kits/docs/evolcore/msg.md +15 -3
- package/kits/docs/evolcore/provider.md +3 -1
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +277 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/eck_manifest.json +26 -0
- package/kits/rules/02-navigation.md +10 -1
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/personal-assistant/SKILL.md +6 -6
- package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
- package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
- package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
- package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/reply.md +0 -5
- package/kits/templates/system-fragments/thread.md +10 -8
- package/package.json +3 -5
- package/dist/cli/pa-workspace-command.js +0 -225
- package/dist/core/command/pa-workspace-store.js +0 -468
- package/dist/core/relation/pa-team.js +0 -132
- package/kits/docs/evolcore/pa-workspace.md +0 -51
- package/kits/skills/aid-ability/SKILL.md +0 -244
- package/kits/skills/ec-ability/SKILL.md +0 -67
- package/kits/skills/ec-ability/references/workflows.md +0 -15
package/dist/index.js
CHANGED
|
@@ -39,7 +39,7 @@ import { buildEnvelope } from './core/message/message-utils.js';
|
|
|
39
39
|
import { ResponseEngine } from './core/message/response-engine.js';
|
|
40
40
|
import { MessageQueue } from './core/message/message-queue.js';
|
|
41
41
|
import { MessageBridge } from './core/message/message-bridge.js';
|
|
42
|
-
import { readFastaunVersion, readInstalledEvolcoreVersion, reportEvolcoreStartup, } from './utils/evolcore-version.js';
|
|
42
|
+
import { readFastaunVersion, readInstalledEvolcoreVersion, createEvolcoreStartupDiagnostics, reportEvolcoreStartup, } from './utils/evolcore-version.js';
|
|
43
43
|
import { recoverAllRoleMutationsSync } from './core/command/role-menu.js';
|
|
44
44
|
import { HandoffRuntime } from './core/handoff/runtime.js';
|
|
45
45
|
import { startDaemonControlAid } from './core/daemon-control.js';
|
|
@@ -75,7 +75,7 @@ import { createIpcStatusProvider, registerDaemonIpc } from './core/ipc-registrat
|
|
|
75
75
|
import { AgentLoader } from './core/baseagent-loader.js';
|
|
76
76
|
import { PluginHandle } from './core/plugin-lifecycle.js';
|
|
77
77
|
import { EvolAgentRegistry } from './core/evolagent-registry.js';
|
|
78
|
-
import { createAgentInitializationRuntime, createAgentReloadRuntime, createAgentRuntimeOperations, createStartupAgentRunners, completeStartupAgentRuntime, bindAgentCreationOwner, loadStartupAgentRegistry, recoverIncompleteAgentInitializations, } from './core/agent-runtime.js';
|
|
78
|
+
import { createAgentInitializationRuntime, createOnDemandAgentRunners, 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
81
|
import { StartupTracer, startRequestedStartupCpuProfile } from './utils/startup-trace.js';
|
|
@@ -89,6 +89,7 @@ import { TriggerScriptExecutor } from './trigger/script-executor.js';
|
|
|
89
89
|
import { authenticatedTriggerActor as authenticateTriggerActor, authenticatedTriggerActorFromGrant, authorizeTriggerExecution as authorizeTriggerRun, validateTriggerDefinitionForActor as validateTriggerActorDefinition, validateTriggerFeedbackChannels as validateTriggerFeedbackChannelBindings, } from './trigger/authorization.js';
|
|
90
90
|
import { TargetSessionLockRegistry } from './trigger/session-lock.js';
|
|
91
91
|
import { buildTriggerScheduler, createTriggerChannelResolver, TriggerSchedulerRegistry } from './trigger/application-service.js';
|
|
92
|
+
import { createDaemonEventCenter } from './event-center/daemon.js';
|
|
92
93
|
import { DaemonChannel } from './channels/daemon.js';
|
|
93
94
|
import { DAEMON_RUNTIME_EPOCH_ENV, ensureProcessManagedTempDir } from './cli/task-context.js';
|
|
94
95
|
import fs from 'fs';
|
|
@@ -96,6 +97,9 @@ import crypto from 'crypto';
|
|
|
96
97
|
import { getBaseagentSnapshot, loadedBaseagentIds } from './agents/baseagent-availability.js';
|
|
97
98
|
import { createHostSnapshotProvider } from './core/host-snapshot.js';
|
|
98
99
|
import { queryStatusActivity, queryStatusActivityByAgent } from './stats/query.js';
|
|
100
|
+
import { TeamWorkspaceManagementService } from './core/command/team-workspace-management.js';
|
|
101
|
+
import { TeamWorkspaceBootstrapService } from './core/command/team-workspace-bootstrap.js';
|
|
102
|
+
import { peekServiceRouter } from './services/index.js';
|
|
99
103
|
export { resolvePersistedRestartDelivery } from './core/message/outbound.js';
|
|
100
104
|
export function readEvolcoreVersion() {
|
|
101
105
|
return readInstalledEvolcoreVersion();
|
|
@@ -107,6 +111,7 @@ async function main() {
|
|
|
107
111
|
// 没传说明是 restart-monitor 或其它途径拉起的,自己生成一个。
|
|
108
112
|
const trace = new StartupTracer('daemon', {
|
|
109
113
|
firstPhase: 'daemon.bootstrap',
|
|
114
|
+
initialPhase: 'running',
|
|
110
115
|
});
|
|
111
116
|
trace.setMeta('launchedBy', process.env.EVOLCORE_LAUNCHED_BY || 'start');
|
|
112
117
|
trace.setMeta('node', process.version);
|
|
@@ -115,8 +120,11 @@ async function main() {
|
|
|
115
120
|
// Service managers do not necessarily export TMPDIR. Establish the private
|
|
116
121
|
// managed root before any runner or task runtime is initialized.
|
|
117
122
|
ensureProcessManagedTempDir();
|
|
118
|
-
|
|
119
|
-
|
|
123
|
+
const buildDiagnostics = createEvolcoreStartupDiagnostics(import.meta.url);
|
|
124
|
+
void trace.track('daemon.versionReport', () => reportEvolcoreStartup(import.meta.url, message => logger.info(message), buildDiagnostics), undefined, { initialPhase: 'running' }).catch(error => {
|
|
125
|
+
buildDiagnostics.state = 'unavailable';
|
|
126
|
+
logger.warn(`[Build] startup diagnostics unavailable: ${error instanceof Error ? error.message : String(error)}`);
|
|
127
|
+
});
|
|
120
128
|
trace.mark('daemon.sdkFilter');
|
|
121
129
|
installChannelSdkConsoleFilter();
|
|
122
130
|
console.error('[EvolCore] ✓ Console filter installed');
|
|
@@ -147,7 +155,7 @@ async function main() {
|
|
|
147
155
|
// pre-check:发现已有活 main 直接退出,避免起任何副作用
|
|
148
156
|
trace.mark('daemon.instancePreCheck');
|
|
149
157
|
{
|
|
150
|
-
const pre = scanInstances();
|
|
158
|
+
const pre = scanInstances({ kind: 'main', includeAidActivity: false });
|
|
151
159
|
const aliveOthers = pre.mains.filter(m => m.alive && m.record.pid !== process.pid);
|
|
152
160
|
if (aliveOthers.length > 0) {
|
|
153
161
|
const pids = aliveOthers.map(m => m.record.pid).join(', ');
|
|
@@ -249,6 +257,7 @@ async function main() {
|
|
|
249
257
|
const bindBootstrapMode = process.env.EVOLCORE_BIND_BOOTSTRAP === '1';
|
|
250
258
|
const paths = resolvePaths();
|
|
251
259
|
let startupCancelled = false;
|
|
260
|
+
let cancelStartupClassification = () => { };
|
|
252
261
|
let normalTaskState = 'pending';
|
|
253
262
|
let startupEcwebState = 'waiting';
|
|
254
263
|
const priorityStartupGate = new StartupGate();
|
|
@@ -258,6 +267,7 @@ async function main() {
|
|
|
258
267
|
const waitForBackgroundStartup = async () => await normalStartupGate.promise !== 'cancelled' && !startupCancelled;
|
|
259
268
|
onShutdown(() => {
|
|
260
269
|
startupCancelled = true;
|
|
270
|
+
cancelStartupClassification();
|
|
261
271
|
priorityStartupGate.settle('cancelled');
|
|
262
272
|
normalStartupGate.settle('cancelled');
|
|
263
273
|
taskReadyGate.settle('cancelled');
|
|
@@ -301,14 +311,18 @@ async function main() {
|
|
|
301
311
|
}
|
|
302
312
|
});
|
|
303
313
|
onShutdown(removeEcwebConfigListener);
|
|
304
|
-
void trace.track('daemon.ecwebLaunch', async () => {
|
|
314
|
+
void trace.track('daemon.ecwebLaunch', async (phase) => {
|
|
315
|
+
phase('waiting', 'priority Ready');
|
|
305
316
|
await priorityStartupGate.promise;
|
|
317
|
+
if (startupCancelled)
|
|
318
|
+
return false;
|
|
306
319
|
if (!startupCancelled) {
|
|
320
|
+
phase('running');
|
|
307
321
|
startupEcwebState = 'starting';
|
|
308
322
|
await ecwebSupervisor.start();
|
|
309
323
|
startupEcwebState = 'ready';
|
|
310
324
|
}
|
|
311
|
-
}).catch((error) => {
|
|
325
|
+
}, undefined, { initialPhase: 'waiting' }).catch((error) => {
|
|
312
326
|
startupEcwebState = 'failed';
|
|
313
327
|
logger.warn(`ECWeb supervisor 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
|
|
314
328
|
});
|
|
@@ -322,6 +336,7 @@ async function main() {
|
|
|
322
336
|
trace.mark('daemon.agentRegistry');
|
|
323
337
|
const agentRegistry = new EvolAgentRegistry(paths.agentsDir);
|
|
324
338
|
const { primaryAgent, runtimeStatus } = loadStartupAgentRegistry(agentRegistry);
|
|
339
|
+
const teamWorkspaceManagementService = new TeamWorkspaceManagementService(new TeamWorkspaceBootstrapService());
|
|
325
340
|
let agentRuntimeState = runtimeStatus.state;
|
|
326
341
|
let agentRuntimeError = runtimeStatus.error;
|
|
327
342
|
const startupAgents = [...agentRegistry.runnableAgents()];
|
|
@@ -371,20 +386,47 @@ async function main() {
|
|
|
371
386
|
let capturedStartupQueue;
|
|
372
387
|
const startupQueueCaptured = new Promise(resolve => { capturedStartupQueue = resolve; });
|
|
373
388
|
let discoveredStartupWork;
|
|
389
|
+
const agentWorkPriority = new Map();
|
|
390
|
+
const agentWorkResolvers = new Map();
|
|
391
|
+
const agentWorkReady = new Map(startupAgents.map(agent => [agent.aid,
|
|
392
|
+
new Promise(resolve => { agentWorkResolvers.set(agent.aid, resolve); }),
|
|
393
|
+
]));
|
|
394
|
+
cancelStartupClassification = () => {
|
|
395
|
+
for (const resolve of agentWorkResolvers.values())
|
|
396
|
+
resolve(undefined);
|
|
397
|
+
};
|
|
398
|
+
const scanTimings = [];
|
|
374
399
|
const startupWorkPromise = trace.track('daemon.startupWorkDiscovery', () => discoverStartupWork({
|
|
375
400
|
agentAids: startupAgents.map(agent => agent.aid), daemonTriggerAid,
|
|
376
401
|
primaryAid: primaryAgent?.aid, sessionsRoot: paths.sessionsDir, queuePath: daemonQueuePath(),
|
|
377
402
|
onQueueCaptured: capturedStartupQueue,
|
|
378
|
-
|
|
403
|
+
onScan: timing => { scanTimings.push(timing); },
|
|
404
|
+
onAgentDiscovered: (aid, plan) => {
|
|
405
|
+
if (startupCancelled)
|
|
406
|
+
return;
|
|
407
|
+
const priority = plan.priorityAids.has(aid);
|
|
408
|
+
agentWorkPriority.set(aid, priority);
|
|
409
|
+
agentWorkResolvers.get(aid)?.(priority);
|
|
410
|
+
logger.info(`[startup] Recovery scan: aid=${aid} priority=${priority} `
|
|
411
|
+
+ scanTimings.filter(timing => timing.aid === aid)
|
|
412
|
+
.map(timing => `${timing.phase}=${timing.durationMs}ms/${timing.files}`).join(' '));
|
|
413
|
+
},
|
|
414
|
+
}), undefined, { initialPhase: 'running' }).then(plan => {
|
|
379
415
|
discoveredStartupWork = plan;
|
|
380
416
|
trace.setMeta('priorityAgents', String(plan.priorityAids.size));
|
|
381
417
|
trace.setMeta('recoveringTriggerOwners', String(plan.triggerAids.size));
|
|
418
|
+
trace.setMeta('recoveryScan', JSON.stringify(scanTimings));
|
|
382
419
|
logger.info(`[startup] Recovery priority: agents=${plan.priorityAids.size}/${startupAgents.length}`
|
|
383
420
|
+ ` triggerOwners=${plan.triggerAids.size} pendingSessions=${plan.pendingSessions.length}`);
|
|
384
421
|
if (!plan.priorityAids.size)
|
|
385
422
|
priorityStartupGate.settle('ready');
|
|
386
423
|
return plan;
|
|
424
|
+
}).catch(error => {
|
|
425
|
+
cancelStartupClassification();
|
|
426
|
+
throw error;
|
|
387
427
|
});
|
|
428
|
+
// Classification is also consumed later by channel/recovery dispatch.
|
|
429
|
+
void startupWorkPromise.catch(() => { });
|
|
388
430
|
// Agent 插件系统:每个 EvolAgent × 每个 baseagent 一个独立 runner(H1/H2 修复)
|
|
389
431
|
const agentLoader = new AgentLoader();
|
|
390
432
|
agentLoader.register(new ClaudeAgentPlugin());
|
|
@@ -401,16 +443,19 @@ async function main() {
|
|
|
401
443
|
const primaryRunnerKey = primaryAgent ? `${primaryAgent.aid}::${primaryBaseagent}` : '<empty>::claude';
|
|
402
444
|
const startupRunnerInstances = new Map();
|
|
403
445
|
const startupRunnerReadyResolvers = new Map();
|
|
446
|
+
// Startup admission: idle Agents resolve with no instances and load on first use.
|
|
404
447
|
const startupRunnerReady = new Map();
|
|
405
448
|
const startupOperationReadyResolvers = new Map();
|
|
406
449
|
const startupOperationReady = new Map();
|
|
450
|
+
const startupRunnerTraces = new Map();
|
|
407
451
|
const channelInstancesByAgent = new Map();
|
|
408
452
|
const runnerResultsByAgent = new Map();
|
|
409
453
|
const runnerSettledAgents = new Set();
|
|
410
454
|
const activeRunnerSettledAgents = new Set();
|
|
455
|
+
const deferredStartupRunners = new Set();
|
|
411
456
|
let startupChannelsRegistered = false;
|
|
412
457
|
let checkStartupTaskReady = () => { };
|
|
413
|
-
const settleStartupTaskReady = trace.startTask('daemon.taskReady');
|
|
458
|
+
const settleStartupTaskReady = trace.startTask('daemon.taskReady', undefined, { summary: true });
|
|
414
459
|
const resolveStartupOperation = (aid) => {
|
|
415
460
|
if (startupCancelled || (startupChannelsRegistered && runnerSettledAgents.has(aid))) {
|
|
416
461
|
startupOperationReadyResolvers.get(aid)?.(runnerResultsByAgent.get(aid) ?? []);
|
|
@@ -419,12 +464,13 @@ async function main() {
|
|
|
419
464
|
const boundStartupAgents = new Set();
|
|
420
465
|
const bindStartupAgentChannels = (agent, runners) => {
|
|
421
466
|
if (boundStartupAgents.has(agent.aid) || startupCancelled
|
|
422
|
-
|| agent.status === 'error' || agent.status === 'disabled'
|
|
467
|
+
|| agent.status === 'error' || agent.status === 'disabled'
|
|
468
|
+
|| (runners.length === 0 && !deferredStartupRunners.has(agent.aid)))
|
|
423
469
|
return;
|
|
424
470
|
const channels = channelInstancesByAgent.get(agent.aid);
|
|
425
471
|
if (!channels)
|
|
426
472
|
return;
|
|
427
|
-
bindStartupChannelsToAgents(channels, agentRegistry, runners);
|
|
473
|
+
bindStartupChannelsToAgents(channels, agentRegistry, runners, deferredStartupRunners);
|
|
428
474
|
boundStartupAgents.add(agent.aid);
|
|
429
475
|
};
|
|
430
476
|
for (const agent of startupAgents) {
|
|
@@ -435,6 +481,9 @@ async function main() {
|
|
|
435
481
|
startupOperationReadyResolvers.set(agent.aid, resolve);
|
|
436
482
|
}));
|
|
437
483
|
}
|
|
484
|
+
const awaitStartupAgent = async (aid) => {
|
|
485
|
+
await startupOperationReady.get(aid);
|
|
486
|
+
};
|
|
438
487
|
// Status has a config-only snapshot immediately. Slow machine detection is
|
|
439
488
|
// observational and must not gate IPC or other backends' runners/channels.
|
|
440
489
|
const baseagentSnapshot = await getBaseagentSnapshot({ loaded: [], probe: false });
|
|
@@ -448,11 +497,10 @@ async function main() {
|
|
|
448
497
|
process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
|
|
449
498
|
const startupRunnersStartedAtMs = Date.now();
|
|
450
499
|
trace.mark('daemon.agentRunnerDispatch');
|
|
451
|
-
void trace.track('daemon.baseagentProbeComplete', () => getBaseagentSnapshot({ loaded: [], probe: true }))
|
|
500
|
+
void trace.track('daemon.baseagentProbeComplete', () => getBaseagentSnapshot({ loaded: [], probe: true }), undefined, { initialPhase: 'running' })
|
|
452
501
|
.then(snapshot => { Object.assign(baseagentSnapshot, snapshot); refreshLoadedBaseagents(); })
|
|
453
502
|
.catch(error => logger.warn(`[startup] Baseagent inventory probe failed: ${error}`));
|
|
454
503
|
const startupRunnersPromise = trace.track('daemon.agentRunnersReady', async () => {
|
|
455
|
-
const work = await startupWorkPromise;
|
|
456
504
|
return createStartupAgentRunners({
|
|
457
505
|
agentRegistry,
|
|
458
506
|
agentLoader,
|
|
@@ -461,7 +509,27 @@ async function main() {
|
|
|
461
509
|
agentInstances,
|
|
462
510
|
agentMap,
|
|
463
511
|
isCancelled: () => startupCancelled,
|
|
464
|
-
|
|
512
|
+
waitForClassification: async (aid) => {
|
|
513
|
+
const priority = await agentWorkReady.get(aid);
|
|
514
|
+
if (priority === undefined && !startupCancelled)
|
|
515
|
+
throw new Error(`Work classification unavailable for ${aid}`);
|
|
516
|
+
return priority === true;
|
|
517
|
+
},
|
|
518
|
+
onAgentDeferred: agent => {
|
|
519
|
+
deferredStartupRunners.add(agent.aid);
|
|
520
|
+
activeRunnerSettledAgents.add(agent.aid);
|
|
521
|
+
runnerSettledAgents.add(agent.aid);
|
|
522
|
+
runnerResultsByAgent.set(agent.aid, []);
|
|
523
|
+
startupRunnerInstances.set(agent.aid, []);
|
|
524
|
+
bindStartupAgentChannels(agent, []);
|
|
525
|
+
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
526
|
+
resolveStartupOperation(agent.aid);
|
|
527
|
+
checkStartupTaskReady();
|
|
528
|
+
},
|
|
529
|
+
// Startup measures the selected backend only; other backends load on demand.
|
|
530
|
+
onAgentStarting: agent => {
|
|
531
|
+
startupRunnerTraces.set(agent.aid, trace.startTask('daemon.agentRunner', `aid=${agent.aid}; runner=${agent.baseagent}`, { summary: true }));
|
|
532
|
+
},
|
|
465
533
|
configureInstances: instances => {
|
|
466
534
|
for (const instance of instances) {
|
|
467
535
|
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
@@ -484,13 +552,14 @@ async function main() {
|
|
|
484
552
|
startupRunnerInstances.set(agent.aid, instances);
|
|
485
553
|
refreshLoadedBaseagents();
|
|
486
554
|
resolveStartupOperation(agent.aid);
|
|
487
|
-
|
|
555
|
+
startupRunnerTraces.get(agent.aid)?.(startupCancelled ? 'cancelled'
|
|
556
|
+
: instances.some(instance => instance.baseagent === agent.baseagent) ? 'ok' : 'failed');
|
|
488
557
|
logger.info(`[startup] Agent runners ready: aid=${agent.aid} runners=${instances.length}`
|
|
489
558
|
+ ` duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
490
559
|
checkStartupTaskReady();
|
|
491
560
|
},
|
|
492
561
|
});
|
|
493
|
-
}).then(result => {
|
|
562
|
+
}, undefined, { summary: true }).then(result => {
|
|
494
563
|
if (result.runtimeError) {
|
|
495
564
|
agentRuntimeState = 'error';
|
|
496
565
|
agentRuntimeError = result.runtimeError;
|
|
@@ -507,6 +576,7 @@ async function main() {
|
|
|
507
576
|
agentRuntimeError = message;
|
|
508
577
|
logger.error(`[startup] Agent runner batch failed: ${message}`);
|
|
509
578
|
for (const agent of startupAgents) {
|
|
579
|
+
startupRunnerTraces.get(agent.aid)?.('failed');
|
|
510
580
|
if (!runnerSettledAgents.has(agent.aid)) {
|
|
511
581
|
if (!activeRunnerSettledAgents.has(agent.aid)) {
|
|
512
582
|
agent.status = 'error';
|
|
@@ -540,7 +610,10 @@ async function main() {
|
|
|
540
610
|
trace.mark('daemon.channelCreate');
|
|
541
611
|
const channelLoader = new ChannelLoader(daemonCfg.debug, daemonCfg.aun?.defaultEncrypt);
|
|
542
612
|
await registerBuiltinChannelPlugins(channelLoader);
|
|
543
|
-
|
|
613
|
+
// Idle AUN may make progress during recovery, while one slot stays available
|
|
614
|
+
// for control and Agents with unfinished work. No extra global Ready wait.
|
|
615
|
+
const connectionQueue = new StartupTaskQueue(2, 50, 1);
|
|
616
|
+
void priorityStartupGate.promise.then(() => connectionQueue.releaseBackground());
|
|
544
617
|
const schedulerQueue = new StartupTaskQueue(2, 50);
|
|
545
618
|
channelLoader.setConnectionAdmission(instance => connectionQueue.run(() => instance.connect(), () => !startupCancelled && !instance.lifecycle?.signal.aborted));
|
|
546
619
|
daemonPluginLifecycle.defer(() => { connectionQueue.stop(); schedulerQueue.stop(); }, 'startup admission');
|
|
@@ -615,6 +688,7 @@ async function main() {
|
|
|
615
688
|
onShutdown(() => { stopOwnerNotifications(); });
|
|
616
689
|
// 创建命令处理器
|
|
617
690
|
const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
|
|
691
|
+
cmdHandler.setTeamWorkspaceManagementService(teamWorkspaceManagementService);
|
|
618
692
|
cmdHandler.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
619
693
|
cmdHandler.setPermissionGateway(permissionGateway);
|
|
620
694
|
cmdHandler.setInteractionRouter(interactionRouter);
|
|
@@ -634,14 +708,6 @@ async function main() {
|
|
|
634
708
|
return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
|
|
635
709
|
}, primaryRunnerKey);
|
|
636
710
|
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
|
-
});
|
|
645
711
|
const processor = responseEngine;
|
|
646
712
|
configureRunnerCallbacks = instance => {
|
|
647
713
|
instance.agent.setCompactStartCallback?.((sessionId) => {
|
|
@@ -733,6 +799,14 @@ async function main() {
|
|
|
733
799
|
cmdHandler.setHandoffRuntime(handoffRuntime);
|
|
734
800
|
// Trigger runtime: daemon-level script + feedback scheduler.
|
|
735
801
|
const triggerSchedulers = new TriggerSchedulerRegistry();
|
|
802
|
+
// 事件中心(Event Center):文件驱动事件包,生命周期跟随 Trigger 调度器。
|
|
803
|
+
const eventCenter = createDaemonEventCenter({ triggerSchedulers, agentRegistry });
|
|
804
|
+
cmdHandler.setEventCenter(eventCenter);
|
|
805
|
+
// ECK 能力清单变量:只读两个运行时的内存包集合,不扫目录。
|
|
806
|
+
responseEngine.setCapabilityIndexes(selfAid => ({
|
|
807
|
+
hasServicePacks: peekServiceRouter(selfAid)?.hasActivePacks() ?? false,
|
|
808
|
+
hasEventPacks: eventCenter.hasActivePacks(selfAid),
|
|
809
|
+
}));
|
|
736
810
|
const sessionIdleMonitor = new SessionIdleMonitor({
|
|
737
811
|
eventBus,
|
|
738
812
|
statePath: path.join(paths.dataDir, 'session-idle-state.json'),
|
|
@@ -886,22 +960,27 @@ async function main() {
|
|
|
886
960
|
}, opts));
|
|
887
961
|
};
|
|
888
962
|
cmdHandler.setTriggerSchedulerResolver((agentAid) => triggerSchedulers.get(agentAid));
|
|
889
|
-
const ensureTriggerSchedulerStarted = async (agent) => {
|
|
963
|
+
const ensureTriggerSchedulerStarted = async (agent, phase) => {
|
|
964
|
+
phase?.('waiting', 'Agent startup admission');
|
|
890
965
|
await startupRunnerReady.get(agent.aid);
|
|
891
966
|
if (startupCancelled || agent.status === 'error' || agent.status === 'disabled')
|
|
892
967
|
return;
|
|
968
|
+
phase?.('queued', 'scheduler admission');
|
|
893
969
|
await triggerSchedulers.ensureStarted(agent.aid, async () => {
|
|
894
|
-
await schedulerQueue.run(() => startTriggerScheduler(agent), () => !startupCancelled && agent.status !== 'disabled' && agent.status !== 'error');
|
|
970
|
+
await schedulerQueue.run(() => { phase?.('running'); return startTriggerScheduler(agent); }, () => !startupCancelled && agent.status !== 'disabled' && agent.status !== 'error');
|
|
895
971
|
});
|
|
896
972
|
};
|
|
897
|
-
const ensureDaemonTriggerSchedulerStarted = async () => {
|
|
898
|
-
|
|
973
|
+
const ensureDaemonTriggerSchedulerStarted = async (phase) => {
|
|
974
|
+
phase?.('waiting', 'primary Agent startup admission');
|
|
975
|
+
if (primaryAgent)
|
|
976
|
+
await startupRunnerReady.get(primaryAgent.aid);
|
|
899
977
|
if (startupCancelled)
|
|
900
978
|
return;
|
|
901
|
-
if (primaryAgent && (
|
|
979
|
+
if (primaryAgent && (primaryAgent.status === 'error' || primaryAgent.status === 'disabled'))
|
|
902
980
|
return;
|
|
981
|
+
phase?.('queued', 'scheduler admission');
|
|
903
982
|
await triggerSchedulers.ensureStarted(daemonTriggerOwner.aid, async () => {
|
|
904
|
-
await schedulerQueue.run(() => startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }), () => !startupCancelled);
|
|
983
|
+
await schedulerQueue.run(() => { phase?.('running'); return startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }); }, () => !startupCancelled);
|
|
905
984
|
});
|
|
906
985
|
};
|
|
907
986
|
const startupTriggerReady = new Set();
|
|
@@ -1104,9 +1183,7 @@ async function main() {
|
|
|
1104
1183
|
agentRegistry,
|
|
1105
1184
|
messageQueue,
|
|
1106
1185
|
runMode: devMode ? 'dev' : 'install',
|
|
1107
|
-
|
|
1108
|
-
runtimeBuildIdentity,
|
|
1109
|
-
diskDistDir,
|
|
1186
|
+
getBuildDiagnostics: () => buildDiagnostics,
|
|
1110
1187
|
getProcessOwners: processLevelOwners,
|
|
1111
1188
|
getAgentRuntimeState: () => agentRuntimeState,
|
|
1112
1189
|
getAgentRuntimeError: () => agentRuntimeError,
|
|
@@ -1118,10 +1195,12 @@ async function main() {
|
|
|
1118
1195
|
ecweb: startupEcwebState === 'waiting' && ecwebSupervisor?.status().enabled ? 'waiting'
|
|
1119
1196
|
: startupEcwebState === 'failed' ? 'failed' : ecwebSupervisor?.status().state ?? 'disabled',
|
|
1120
1197
|
agents: startupAgents.map(agent => ({
|
|
1121
|
-
aid: agent.aid, priority:
|
|
1198
|
+
aid: agent.aid, priority: agentWorkPriority.get(agent.aid) ?? false,
|
|
1122
1199
|
runner: agentMap.has(`${agent.aid}::${agent.baseagent}`) ? 'ready'
|
|
1123
|
-
:
|
|
1124
|
-
:
|
|
1200
|
+
: runnerDemand.isLoading(agent.aid, agent.baseagent) ? 'starting'
|
|
1201
|
+
: deferredStartupRunners.has(agent.aid) ? 'deferred'
|
|
1202
|
+
: activeRunnerSettledAgents.has(agent.aid) ? 'failed'
|
|
1203
|
+
: !agentWorkPriority.has(agent.aid) ? 'waiting' : 'starting',
|
|
1125
1204
|
aun: channelInstancesByAgent.get(agent.aid)?.some(inst => inst.channelType === 'aun' && inst.channel.getStatus?.().connected === true) ?? false,
|
|
1126
1205
|
recovery: startupHintsReady.has(agent.aid) && startupSessionsReady.has(agent.aid),
|
|
1127
1206
|
trigger: startupTriggerFailed.has(agent.aid) ? 'failed' : startupTriggerReady.has(agent.aid) ? 'ready' : discoveredStartupWork?.triggerAids.has(agent.aid) ? 'recovering'
|
|
@@ -1134,7 +1213,6 @@ async function main() {
|
|
|
1134
1213
|
getControlAidState: () => controlChannel?.getAidState(),
|
|
1135
1214
|
getHost: () => hostProvider.getSnapshot().host,
|
|
1136
1215
|
baseagents: baseagentSnapshot,
|
|
1137
|
-
diskDistId,
|
|
1138
1216
|
getTriggerSummary: () => {
|
|
1139
1217
|
const now = new Date();
|
|
1140
1218
|
const from = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
|
|
@@ -1175,7 +1253,25 @@ async function main() {
|
|
|
1175
1253
|
aidStatsCollector,
|
|
1176
1254
|
handoffRuntime,
|
|
1177
1255
|
messageQueue,
|
|
1178
|
-
awaitStartupAgent
|
|
1256
|
+
awaitStartupAgent,
|
|
1257
|
+
});
|
|
1258
|
+
const runnerDemand = createOnDemandAgentRunners({
|
|
1259
|
+
agentRegistry, agentLoader, agentMap, coordinator: reloadCoordinator,
|
|
1260
|
+
callbacks: { onSessionIdUpdate: (sessionId, agentSessionId, context) => sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId, context?.turn) },
|
|
1261
|
+
waitForStartup: awaitStartupAgent,
|
|
1262
|
+
isCancelled: () => startupCancelled,
|
|
1263
|
+
configure: instances => {
|
|
1264
|
+
for (const instance of instances) {
|
|
1265
|
+
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
1266
|
+
configureRunnerCallbacks?.(instance);
|
|
1267
|
+
}
|
|
1268
|
+
},
|
|
1269
|
+
onLoaded: refreshLoadedBaseagents,
|
|
1270
|
+
});
|
|
1271
|
+
responseEngine.setRunnerReadiness(runnerDemand.ensure);
|
|
1272
|
+
cmdHandler.setRunnerReadiness(runnerDemand.ensure, aid => {
|
|
1273
|
+
const agent = agentRegistry.get(aid);
|
|
1274
|
+
return agent && agent.config.enabled !== false ? agentLoader.enabledBaseagents(agent) : [];
|
|
1179
1275
|
});
|
|
1180
1276
|
registerRelationConsolidationEvents({ eventBus, agentRegistry, responseEngine, enqueueConsolidation });
|
|
1181
1277
|
globalThis.__evolcore_reloadHooks = reloadHooks;
|
|
@@ -1202,13 +1298,13 @@ async function main() {
|
|
|
1202
1298
|
setAgentRuntimeError: error => { agentRuntimeError = error; },
|
|
1203
1299
|
});
|
|
1204
1300
|
globalThis.__evolcore_hotLoadAgent = async (aid) => {
|
|
1205
|
-
await
|
|
1301
|
+
await awaitStartupAgent(aid);
|
|
1206
1302
|
if (startupCancelled)
|
|
1207
1303
|
throw new Error('Daemon is shutting down');
|
|
1208
1304
|
return agentRuntimeOperations.hotLoad(aid);
|
|
1209
1305
|
};
|
|
1210
1306
|
globalThis.__evolcore_resyncAgents = async () => {
|
|
1211
|
-
await Promise.all(startupOperationReady.
|
|
1307
|
+
await Promise.all([...startupOperationReady.keys()].map(awaitStartupAgent));
|
|
1212
1308
|
if (startupCancelled)
|
|
1213
1309
|
throw new Error('Daemon is shutting down');
|
|
1214
1310
|
return agentRuntimeOperations.resync();
|
|
@@ -1249,9 +1345,9 @@ async function main() {
|
|
|
1249
1345
|
aunAidStats: () => aidStatsCollector.getAllSnapshots(),
|
|
1250
1346
|
beforeAgentOperation: async (aid) => {
|
|
1251
1347
|
if (aid)
|
|
1252
|
-
await
|
|
1348
|
+
await awaitStartupAgent(aid);
|
|
1253
1349
|
else
|
|
1254
|
-
await Promise.all(startupOperationReady.
|
|
1350
|
+
await Promise.all([...startupOperationReady.keys()].map(awaitStartupAgent));
|
|
1255
1351
|
},
|
|
1256
1352
|
});
|
|
1257
1353
|
const agentInitializationService = createAgentInitializationRuntime({
|
|
@@ -1281,6 +1377,11 @@ async function main() {
|
|
|
1281
1377
|
trace.mark('daemon.ipcRegister');
|
|
1282
1378
|
console.error('[EvolCore] ✓ Configuring IPC...');
|
|
1283
1379
|
registerDaemonIpc({
|
|
1380
|
+
getConfiguredBaseagents: aid => {
|
|
1381
|
+
const agent = agentRegistry.get(aid);
|
|
1382
|
+
return agent && agent.config.enabled !== false && agent.status !== 'disabled'
|
|
1383
|
+
? agentLoader.enabledBaseagents(agent) : [];
|
|
1384
|
+
},
|
|
1284
1385
|
lifecycle: daemonPluginLifecycle,
|
|
1285
1386
|
ipcServer,
|
|
1286
1387
|
agentRegistry,
|
|
@@ -1316,6 +1417,7 @@ async function main() {
|
|
|
1316
1417
|
daemonAid: daemonCfg.aid,
|
|
1317
1418
|
triggerControlToken,
|
|
1318
1419
|
triggerSchedulers,
|
|
1420
|
+
eventCenter,
|
|
1319
1421
|
daemonTriggerOwner,
|
|
1320
1422
|
primaryAgent,
|
|
1321
1423
|
triggerAuthorization: {
|
|
@@ -1354,7 +1456,7 @@ async function main() {
|
|
|
1354
1456
|
ecwebSupervisor,
|
|
1355
1457
|
startupTrace: trace,
|
|
1356
1458
|
waitForServices: waitForBackgroundStartup,
|
|
1357
|
-
connectChannel: channel => trace.track('daemon.controlChannelConnect',
|
|
1459
|
+
connectChannel: channel => trace.track('daemon.controlChannelConnect', phase => connectionQueue.run(() => { phase('running'); return channel.connect(); }, () => !startupCancelled), undefined, { initialPhase: 'queued' }),
|
|
1358
1460
|
onServiceProxyManager: manager => {
|
|
1359
1461
|
const authorizeManagedOperation = createDelegationAuthorizer({
|
|
1360
1462
|
agentDelegationRegistry,
|
|
@@ -1368,27 +1470,38 @@ async function main() {
|
|
|
1368
1470
|
});
|
|
1369
1471
|
},
|
|
1370
1472
|
});
|
|
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
1473
|
// ── 连接所有渠道(后台首连,AUN/任意渠道故障不阻塞 daemon 主流程)──
|
|
1379
1474
|
trace.point('daemon.channelConnectDispatch');
|
|
1475
|
+
const channelConnectTimings = new Map(channelInstances.map(instance => {
|
|
1476
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1477
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1478
|
+
const channel = instance.adapter.channelKey;
|
|
1479
|
+
return [instance, trace.startTask('daemon.channelConnect', owner ? `aid=${owner.aid}; channel=${channel}` : channel, { initialPhase: 'waiting' })];
|
|
1480
|
+
}));
|
|
1380
1481
|
logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
|
|
1482
|
+
const backgroundConnections = new Set();
|
|
1381
1483
|
const connectOptions = {
|
|
1382
|
-
|
|
1383
|
-
// The shared queue already spaces control, Agent and external connections.
|
|
1384
|
-
intervalMs: 0,
|
|
1484
|
+
sharedAdmission: true,
|
|
1385
1485
|
beforeConnect: async (instance) => {
|
|
1386
1486
|
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1387
1487
|
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1388
|
-
|
|
1389
|
-
|
|
1488
|
+
const timing = channelConnectTimings.get(instance);
|
|
1489
|
+
if (owner && instance.channelType === 'aun') {
|
|
1490
|
+
timing?.phase('waiting', 'Agent work classification');
|
|
1491
|
+
const priority = await agentWorkReady.get(owner.aid);
|
|
1492
|
+
if (priority === undefined) {
|
|
1493
|
+
if (startupCancelled)
|
|
1494
|
+
return false;
|
|
1495
|
+
throw new Error(`Work classification unavailable for ${owner.aid}`);
|
|
1496
|
+
}
|
|
1497
|
+
if (!priority)
|
|
1498
|
+
backgroundConnections.add(instance);
|
|
1499
|
+
}
|
|
1390
1500
|
// Transport and authenticated control messages do not require a model runner.
|
|
1391
|
-
|
|
1501
|
+
if (startupCancelled || owner?.status === 'disabled')
|
|
1502
|
+
return false;
|
|
1503
|
+
timing?.phase('queued', backgroundConnections.has(instance) ? 'idle connection admission' : 'priority connection admission');
|
|
1504
|
+
return true;
|
|
1392
1505
|
},
|
|
1393
1506
|
shouldConnect: (instance) => {
|
|
1394
1507
|
if (startupCancelled || !channelInstances.includes(instance))
|
|
@@ -1398,8 +1511,20 @@ async function main() {
|
|
|
1398
1511
|
return !owner || owner.status !== 'disabled';
|
|
1399
1512
|
},
|
|
1400
1513
|
onConnected: markChannelConnected,
|
|
1401
|
-
connect:
|
|
1514
|
+
connect: async (instance) => {
|
|
1515
|
+
const timing = channelConnectTimings.get(instance);
|
|
1516
|
+
try {
|
|
1517
|
+
const started = await connectionQueue.run(() => { timing.phase('running'); return instance.connect(); }, () => !startupCancelled && channelInstances.includes(instance) && !instance.lifecycle?.signal.aborted, backgroundConnections.has(instance) ? 'background' : 'foreground');
|
|
1518
|
+
timing(started ? 'ok' : 'cancelled');
|
|
1519
|
+
return started;
|
|
1520
|
+
}
|
|
1521
|
+
catch (error) {
|
|
1522
|
+
timing('failed');
|
|
1523
|
+
throw error;
|
|
1524
|
+
}
|
|
1525
|
+
},
|
|
1402
1526
|
onFailed: (inst, error) => {
|
|
1527
|
+
channelConnectTimings.get(inst)?.('failed');
|
|
1403
1528
|
logger.warn(`[startup] ${inst.adapter.channelName} initial connect failed: ${error}`);
|
|
1404
1529
|
},
|
|
1405
1530
|
};
|
|
@@ -1412,23 +1537,50 @@ async function main() {
|
|
|
1412
1537
|
// Partition outside connectAll's workers so a deferred channel cannot hold
|
|
1413
1538
|
// a slot required by a recovering Agent. All groups share actual admission.
|
|
1414
1539
|
const connectAfter = async (instances, gate) => {
|
|
1415
|
-
|
|
1416
|
-
|
|
1417
|
-
|
|
1418
|
-
|
|
1419
|
-
|
|
1540
|
+
try {
|
|
1541
|
+
if (gate) {
|
|
1542
|
+
for (const instance of instances)
|
|
1543
|
+
channelConnectTimings.get(instance)?.phase('waiting', gate === priorityStartupGate ? 'priority Ready' : 'normal Ready');
|
|
1544
|
+
await gate.promise;
|
|
1545
|
+
}
|
|
1546
|
+
if (startupCancelled)
|
|
1547
|
+
return [];
|
|
1548
|
+
return await channelLoader.connectAll(instances, connectOptions);
|
|
1549
|
+
}
|
|
1550
|
+
finally {
|
|
1551
|
+
for (const instance of instances)
|
|
1552
|
+
channelConnectTimings.get(instance)?.(startupCancelled ? 'cancelled' : 'skipped');
|
|
1553
|
+
}
|
|
1420
1554
|
};
|
|
1421
1555
|
const aunInstances = channelInstances.filter(inst => inst.channelType === 'aun');
|
|
1422
1556
|
const externalInstances = channelInstances.filter(inst => inst.channelType !== 'aun');
|
|
1423
|
-
const
|
|
1424
|
-
|
|
1425
|
-
|
|
1426
|
-
|
|
1557
|
+
const finishConnections = trace.startTask('daemon.channelConnectionsReady', `aun=${aunInstances.length}; other=${externalInstances.length}; control AUN tracked separately`, { summary: true });
|
|
1558
|
+
const aunConnections = connectAfter(aunInstances);
|
|
1559
|
+
void aunConnections.catch(() => { });
|
|
1560
|
+
// Agent AUN and Runner admission can progress as each scan finishes.
|
|
1561
|
+
// Cross-Agent channel routes and local recovery still need the complete plan.
|
|
1562
|
+
const startupWork = await startupWorkPromise.catch(error => {
|
|
1563
|
+
finishConnections('failed');
|
|
1564
|
+
for (const timing of channelConnectTimings.values())
|
|
1565
|
+
timing('failed');
|
|
1566
|
+
throw error;
|
|
1567
|
+
});
|
|
1568
|
+
if (startupCancelled) {
|
|
1569
|
+
finishConnections('cancelled');
|
|
1570
|
+
return;
|
|
1571
|
+
}
|
|
1572
|
+
if (startupWork.sessionScanFailed) {
|
|
1573
|
+
// Exceptional compatibility fallback; healthy starts reuse asynchronous discovery.
|
|
1574
|
+
startupWork.pendingSessions = sessionManager.getPendingProcessingSessions();
|
|
1575
|
+
}
|
|
1427
1576
|
const externalConnections = Promise.all([
|
|
1428
1577
|
connectAfter(externalInstances.filter(isPriorityChannel)),
|
|
1429
1578
|
connectAfter(externalInstances.filter(inst => !isPriorityChannel(inst)), normalStartupGate),
|
|
1430
1579
|
]).then(groups => groups.flat());
|
|
1431
|
-
const connectAllPromise =
|
|
1580
|
+
const connectAllPromise = Promise.all([aunConnections, externalConnections]).then(groups => {
|
|
1581
|
+
finishConnections('ok');
|
|
1582
|
+
return groups.flat();
|
|
1583
|
+
}, error => { finishConnections('failed'); throw error; });
|
|
1432
1584
|
connectAllPromise.then((connected) => {
|
|
1433
1585
|
const channelSummary = summarizeConnectedChannels(connected);
|
|
1434
1586
|
logger.info(`✅ ${connected.length} channel(s) connected: ${channelSummary}`);
|
|
@@ -1445,19 +1597,24 @@ async function main() {
|
|
|
1445
1597
|
void trace.track('daemon.triggerSchedulersReady', () => new Promise(resolve => setImmediate(resolve)).then(() => {
|
|
1446
1598
|
const owners = [
|
|
1447
1599
|
{ aid: daemonTriggerOwner.aid, start: ensureDaemonTriggerSchedulerStarted },
|
|
1448
|
-
...triggerStartupAgents.map(agent => ({ aid: agent.aid, start: () => ensureTriggerSchedulerStarted(agent) })),
|
|
1600
|
+
...triggerStartupAgents.map(agent => ({ aid: agent.aid, start: (phase) => ensureTriggerSchedulerStarted(agent, phase) })),
|
|
1449
1601
|
];
|
|
1450
1602
|
for (const owner of owners) {
|
|
1451
|
-
const starting = trace.track('daemon.triggerSchedulerReady', async () => {
|
|
1452
|
-
if (!startupWork.triggerAids.has(owner.aid)
|
|
1453
|
-
|
|
1603
|
+
const starting = trace.track('daemon.triggerSchedulerReady', async (phase) => {
|
|
1604
|
+
if (!startupWork.triggerAids.has(owner.aid)) {
|
|
1605
|
+
phase('waiting', 'normal Ready');
|
|
1606
|
+
if (!await waitForBackgroundStartup())
|
|
1607
|
+
return false;
|
|
1608
|
+
}
|
|
1454
1609
|
if (startupCancelled)
|
|
1455
|
-
return;
|
|
1456
|
-
await owner.start();
|
|
1610
|
+
return false;
|
|
1611
|
+
await owner.start(phase);
|
|
1612
|
+
if (startupCancelled)
|
|
1613
|
+
return false;
|
|
1457
1614
|
if (triggerSchedulers.get(owner.aid))
|
|
1458
1615
|
startupTriggerReady.add(owner.aid);
|
|
1459
1616
|
checkStartupTaskReady();
|
|
1460
|
-
}, owner.aid).catch(e => {
|
|
1617
|
+
}, owner.aid, { initialPhase: 'waiting' }).then(() => { }).catch(e => {
|
|
1461
1618
|
startupTriggerFailed.add(owner.aid);
|
|
1462
1619
|
logger.warn(`[startup] trigger scheduler start failed for ${owner.aid}: ${e}`);
|
|
1463
1620
|
checkStartupTaskReady();
|
|
@@ -1469,7 +1626,7 @@ async function main() {
|
|
|
1469
1626
|
// activate() 早于这里执行,那时列表还是空的。
|
|
1470
1627
|
sessionIdleMonitor.refreshTriggerIdentities();
|
|
1471
1628
|
});
|
|
1472
|
-
}));
|
|
1629
|
+
}), undefined, { summary: true });
|
|
1473
1630
|
sessionIdleMonitor.activate();
|
|
1474
1631
|
relationIdleMonitor.start();
|
|
1475
1632
|
// 首轮 SDK 自动生成的会话名必须走与 `ec thread rename` 相同的出口:
|
|
@@ -1541,43 +1698,68 @@ async function main() {
|
|
|
1541
1698
|
isCancelled: () => startupCancelled,
|
|
1542
1699
|
});
|
|
1543
1700
|
};
|
|
1544
|
-
void trace.track('daemon.handoffRecoveryComplete', recoverStartupQueue)
|
|
1701
|
+
void trace.track('daemon.handoffRecoveryComplete', recoverStartupQueue, undefined, { summary: true })
|
|
1545
1702
|
.catch(error => logger.error('[Handoff] startup recovery coordinator failed:', error));
|
|
1546
1703
|
trace.point('daemon.resumeSessions');
|
|
1547
|
-
|
|
1704
|
+
const settleSessionRecovery = trace.startTask('daemon.resumeSessionsComplete', `sessions=${startupWork.pendingSessions.length}`, { summary: true });
|
|
1705
|
+
if (!startupWork.pendingSessions.length)
|
|
1706
|
+
settleSessionRecovery('skipped');
|
|
1707
|
+
void (async () => {
|
|
1548
1708
|
// Scheduler dispatch registers its promises in the next I/O turn.
|
|
1549
1709
|
await new Promise(resolve => setImmediate(resolve));
|
|
1550
1710
|
await Promise.all(startupAgents.map(async (agent) => {
|
|
1551
1711
|
const pendingSessions = startupWork.pendingSessions.filter(session => (session.selfAID || agentRegistry.resolveByChannel(session.channel)?.aid) === agent.aid);
|
|
1552
|
-
|
|
1553
|
-
|
|
1554
|
-
|
|
1555
|
-
|
|
1712
|
+
if (!pendingSessions.length) {
|
|
1713
|
+
if (!startupCancelled)
|
|
1714
|
+
startupSessionsReady.add(agent.aid);
|
|
1715
|
+
checkStartupTaskReady();
|
|
1716
|
+
return;
|
|
1556
1717
|
}
|
|
1557
|
-
|
|
1718
|
+
await trace.track('daemon.resumeSessionsAgent', async (phase) => {
|
|
1719
|
+
// Restore only the backends these sessions actually bind to.
|
|
1720
|
+
phase('waiting', 'session Runner');
|
|
1558
1721
|
await startupRunnerReady.get(agent.aid);
|
|
1559
|
-
|
|
1560
|
-
|
|
1561
|
-
|
|
1562
|
-
|
|
1563
|
-
|
|
1564
|
-
|
|
1565
|
-
|
|
1566
|
-
|
|
1722
|
+
await Promise.all([...new Set(pendingSessions.map(session => session.baseagent).filter(Boolean))]
|
|
1723
|
+
.map(baseagent => runnerDemand.ensure(agent.aid, baseagent)));
|
|
1724
|
+
if (startupWork.triggerAids.has(agent.aid)) {
|
|
1725
|
+
phase('waiting', 'unfinished Trigger recovery');
|
|
1726
|
+
await startupTriggerPromises.get(agent.aid);
|
|
1727
|
+
}
|
|
1728
|
+
if (startupCancelled)
|
|
1729
|
+
return false;
|
|
1730
|
+
phase('running');
|
|
1731
|
+
resumePendingSessions({ sessionManager, messageQueue, droppedTriggerSessionIds, agentRegistry, agentMap,
|
|
1732
|
+
pendingSessions });
|
|
1733
|
+
startupSessionsReady.add(agent.aid);
|
|
1734
|
+
checkStartupTaskReady();
|
|
1735
|
+
}, `aid=${agent.aid}; sessions=${pendingSessions.length}`, { initialPhase: 'waiting' });
|
|
1567
1736
|
}));
|
|
1568
|
-
|
|
1569
|
-
|
|
1737
|
+
settleSessionRecovery(startupCancelled ? 'cancelled' : 'ok');
|
|
1738
|
+
})().catch(error => {
|
|
1739
|
+
settleSessionRecovery('failed');
|
|
1740
|
+
logger.error(`[Resume] startup runner gate failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
1741
|
+
});
|
|
1742
|
+
// Maintenance has its own lifecycle; its Ready wait is not session recovery.
|
|
1743
|
+
if (startupWork.staleSessions.length) {
|
|
1744
|
+
void trace.track('daemon.staleSessionCleanup', async (phase) => {
|
|
1745
|
+
phase('waiting', 'normal Ready');
|
|
1746
|
+
if (!await waitForBackgroundStartup())
|
|
1747
|
+
return false;
|
|
1748
|
+
phase('running');
|
|
1570
1749
|
for (const session of startupWork.staleSessions) {
|
|
1750
|
+
if (startupCancelled)
|
|
1751
|
+
return false;
|
|
1571
1752
|
const current = await sessionManager.getSessionById(session.id);
|
|
1572
1753
|
if (current?.processingState === session.processingState)
|
|
1573
1754
|
sessionManager.clearProcessing(session.id);
|
|
1574
1755
|
}
|
|
1575
|
-
}
|
|
1576
|
-
|
|
1577
|
-
|
|
1578
|
-
//
|
|
1756
|
+
}, `sessions=${startupWork.staleSessions.length}`, { initialPhase: 'waiting' })
|
|
1757
|
+
.catch(error => logger.warn(`[Resume] stale session cleanup failed: ${error instanceof Error ? error.message : String(error)}`));
|
|
1758
|
+
}
|
|
1759
|
+
// Normal ready observes the same gates as task consumption. Unused backends
|
|
1760
|
+
// stay unloaded; service publication continues on its own lifecycle.
|
|
1579
1761
|
let taskReadinessSettled = false;
|
|
1580
|
-
const finishPriorityStartup = trace.startTask('daemon.priorityTaskReady');
|
|
1762
|
+
const finishPriorityStartup = trace.startTask('daemon.priorityTaskReady', undefined, { summary: true });
|
|
1581
1763
|
priorityStartupGate.releaseAfter(9_000, () => {
|
|
1582
1764
|
logger.warn('[startup] Priority recovery still pending after 9s; admitting idle Agents and ECWeb without reporting Ready');
|
|
1583
1765
|
});
|
|
@@ -1592,7 +1774,8 @@ async function main() {
|
|
|
1592
1774
|
if (startupCancelled || taskReadinessSettled)
|
|
1593
1775
|
return;
|
|
1594
1776
|
const agentStates = startupAgents.filter(agent => agent.status !== 'disabled').map(agent => {
|
|
1595
|
-
const runnerReady = agentMap.has(`${agent.aid}::${agent.baseagent}`)
|
|
1777
|
+
const runnerReady = agentMap.has(`${agent.aid}::${agent.baseagent}`)
|
|
1778
|
+
|| (deferredStartupRunners.has(agent.aid) && agent.status === 'running');
|
|
1596
1779
|
const aun = channelInstancesByAgent.get(agent.aid)?.find(instance => instance.channelType === 'aun');
|
|
1597
1780
|
return { aid: agent.aid,
|
|
1598
1781
|
runnerReady,
|
|
@@ -1695,8 +1878,10 @@ async function main() {
|
|
|
1695
1878
|
channelLoader,
|
|
1696
1879
|
channelInstances,
|
|
1697
1880
|
startupRunners: Promise.allSettled([startupRunnersPromise, startupAgentRuntimePromise]),
|
|
1881
|
+
waitForRunnerLoads: runnerDemand.waitForIdle,
|
|
1698
1882
|
cancelStartup: () => {
|
|
1699
1883
|
startupCancelled = true;
|
|
1884
|
+
cancelStartupClassification();
|
|
1700
1885
|
priorityStartupGate.settle('cancelled');
|
|
1701
1886
|
normalStartupGate.settle('cancelled');
|
|
1702
1887
|
taskReadyGate.settle('cancelled');
|
|
@@ -1707,6 +1892,7 @@ async function main() {
|
|
|
1707
1892
|
schedulerQueue.stop();
|
|
1708
1893
|
channelConnectionRuntime?.stop();
|
|
1709
1894
|
for (const aid of startupRunnerReady.keys()) {
|
|
1895
|
+
startupRunnerTraces.get(aid)?.('cancelled');
|
|
1710
1896
|
startupRunnerReadyResolvers.get(aid)?.([]);
|
|
1711
1897
|
startupOperationReadyResolvers.get(aid)?.([]);
|
|
1712
1898
|
}
|