evolcore 0.0.43-test.3 → 0.0.43-test.5
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 +82 -0
- package/bin/ecmsg.js +492 -0
- package/bin/install-codex-managed-hooks.mjs +130 -8
- package/dist/ability/application-service.js +37 -0
- package/dist/ability/resources.js +28 -0
- package/dist/ability/runtime.js +6 -1
- package/dist/agents/claude-runner.js +7 -5
- package/dist/agents/codex/app-server-client.js +0 -12
- package/dist/agents/codex-runner.js +12 -54
- package/dist/agents/ecagent-runner.js +130 -35
- package/dist/aun/aid/agentmd.js +56 -12
- package/dist/aun/aid/control-aid.js +15 -0
- package/dist/aun/aid/identity.js +8 -0
- package/dist/aun/aid/ownership-operation.js +12 -3
- package/dist/aun/menu/client.js +8 -7
- package/dist/aun/menu/index.js +1 -1
- package/dist/aun/menu/transport.js +8 -5
- package/dist/aun/service-proxy.js +3 -0
- package/dist/channels/aun.js +56 -22
- package/dist/channels/daemon.js +12 -4
- package/dist/cli/agent-command.js +5 -0
- package/dist/cli/agent-create.js +32 -8
- package/dist/cli/agent.js +9 -3
- package/dist/cli/aid-bind-command.js +3 -0
- package/dist/cli/aun-commands.js +12 -5
- package/dist/cli/code-stats.js +451 -213
- package/dist/cli/ctl-command.js +1 -3
- package/dist/cli/daemon-commands.js +42 -21
- package/dist/cli/directory.js +7 -8
- package/dist/cli/ecmsg-gateway.js +204 -0
- package/dist/cli/getmeta-command.js +2 -1
- package/dist/cli/index.js +6 -0
- package/dist/cli/init.js +58 -18
- package/dist/cli/provider-command.js +82 -5
- package/dist/cli/restart-monitor.js +11 -19
- package/dist/cli/stats.js +8 -1
- package/dist/cli/task-context.js +3 -0
- package/dist/cli/trigger-command.js +20 -14
- package/dist/config/boot-log.js +23 -2
- package/dist/config/config-field-policy.js +2 -0
- package/dist/config/config-manager.js +13 -17
- package/dist/config/daemon-services.js +1 -0
- package/dist/config/peer-role-resolver.js +6 -6
- package/dist/config/provider-identity-migration.js +202 -0
- package/dist/config/provider-identity.js +37 -0
- package/dist/config/provider-ipc-service.js +40 -3
- package/dist/config/provider-local-sync.js +153 -0
- package/dist/config/providers-config.js +32 -4
- package/dist/config/providers-management.js +144 -68
- package/dist/config/providers.js +4 -1
- package/dist/config/role-schema.js +3 -3
- package/dist/config/schema-migration.js +188 -3
- package/dist/core/agent-application-service.js +11 -0
- package/dist/core/agent-ipc-registration.js +2 -0
- package/dist/core/agent-runtime.js +45 -11
- package/dist/core/auth/auth-gateway.js +8 -6
- package/dist/core/auth/delegation-diagnostics.js +6 -2
- package/dist/core/auth/operation-authorizer.js +5 -2
- package/dist/core/auth/operation-catalog.js +6 -4
- package/dist/core/baseagent-loader.js +11 -3
- package/dist/core/bootstrap-service.js +8 -0
- package/dist/core/channel-loader.js +61 -23
- package/dist/core/command/agent-control.js +4 -1
- package/dist/core/command/chatmode-config.js +46 -0
- package/dist/core/command/cli-intent-parser.js +2 -1
- package/dist/core/command/command-handler.js +16 -20
- package/dist/core/command/daemon-diagnostics.js +2 -1
- package/dist/core/command/menu-catalog.js +1 -1
- package/dist/core/command/menu-handler.js +16 -16
- package/dist/core/command/menu-protocol.js +4 -2
- package/dist/core/command/provider-menu.js +4 -2
- package/dist/core/command/role-menu.js +2 -2
- package/dist/core/command/slash-handler.js +56 -42
- package/dist/core/daemon-lifecycle.js +35 -17
- package/dist/core/event-catalog.js +19 -0
- package/dist/core/evolagent-registry.js +3 -0
- package/dist/core/handoff/runtime.js +9 -3
- package/dist/core/initialization/service.js +4 -3
- package/dist/core/ipc-registration.js +6 -0
- package/dist/core/message/aun-ipc-sender.js +81 -3
- package/dist/core/message/im-renderer.js +24 -19
- package/dist/core/message/message-admission.js +13 -2
- package/dist/core/message/response-engine.js +40 -41
- package/dist/core/message/send-options.js +40 -0
- package/dist/core/message/send-routing.js +310 -0
- package/dist/core/model/model-capabilities.js +37 -0
- package/dist/core/model/model-catalog.js +6 -2
- package/dist/core/ownership/owner-resolver.js +117 -14
- package/dist/core/permission/ec-command-parser.js +195 -27
- package/dist/core/permission/readonly-shell-query.js +66 -7
- package/dist/core/permission/tool-error-code.js +13 -1
- package/dist/core/permission/tool-policy.js +74 -20
- package/dist/core/plugin-lifecycle.js +6 -2
- package/dist/core/relation/pa-team.js +7 -2
- package/dist/core/relation/same-owner-proof.js +131 -0
- package/dist/core/session/session-idle-monitor.js +94 -16
- package/dist/core/session/session-manager.js +69 -16
- package/dist/core/thread/thread-route.js +5 -2
- package/dist/directory/owner-directory-cache.js +690 -99
- package/dist/directory/owner-directory-markdown.js +146 -36
- package/dist/directory/owner-directory-query-operation.js +7 -9
- package/dist/directory/owner-directory-scope.js +12 -0
- package/dist/directory/owner-directory-search.js +5 -1
- package/dist/directory/owner-directory-store.js +28 -0
- package/dist/ecweb/basic-settings-service.js +15 -1
- package/dist/ecweb/message-context-service.js +2 -2
- package/dist/ecweb/providers-service.js +3 -1
- package/dist/ecweb/runtime/lifecycle.js +38 -5
- package/dist/ecweb/runtime/supervisor.js +157 -49
- package/dist/index.js +202 -38
- package/dist/paths.js +2 -1
- package/dist/proxy/manager.js +2 -0
- package/dist/proxy/service-supervisor.js +379 -143
- package/dist/response-system/engines/v1/proactive-flow.js +4 -0
- package/dist/trigger/application-service.js +1 -0
- package/dist/trigger/audit.js +3 -2
- package/dist/trigger/authorization.js +2 -3
- package/dist/trigger/event-source.js +4 -0
- package/dist/trigger/feedback.js +26 -2
- package/dist/trigger/history.js +4 -3
- package/dist/trigger/ipc-service.js +24 -19
- package/dist/trigger/manager.js +3 -5
- package/dist/trigger/parser.js +4 -21
- package/dist/trigger/patch.js +3 -15
- package/dist/trigger/scheduler.js +48 -13
- package/dist/trigger/system-definitions.js +2 -2
- package/dist/trigger/validation.js +4 -13
- package/dist/utils/autostart.js +2 -2
- package/dist/utils/cross-platform.js +36 -8
- package/dist/utils/error-utils.js +8 -0
- package/dist/utils/macos-autostart.js +31 -0
- package/dist/utils/model-prices.jsonl +15 -8
- package/dist/utils/process-introspect.js +21 -1
- package/dist/utils/public-suffix.js +5811 -0
- package/dist/utils/startup-trace.js +7 -1
- package/dist/utils/windows-autostart.js +42 -7
- package/ecagent/dist/harness/compaction/branch-summarization.js +1 -1
- package/ecagent/dist/harness/compaction/compaction.js +4 -4
- package/ecagent/dist/harness/env/nodejs.js +46 -2
- package/kits/docs/aun/ABILITY_CALLING.md +3 -3
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/channels/feishu.md +2 -2
- package/kits/docs/context-assembly.md +20 -4
- package/kits/docs/evolcore/INDEX.md +3 -2
- package/kits/docs/evolcore/agent.md +2 -2
- package/kits/docs/evolcore/aid.md +8 -2
- package/kits/docs/evolcore/ctl.md +13 -4
- package/kits/docs/evolcore/directory.md +48 -15
- package/kits/docs/evolcore/file-navigation.md +63 -49
- package/kits/docs/evolcore/group.md +6 -6
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +33 -3
- package/kits/docs/evolcore/model.md +5 -3
- package/kits/docs/evolcore/msg.md +28 -27
- package/kits/docs/evolcore/provider.md +39 -5
- package/kits/docs/evolcore/response.md +3 -1
- package/kits/docs/evolcore/thread-chain.md +12 -14
- package/kits/docs/evolcore/tool-authorization.md +21 -1
- package/kits/docs/evolcore/trigger.md +12 -9
- package/kits/docs/identity/ROLE_DETAIL.md +1 -1
- package/kits/docs/prompt-loading-architecture.md +30 -20
- package/kits/eck_manifest.auxiliary.json +5 -5
- package/kits/eck_manifest.json +28 -49
- package/kits/eck_manifest.memory.json +18 -18
- package/kits/rules/01-overview.md +43 -45
- package/kits/rules/02-navigation.md +44 -53
- package/kits/rules/03-identity.md +21 -25
- package/kits/rules/04-relation.md +23 -33
- package/kits/rules/05-venue.md +24 -25
- package/kits/rules/06-channel.md +3 -3
- package/kits/schemas/_meta.json +20 -27
- package/kits/schemas/agent-config.schema.19.json +10 -6
- package/kits/schemas/providers.schema.2.json +74 -0
- package/kits/schemas/relation-config.schema.12.json +2 -2
- package/kits/schemas/role-config.schema.2.json +5 -5
- package/kits/schemas/role-registry.schema.1.json +1 -1
- package/kits/skills/ec-agent-create/SKILL.md +1 -0
- package/kits/skills/ec-service-proxy/SKILL.md +3 -0
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/ec-trigger/references/examples.md +1 -1
- package/kits/templates/system-fragments/channel.md +5 -5
- package/kits/templates/system-fragments/commands.md +3 -2
- package/kits/templates/system-fragments/directory-contacts.md +10 -3
- package/kits/templates/system-fragments/identity.md +0 -1
- package/kits/templates/system-fragments/personal-assistant.md +22 -3
- package/kits/templates/system-fragments/reply.md +47 -28
- package/kits/templates/system-fragments/session.md +2 -9
- package/kits/templates/system-fragments/thread.md +5 -5
- package/package.json +17 -13
- package/kits/schemas/agent-config.schema.20.json +0 -925
- package/kits/schemas/relation-config.schema.13.json +0 -289
- package/kits/schemas/role-config.schema.3.json +0 -1038
package/dist/index.js
CHANGED
|
@@ -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
|
|
81
|
+
import { StartupTracer } 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';
|
|
@@ -102,11 +102,10 @@ export function readEvolcoreVersion() {
|
|
|
102
102
|
}
|
|
103
103
|
async function main() {
|
|
104
104
|
// 启动甘特图埋点。firstPhase 之前的时间(node 启动 + 模块加载 + tsx/dist 编译)
|
|
105
|
-
// 全部记进 daemon.bootstrap
|
|
105
|
+
// 全部记进 daemon.bootstrap;计时器消费 `ec start` 传入的一次性 traceId,
|
|
106
106
|
// 没传说明是 restart-monitor 或其它途径拉起的,自己生成一个。
|
|
107
107
|
const trace = new StartupTracer('daemon', {
|
|
108
108
|
firstPhase: 'daemon.bootstrap',
|
|
109
|
-
traceId: process.env[STARTUP_TRACE_ID_ENV] || undefined,
|
|
110
109
|
});
|
|
111
110
|
trace.setMeta('launchedBy', process.env.EVOLCORE_LAUNCHED_BY || 'start');
|
|
112
111
|
trace.setMeta('node', process.version);
|
|
@@ -255,6 +254,7 @@ async function main() {
|
|
|
255
254
|
enabled: ecwebConfig?.enabled === true,
|
|
256
255
|
runtimeMode: ecwebConfig ? serviceRuntimeMode(ecwebConfig) : 'managed',
|
|
257
256
|
restart: ecwebConfig?.runtime?.restart,
|
|
257
|
+
health: ecwebConfig?.health,
|
|
258
258
|
logger,
|
|
259
259
|
});
|
|
260
260
|
onShutdown(() => ecwebSupervisor?.stop());
|
|
@@ -268,6 +268,7 @@ async function main() {
|
|
|
268
268
|
port: service?.port ?? DEFAULT_ECWEB_PORT,
|
|
269
269
|
runtimeMode: service ? serviceRuntimeMode(service) : 'managed',
|
|
270
270
|
restart: service?.runtime?.restart,
|
|
271
|
+
health: service?.health,
|
|
271
272
|
}).catch((error) => logger.warn(`ECWeb 配置热应用失败: ${error?.message || error}`));
|
|
272
273
|
}
|
|
273
274
|
catch (error) {
|
|
@@ -289,6 +290,7 @@ async function main() {
|
|
|
289
290
|
const { primaryAgent, runtimeStatus } = loadStartupAgentRegistry(agentRegistry);
|
|
290
291
|
let agentRuntimeState = runtimeStatus.state;
|
|
291
292
|
let agentRuntimeError = runtimeStatus.error;
|
|
293
|
+
const startupAgents = [...agentRegistry.runnableAgents()];
|
|
292
294
|
// 进程级设置独立来自 daemon.json,不进入 Agent 覆盖链。
|
|
293
295
|
const globalSettings = {
|
|
294
296
|
idleMonitor: daemonCfg.idleMonitor,
|
|
@@ -335,16 +337,114 @@ async function main() {
|
|
|
335
337
|
agentLoader.register(new CodexAgentPlugin());
|
|
336
338
|
agentLoader.register(new GeminiAgentPlugin());
|
|
337
339
|
agentLoader.register(new EcagentAgentPluginLazy());
|
|
338
|
-
trace.mark('daemon.agentRunners');
|
|
339
|
-
const { agentInstances, agentMap, primaryBaseagent, primaryRunnerKey, runtimeError: runnerStartupError, } = await createStartupAgentRunners({ agentRegistry, agentLoader, sessionManager, primaryAgent });
|
|
340
|
-
if (runnerStartupError) {
|
|
341
|
-
agentRuntimeState = 'error';
|
|
342
|
-
agentRuntimeError = runnerStartupError;
|
|
343
|
-
}
|
|
344
340
|
// 权限审批网关
|
|
345
341
|
const permissionGateway = new PermissionGateway();
|
|
346
342
|
permissionGateway.setEventBus(eventBus);
|
|
347
343
|
const removePermissionConfigListener = permissionGateway.registerConfigRevalidation();
|
|
344
|
+
const agentInstances = [];
|
|
345
|
+
const agentMap = new Map();
|
|
346
|
+
const primaryBaseagent = primaryAgent?.baseagent ?? 'claude';
|
|
347
|
+
const primaryRunnerKey = primaryAgent ? `${primaryAgent.aid}::${primaryBaseagent}` : '<empty>::claude';
|
|
348
|
+
const startupRunnerInstances = new Map();
|
|
349
|
+
const startupRunnerReadyResolvers = new Map();
|
|
350
|
+
const startupRunnerReady = new Map();
|
|
351
|
+
const startupOperationReadyResolvers = new Map();
|
|
352
|
+
const startupOperationReady = new Map();
|
|
353
|
+
const channelInstancesByAgent = new Map();
|
|
354
|
+
const runnerResultsByAgent = new Map();
|
|
355
|
+
const runnerSettledAgents = new Set();
|
|
356
|
+
let startupChannelsRegistered = false;
|
|
357
|
+
let startupCancelled = false;
|
|
358
|
+
const resolveStartupOperation = (aid) => {
|
|
359
|
+
if (startupCancelled || (startupChannelsRegistered && runnerSettledAgents.has(aid))) {
|
|
360
|
+
startupOperationReadyResolvers.get(aid)?.(runnerResultsByAgent.get(aid) ?? []);
|
|
361
|
+
}
|
|
362
|
+
};
|
|
363
|
+
const boundStartupAgents = new Set();
|
|
364
|
+
const bindStartupAgentChannels = (agent, runners) => {
|
|
365
|
+
if (boundStartupAgents.has(agent.aid) || startupCancelled
|
|
366
|
+
|| agent.status === 'error' || agent.status === 'disabled' || runners.length === 0)
|
|
367
|
+
return;
|
|
368
|
+
const channels = channelInstancesByAgent.get(agent.aid);
|
|
369
|
+
if (!channels)
|
|
370
|
+
return;
|
|
371
|
+
bindStartupChannelsToAgents(channels, agentRegistry, runners);
|
|
372
|
+
boundStartupAgents.add(agent.aid);
|
|
373
|
+
};
|
|
374
|
+
for (const agent of startupAgents) {
|
|
375
|
+
startupRunnerReady.set(agent.aid, new Promise(resolve => {
|
|
376
|
+
startupRunnerReadyResolvers.set(agent.aid, resolve);
|
|
377
|
+
}));
|
|
378
|
+
startupOperationReady.set(agent.aid, new Promise(resolve => {
|
|
379
|
+
startupOperationReadyResolvers.set(agent.aid, resolve);
|
|
380
|
+
}));
|
|
381
|
+
}
|
|
382
|
+
let baseagentSnapshot;
|
|
383
|
+
const refreshLoadedBaseagents = () => {
|
|
384
|
+
if (!baseagentSnapshot)
|
|
385
|
+
return;
|
|
386
|
+
const loaded = new Set(loadedBaseagentIds(agentMap.keys()));
|
|
387
|
+
for (const baseagent of baseagentSnapshot.baseagents)
|
|
388
|
+
baseagent.loaded = loaded.has(baseagent.id);
|
|
389
|
+
};
|
|
390
|
+
let configureRunnerCallbacks;
|
|
391
|
+
const agentDelegationRegistry = new AgentDelegationRegistry();
|
|
392
|
+
process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
|
|
393
|
+
const startupRunnersStartedAtMs = Date.now();
|
|
394
|
+
trace.mark('daemon.agentRunnerDispatch');
|
|
395
|
+
const baseagentSnapshotPromise = getBaseagentSnapshot({ loaded: [], probe: true });
|
|
396
|
+
const startupRunnersPromise = createStartupAgentRunners({
|
|
397
|
+
agentRegistry,
|
|
398
|
+
agentLoader,
|
|
399
|
+
sessionManager,
|
|
400
|
+
primaryAgent,
|
|
401
|
+
agentInstances,
|
|
402
|
+
agentMap,
|
|
403
|
+
isCancelled: () => startupCancelled,
|
|
404
|
+
configureInstances: instances => {
|
|
405
|
+
for (const instance of instances) {
|
|
406
|
+
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
407
|
+
configureRunnerCallbacks?.(instance);
|
|
408
|
+
}
|
|
409
|
+
},
|
|
410
|
+
onAgentCreated: (agent, instances, timing) => {
|
|
411
|
+
runnerResultsByAgent.set(agent.aid, instances);
|
|
412
|
+
runnerSettledAgents.add(agent.aid);
|
|
413
|
+
startupRunnerInstances.set(agent.aid, instances);
|
|
414
|
+
bindStartupAgentChannels(agent, instances);
|
|
415
|
+
refreshLoadedBaseagents();
|
|
416
|
+
startupRunnerReadyResolvers.get(agent.aid)?.(instances);
|
|
417
|
+
resolveStartupOperation(agent.aid);
|
|
418
|
+
trace.addSpan('daemon.agentRunner', timing.startedAtMs, timing.completedAtMs, `aid=${agent.aid}; runners=${instances.map(instance => instance.baseagent).join(',') || 'none'}`);
|
|
419
|
+
logger.info(`[startup] Agent runners ready: aid=${agent.aid} runners=${instances.length}`
|
|
420
|
+
+ ` duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
421
|
+
},
|
|
422
|
+
}).then(result => {
|
|
423
|
+
if (result.runtimeError) {
|
|
424
|
+
agentRuntimeState = 'error';
|
|
425
|
+
agentRuntimeError = result.runtimeError;
|
|
426
|
+
}
|
|
427
|
+
logger.info(`[startup] Agent runner batch complete: agents=${startupAgents.length}`
|
|
428
|
+
+ ` runners=${agentMap.size} duration=${Date.now() - startupRunnersStartedAtMs}ms`);
|
|
429
|
+
trace.addSpan('daemon.agentRunners', startupRunnersStartedAtMs, Date.now(), `${startupAgents.length} 个 Agent; ${agentMap.size} 个 runner`);
|
|
430
|
+
return result;
|
|
431
|
+
});
|
|
432
|
+
void startupRunnersPromise.catch(error => {
|
|
433
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
434
|
+
agentRuntimeState = 'error';
|
|
435
|
+
agentRuntimeError = message;
|
|
436
|
+
logger.error(`[startup] Agent runner batch failed: ${message}`);
|
|
437
|
+
for (const agent of startupAgents) {
|
|
438
|
+
if (!startupRunnerInstances.has(agent.aid)) {
|
|
439
|
+
agent.status = 'error';
|
|
440
|
+
agent.error = message;
|
|
441
|
+
runnerSettledAgents.add(agent.aid);
|
|
442
|
+
runnerResultsByAgent.set(agent.aid, []);
|
|
443
|
+
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
444
|
+
resolveStartupOperation(agent.aid);
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
});
|
|
348
448
|
// 交互路由器
|
|
349
449
|
const interactionRouter = new InteractionRouter();
|
|
350
450
|
const groupInviteReviewService = new GroupInviteReviewService(interactionRouter);
|
|
@@ -352,10 +452,6 @@ async function main() {
|
|
|
352
452
|
if (target === ConfigTarget.Agent && selector.self)
|
|
353
453
|
groupInviteReviewService.configurationChanged(selector.self);
|
|
354
454
|
});
|
|
355
|
-
// 为所有支持权限的 agent 设置 gateway
|
|
356
|
-
for (const inst of agentInstances) {
|
|
357
|
-
inst.agent.setPermissionGateway?.(permissionGateway);
|
|
358
|
-
}
|
|
359
455
|
// 创建消息缓存
|
|
360
456
|
trace.mark('daemon.messageCache');
|
|
361
457
|
const messageCache = new MessageCache();
|
|
@@ -370,10 +466,12 @@ async function main() {
|
|
|
370
466
|
await registerBuiltinChannelPlugins(channelLoader);
|
|
371
467
|
// Create channel instances: 每个 self-agent 各自的 channels
|
|
372
468
|
const evolagentInstances = [];
|
|
373
|
-
for (const agent of
|
|
469
|
+
for (const agent of startupAgents) {
|
|
374
470
|
try {
|
|
375
471
|
const instances = await channelLoader.createForAgent(agent);
|
|
472
|
+
channelInstancesByAgent.set(agent.aid, instances);
|
|
376
473
|
evolagentInstances.push(...instances);
|
|
474
|
+
bindStartupAgentChannels(agent, startupRunnerInstances.get(agent.aid) ?? []);
|
|
377
475
|
}
|
|
378
476
|
catch (e) {
|
|
379
477
|
logger.error(`[Agent ${agent.aid}] Failed to create channels: ${e}`);
|
|
@@ -431,10 +529,6 @@ async function main() {
|
|
|
431
529
|
}
|
|
432
530
|
});
|
|
433
531
|
onShutdown(() => { stopOwnerNotifications(); ownerResolver.stop(); });
|
|
434
|
-
const agentDelegationRegistry = new AgentDelegationRegistry();
|
|
435
|
-
// Replace any inherited marker from a parent/previous daemon before child
|
|
436
|
-
// runners or in-process IPC clients are created.
|
|
437
|
-
process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
|
|
438
532
|
// 创建命令处理器
|
|
439
533
|
const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
|
|
440
534
|
cmdHandler.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
@@ -457,6 +551,13 @@ async function main() {
|
|
|
457
551
|
}, primaryRunnerKey);
|
|
458
552
|
responseEngine.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
459
553
|
const processor = responseEngine;
|
|
554
|
+
configureRunnerCallbacks = instance => {
|
|
555
|
+
instance.agent.setCompactStartCallback?.((sessionId) => {
|
|
556
|
+
processor.handleCompactStart(sessionId);
|
|
557
|
+
});
|
|
558
|
+
};
|
|
559
|
+
for (const inst of agentInstances)
|
|
560
|
+
configureRunnerCallbacks(inst);
|
|
460
561
|
responseEngine.setObserverHintConsumed((hint, target, meta) => {
|
|
461
562
|
const observerChannel = channelInstances.find(candidate => candidate.adapter.channelKey === target.channelKey
|
|
462
563
|
&& candidate.channelType === 'aun')?.channel;
|
|
@@ -478,14 +579,13 @@ async function main() {
|
|
|
478
579
|
}
|
|
479
580
|
// 设置交互路由器
|
|
480
581
|
processor.setInteractionRouter(interactionRouter);
|
|
481
|
-
// 设置 compact 开始回调(对所有支持的 agent)
|
|
482
|
-
for (const inst of agentInstances) {
|
|
483
|
-
inst.agent.setCompactStartCallback?.((sessionId) => {
|
|
484
|
-
processor.handleCompactStart(sessionId);
|
|
485
|
-
});
|
|
486
|
-
}
|
|
487
582
|
// 创建消息队列
|
|
488
583
|
const messageQueue = new MessageQueue(async (message) => {
|
|
584
|
+
const owner = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
585
|
+
if (owner)
|
|
586
|
+
await startupRunnerReady.get(owner);
|
|
587
|
+
if (startupCancelled)
|
|
588
|
+
return;
|
|
489
589
|
await processor.processMessage(message);
|
|
490
590
|
}, {
|
|
491
591
|
persistencePath: daemonQueuePath(),
|
|
@@ -599,7 +699,7 @@ async function main() {
|
|
|
599
699
|
fs.chmodSync(resolvePaths().controlToken, 0o600);
|
|
600
700
|
}
|
|
601
701
|
catch { }
|
|
602
|
-
const triggerStartupAgents =
|
|
702
|
+
const triggerStartupAgents = startupAgents;
|
|
603
703
|
const controlAid = daemonCfg.aid || '__daemon__';
|
|
604
704
|
const daemonTriggerOwner = {
|
|
605
705
|
aid: triggerStartupAgents.some(agent => agent.aid === controlAid) ? `${controlAid}#daemon` : controlAid,
|
|
@@ -662,6 +762,8 @@ async function main() {
|
|
|
662
762
|
messageQueue,
|
|
663
763
|
responseEngine,
|
|
664
764
|
sessionManager,
|
|
765
|
+
canDispatchSessionLoopOnce: (sessionId, requestId, generation) => (sessionIdleMonitor.isCurrentLoopOnceEvent(sessionId, requestId, generation)
|
|
766
|
+
&& !messageQueue.isProcessing(sessionId) && messageQueue.getQueueLength(sessionId) === 0),
|
|
665
767
|
targetSessionLocks,
|
|
666
768
|
triggerAudit,
|
|
667
769
|
triggerScriptExecutor,
|
|
@@ -670,9 +772,17 @@ async function main() {
|
|
|
670
772
|
};
|
|
671
773
|
cmdHandler.setTriggerSchedulerResolver((agentAid) => triggerSchedulers.get(agentAid));
|
|
672
774
|
const ensureTriggerSchedulerStarted = async (agent) => {
|
|
775
|
+
await startupRunnerReady.get(agent.aid);
|
|
776
|
+
if (startupCancelled || agent.status === 'error' || agent.status === 'disabled')
|
|
777
|
+
return;
|
|
673
778
|
await triggerSchedulers.ensureStarted(agent.aid, () => startTriggerScheduler(agent));
|
|
674
779
|
};
|
|
675
780
|
const ensureDaemonTriggerSchedulerStarted = async () => {
|
|
781
|
+
const primaryRunners = primaryAgent ? await startupRunnerReady.get(primaryAgent.aid) : undefined;
|
|
782
|
+
if (startupCancelled)
|
|
783
|
+
return;
|
|
784
|
+
if (primaryAgent && (!primaryRunners?.length || primaryAgent.status === 'error'))
|
|
785
|
+
return;
|
|
676
786
|
await triggerSchedulers.ensureStarted(daemonTriggerOwner.aid, () => startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }));
|
|
677
787
|
};
|
|
678
788
|
const defaultPolicy = createDefaultChannelPolicy();
|
|
@@ -737,9 +847,18 @@ async function main() {
|
|
|
737
847
|
for (const inst of channelInstances) {
|
|
738
848
|
registerChannelInstance(inst);
|
|
739
849
|
}
|
|
740
|
-
|
|
741
|
-
|
|
742
|
-
|
|
850
|
+
startupChannelsRegistered = true;
|
|
851
|
+
for (const aid of startupRunnerReady.keys())
|
|
852
|
+
resolveStartupOperation(aid);
|
|
853
|
+
const startupAgentRuntimePromise = startupRunnersPromise.then(async (result) => {
|
|
854
|
+
if (startupCancelled)
|
|
855
|
+
return;
|
|
856
|
+
({ state: agentRuntimeState, error: agentRuntimeError } = await completeStartupAgentRuntime(agentRegistry, { state: agentRuntimeState, error: result.runtimeError ?? agentRuntimeError }));
|
|
857
|
+
}).catch(error => {
|
|
858
|
+
agentRuntimeState = 'error';
|
|
859
|
+
agentRuntimeError = error instanceof Error ? error.message : String(error);
|
|
860
|
+
logger.error(`[startup] Agent runtime initialization failed: ${agentRuntimeError}`);
|
|
861
|
+
});
|
|
743
862
|
// ── 配置快照 + 启动日志(启动完毕锚点,网络无关)──────────────────
|
|
744
863
|
trace.mark('daemon.startupConfigRecord');
|
|
745
864
|
recordStartupConfig(configSnapshotsEnabled);
|
|
@@ -798,7 +917,8 @@ async function main() {
|
|
|
798
917
|
let pendingShutdownReason;
|
|
799
918
|
let pendingShutdownTraceId;
|
|
800
919
|
trace.mark('daemon.baseagentProbe');
|
|
801
|
-
|
|
920
|
+
baseagentSnapshot = await baseagentSnapshotPromise;
|
|
921
|
+
refreshLoadedBaseagents();
|
|
802
922
|
const getStatusSnapshot = () => {
|
|
803
923
|
const now = Date.now();
|
|
804
924
|
const todayStart = new Date(new Date(now).getFullYear(), new Date(now).getMonth(), new Date(now).getDate()).getTime();
|
|
@@ -907,6 +1027,7 @@ async function main() {
|
|
|
907
1027
|
aidStatsCollector,
|
|
908
1028
|
handoffRuntime,
|
|
909
1029
|
messageQueue,
|
|
1030
|
+
awaitStartupAgent: async (aid) => { await startupOperationReady.get(aid); },
|
|
910
1031
|
});
|
|
911
1032
|
registerRelationConsolidationEvents({ eventBus, agentRegistry, responseEngine, enqueueConsolidation });
|
|
912
1033
|
globalThis.__evolcore_reloadHooks = reloadHooks;
|
|
@@ -932,8 +1053,18 @@ async function main() {
|
|
|
932
1053
|
setAgentRuntimeState: state => { agentRuntimeState = state; },
|
|
933
1054
|
setAgentRuntimeError: error => { agentRuntimeError = error; },
|
|
934
1055
|
});
|
|
935
|
-
globalThis.__evolcore_hotLoadAgent =
|
|
936
|
-
|
|
1056
|
+
globalThis.__evolcore_hotLoadAgent = async (aid) => {
|
|
1057
|
+
await startupRunnerReady.get(aid);
|
|
1058
|
+
if (startupCancelled)
|
|
1059
|
+
throw new Error('Daemon is shutting down');
|
|
1060
|
+
return agentRuntimeOperations.hotLoad(aid);
|
|
1061
|
+
};
|
|
1062
|
+
globalThis.__evolcore_resyncAgents = async () => {
|
|
1063
|
+
await Promise.all(startupRunnerReady.values());
|
|
1064
|
+
if (startupCancelled)
|
|
1065
|
+
throw new Error('Daemon is shutting down');
|
|
1066
|
+
return agentRuntimeOperations.resync();
|
|
1067
|
+
};
|
|
937
1068
|
const coreHotLoadAgent = async (aid) => {
|
|
938
1069
|
const hotLoad = globalThis.__evolcore_hotLoadAgent;
|
|
939
1070
|
if (typeof hotLoad !== 'function')
|
|
@@ -968,6 +1099,12 @@ async function main() {
|
|
|
968
1099
|
return state ? [state] : [];
|
|
969
1100
|
}),
|
|
970
1101
|
aunAidStats: () => aidStatsCollector.getAllSnapshots(),
|
|
1102
|
+
beforeAgentOperation: async (aid) => {
|
|
1103
|
+
if (aid)
|
|
1104
|
+
await startupOperationReady.get(aid);
|
|
1105
|
+
else
|
|
1106
|
+
await Promise.all(startupOperationReady.values());
|
|
1107
|
+
},
|
|
971
1108
|
});
|
|
972
1109
|
const agentInitializationService = createAgentInitializationRuntime({
|
|
973
1110
|
agentRegistry,
|
|
@@ -1056,6 +1193,27 @@ async function main() {
|
|
|
1056
1193
|
logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
|
|
1057
1194
|
const connectAllPromise = channelLoader.connectAll(channelInstances, {
|
|
1058
1195
|
concurrency: 10,
|
|
1196
|
+
beforeConnect: async (instance) => {
|
|
1197
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1198
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1199
|
+
if (!owner)
|
|
1200
|
+
return !startupCancelled;
|
|
1201
|
+
const readiness = startupRunnerReady.get(owner.aid);
|
|
1202
|
+
if (!readiness)
|
|
1203
|
+
return false;
|
|
1204
|
+
const runners = await readiness;
|
|
1205
|
+
if (startupCancelled || runners.length === 0 || owner.status === 'error' || owner.status === 'disabled')
|
|
1206
|
+
return false;
|
|
1207
|
+
bindStartupAgentChannels(owner, runners);
|
|
1208
|
+
return true;
|
|
1209
|
+
},
|
|
1210
|
+
shouldConnect: instance => {
|
|
1211
|
+
if (startupCancelled || !channelInstances.includes(instance))
|
|
1212
|
+
return false;
|
|
1213
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1214
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1215
|
+
return !owner || owner.status === 'running';
|
|
1216
|
+
},
|
|
1059
1217
|
onConnected: markChannelConnected,
|
|
1060
1218
|
onFailed: (inst, error) => {
|
|
1061
1219
|
logger.warn(`[startup] ${inst.adapter.channelName} initial connect failed: ${error}`);
|
|
@@ -1200,13 +1358,11 @@ async function main() {
|
|
|
1200
1358
|
startRestoredQueue: () => messageQueue.startRestored(),
|
|
1201
1359
|
}).catch(error => logger.error('[Queue] restored queue release failed:', error));
|
|
1202
1360
|
trace.mark('daemon.resumeSessions');
|
|
1203
|
-
|
|
1204
|
-
|
|
1205
|
-
|
|
1206
|
-
droppedTriggerSessionIds,
|
|
1207
|
-
|
|
1208
|
-
agentMap,
|
|
1209
|
-
});
|
|
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)}`));
|
|
1210
1366
|
trace.mark('daemon.cpuTracking');
|
|
1211
1367
|
ipcServer.startCpuTracking();
|
|
1212
1368
|
// IPC was bound before channel connection. At this point all handlers are
|
|
@@ -1256,6 +1412,14 @@ async function main() {
|
|
|
1256
1412
|
groupInviteReviewService,
|
|
1257
1413
|
channelLoader,
|
|
1258
1414
|
channelInstances,
|
|
1415
|
+
startupRunners: Promise.allSettled([startupRunnersPromise, startupAgentRuntimePromise]),
|
|
1416
|
+
cancelStartup: () => {
|
|
1417
|
+
startupCancelled = true;
|
|
1418
|
+
for (const aid of startupRunnerReady.keys()) {
|
|
1419
|
+
startupRunnerReadyResolvers.get(aid)?.([]);
|
|
1420
|
+
startupOperationReadyResolvers.get(aid)?.([]);
|
|
1421
|
+
}
|
|
1422
|
+
},
|
|
1259
1423
|
controlChannel,
|
|
1260
1424
|
sessionManager,
|
|
1261
1425
|
removeAll,
|
package/dist/paths.js
CHANGED
|
@@ -56,7 +56,8 @@ export function resolvePaths() {
|
|
|
56
56
|
providersConfig: path.join(root, 'providers.json'),
|
|
57
57
|
logs: path.join(root, 'logs'),
|
|
58
58
|
agentsDir,
|
|
59
|
-
lineStats: path.join(root, 'logs', '
|
|
59
|
+
lineStats: path.join(root, 'logs', 'code-stats.json'),
|
|
60
|
+
lineStatsCache: path.join(root, 'logs', 'code-stats-cache.json'),
|
|
60
61
|
readySignal: path.join(root, 'data', 'instance', 'ready.signal'),
|
|
61
62
|
controlToken: path.join(root, 'data', 'instance', 'control.token'),
|
|
62
63
|
/** 启动/停止阶段埋点记录(CLI 与 daemon 各写一行,按 traceId 关联) */
|
package/dist/proxy/manager.js
CHANGED
|
@@ -325,6 +325,7 @@ export class ServiceProxyManager {
|
|
|
325
325
|
port: current.port ?? DEFAULT_ECWEB_PORT,
|
|
326
326
|
runtimeMode: 'managed',
|
|
327
327
|
restart: current.runtime?.restart,
|
|
328
|
+
health: current.health,
|
|
328
329
|
});
|
|
329
330
|
return { ok: true, ...result, operationId, jobId: operationId, state: 'completed', runtime: this.options.ecwebSupervisor.status() };
|
|
330
331
|
}
|
|
@@ -402,6 +403,7 @@ export class ServiceProxyManager {
|
|
|
402
403
|
port: ecweb?.port ?? DEFAULT_ECWEB_PORT,
|
|
403
404
|
runtimeMode: ecweb ? serviceRuntimeMode(ecweb) : 'managed',
|
|
404
405
|
restart: ecweb?.runtime?.restart,
|
|
406
|
+
health: ecweb?.health,
|
|
405
407
|
});
|
|
406
408
|
await this.supervisor.reconcile(services);
|
|
407
409
|
if (this.stopped)
|