evolcore 0.0.43-test.5 → 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 +95 -0
- package/bin/ecmsg.js +281 -81
- package/dist/agents/baseagent-availability.js +20 -5
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +36 -3
- package/dist/agents/codex-runner.js +75 -8
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +306 -30
- package/dist/cli/agent-create.js +18 -8
- package/dist/cli/aun-commands.js +9 -1
- package/dist/cli/daemon-commands.js +34 -65
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +38 -3
- package/dist/cli/events-command.js +73 -0
- package/dist/cli/index.js +31 -14
- package/dist/cli/init.js +75 -0
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/provider-command.js +1 -1
- package/dist/cli/restart-monitor.js +67 -50
- package/dist/cli/services-command.js +111 -0
- package/dist/cli/task-context.js +38 -1
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +6 -2
- package/dist/cli/watch-logs.js +6 -4
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +6 -4
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +1 -8
- package/dist/config/invoke-ipc-service.js +118 -0
- 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 +86 -88
- package/dist/config/snapshot.js +70 -41
- package/dist/config-store.js +2 -1
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +146 -15
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-catalog.js +20 -0
- package/dist/core/baseagent-loader.js +75 -42
- package/dist/core/channel-loader.js +45 -13
- package/dist/core/channel-runtime.js +116 -45
- 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 +58 -16
- 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 +206 -87
- package/dist/core/command/menu-protocol.js +142 -22
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/role-menu.js +27 -15
- 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 +45 -15
- package/dist/core/daemon-lifecycle.js +478 -75
- 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/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 +51 -11
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +149 -19
- package/dist/core/message/im-renderer.js +28 -84
- package/dist/core/message/message-bridge.js +57 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +163 -52
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +55 -7
- package/dist/core/ownership/owner-resolver.js +8 -0
- package/dist/core/permission/ec-command-parser.js +14 -3
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- 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-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +163 -3
- package/dist/core/session/session-idle-monitor.js +9 -1
- package/dist/core/session/session-manager.js +36 -2
- 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 +42 -30
- package/dist/directory/owner-directory-cache.js +143 -126
- package/dist/directory/owner-directory-query-operation.js +9 -8
- 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 +14 -8
- package/dist/ecweb/runtime/supervisor.js +62 -30
- 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 +751 -268
- package/dist/ipc.js +66 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +43 -18
- package/dist/proxy/service-supervisor.js +78 -35
- 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 +21 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +78 -5
- package/dist/trigger/script-sandbox.js +118 -22
- package/dist/utils/cross-platform.js +175 -13
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +109 -10
- package/dist/utils/startup-trace.js +222 -44
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +10 -17
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +5 -2
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/ctl.md +2 -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 +2 -2
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +21 -0
- package/kits/docs/evolcore/msg.md +27 -8
- package/kits/docs/evolcore/provider.md +23 -3
- 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 +45 -7
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +5 -6
- 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/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/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- 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/.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-group/SKILL.md +8 -5
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- 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/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +9 -7
- package/kits/templates/system-fragments/reply.md +2 -6
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +11 -9
- package/package.json +5 -6
- 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,14 +39,14 @@ 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';
|
|
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';
|
|
@@ -75,10 +75,10 @@ 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
|
-
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';
|
|
@@ -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,16 +97,21 @@ 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();
|
|
102
106
|
}
|
|
107
|
+
let startupCpuProfile;
|
|
103
108
|
async function main() {
|
|
104
109
|
// 启动甘特图埋点。firstPhase 之前的时间(node 启动 + 模块加载 + tsx/dist 编译)
|
|
105
110
|
// 全部记进 daemon.bootstrap;计时器消费 `ec start` 传入的一次性 traceId,
|
|
106
111
|
// 没传说明是 restart-monitor 或其它途径拉起的,自己生成一个。
|
|
107
112
|
const trace = new StartupTracer('daemon', {
|
|
108
113
|
firstPhase: 'daemon.bootstrap',
|
|
114
|
+
initialPhase: 'running',
|
|
109
115
|
});
|
|
110
116
|
trace.setMeta('launchedBy', process.env.EVOLCORE_LAUNCHED_BY || 'start');
|
|
111
117
|
trace.setMeta('node', process.version);
|
|
@@ -114,8 +120,11 @@ async function main() {
|
|
|
114
120
|
// Service managers do not necessarily export TMPDIR. Establish the private
|
|
115
121
|
// managed root before any runner or task runtime is initialized.
|
|
116
122
|
ensureProcessManagedTempDir();
|
|
117
|
-
|
|
118
|
-
|
|
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
|
+
});
|
|
119
128
|
trace.mark('daemon.sdkFilter');
|
|
120
129
|
installChannelSdkConsoleFilter();
|
|
121
130
|
console.error('[EvolCore] ✓ Console filter installed');
|
|
@@ -146,7 +155,7 @@ async function main() {
|
|
|
146
155
|
// pre-check:发现已有活 main 直接退出,避免起任何副作用
|
|
147
156
|
trace.mark('daemon.instancePreCheck');
|
|
148
157
|
{
|
|
149
|
-
const pre = scanInstances();
|
|
158
|
+
const pre = scanInstances({ kind: 'main', includeAidActivity: false });
|
|
150
159
|
const aliveOthers = pre.mains.filter(m => m.alive && m.record.pid !== process.pid);
|
|
151
160
|
if (aliveOthers.length > 0) {
|
|
152
161
|
const pids = aliveOthers.map(m => m.record.pid).join(', ');
|
|
@@ -184,6 +193,11 @@ async function main() {
|
|
|
184
193
|
process.exit(0);
|
|
185
194
|
}
|
|
186
195
|
}
|
|
196
|
+
// Diagnostic opt-in is consumed only by the elected daemon, never an importing test or losing process.
|
|
197
|
+
trace.mark('daemon.startupCpuProfile');
|
|
198
|
+
startupCpuProfile = await startRequestedStartupCpuProfile(trace.id);
|
|
199
|
+
if (startupCpuProfile)
|
|
200
|
+
trace.setMeta('startupCpuProfile', startupCpuProfile.file);
|
|
187
201
|
// ── 自动迁移 ──
|
|
188
202
|
trace.mark('daemon.migrations');
|
|
189
203
|
migrateIdentitiesIfNeeded();
|
|
@@ -206,7 +220,7 @@ async function main() {
|
|
|
206
220
|
trace.mark('daemon.configInit');
|
|
207
221
|
const configSnapshotsEnabled = await initializeStartupConfig(message => {
|
|
208
222
|
console.error(message);
|
|
209
|
-
|
|
223
|
+
throw new Error(message);
|
|
210
224
|
});
|
|
211
225
|
const daemonCfg = loadDaemonConfig();
|
|
212
226
|
if (daemonCfg.debug?.logLevel) {
|
|
@@ -242,6 +256,22 @@ async function main() {
|
|
|
242
256
|
const processLevelOwners = getDaemonOwners;
|
|
243
257
|
const bindBootstrapMode = process.env.EVOLCORE_BIND_BOOTSTRAP === '1';
|
|
244
258
|
const paths = resolvePaths();
|
|
259
|
+
let startupCancelled = false;
|
|
260
|
+
let cancelStartupClassification = () => { };
|
|
261
|
+
let normalTaskState = 'pending';
|
|
262
|
+
let startupEcwebState = 'waiting';
|
|
263
|
+
const priorityStartupGate = new StartupGate();
|
|
264
|
+
const normalStartupGate = new StartupGate();
|
|
265
|
+
// Audit needs genuine task Ready; optional services can also start degraded.
|
|
266
|
+
const taskReadyGate = new StartupGate();
|
|
267
|
+
const waitForBackgroundStartup = async () => await normalStartupGate.promise !== 'cancelled' && !startupCancelled;
|
|
268
|
+
onShutdown(() => {
|
|
269
|
+
startupCancelled = true;
|
|
270
|
+
cancelStartupClassification();
|
|
271
|
+
priorityStartupGate.settle('cancelled');
|
|
272
|
+
normalStartupGate.settle('cancelled');
|
|
273
|
+
taskReadyGate.settle('cancelled');
|
|
274
|
+
});
|
|
245
275
|
// ECWeb has one lifecycle owner: the daemon. The CLI may have started an
|
|
246
276
|
// instance just before spawning us; the supervisor adopts it when healthy,
|
|
247
277
|
// otherwise starts one and keeps it alive for the daemon's lifetime.
|
|
@@ -250,6 +280,7 @@ async function main() {
|
|
|
250
280
|
const ecwebConfig = ecwebService(daemonCfg.services);
|
|
251
281
|
{
|
|
252
282
|
ecwebSupervisor = createEcwebSupervisor({
|
|
283
|
+
startupTrace: trace,
|
|
253
284
|
port: ecwebConfig?.port ?? DEFAULT_ECWEB_PORT,
|
|
254
285
|
enabled: ecwebConfig?.enabled === true,
|
|
255
286
|
runtimeMode: ecwebConfig ? serviceRuntimeMode(ecwebConfig) : 'managed',
|
|
@@ -263,12 +294,16 @@ async function main() {
|
|
|
263
294
|
return;
|
|
264
295
|
try {
|
|
265
296
|
const service = ecwebService(loadDaemonConfig().services);
|
|
266
|
-
void
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
297
|
+
void priorityStartupGate.promise.then(() => {
|
|
298
|
+
if (startupCancelled)
|
|
299
|
+
return;
|
|
300
|
+
return ecwebSupervisor.configure({
|
|
301
|
+
enabled: service?.enabled === true,
|
|
302
|
+
port: service?.port ?? DEFAULT_ECWEB_PORT,
|
|
303
|
+
runtimeMode: service ? serviceRuntimeMode(service) : 'managed',
|
|
304
|
+
restart: service?.runtime?.restart,
|
|
305
|
+
health: service?.health,
|
|
306
|
+
});
|
|
272
307
|
}).catch((error) => logger.warn(`ECWeb 配置热应用失败: ${error?.message || error}`));
|
|
273
308
|
}
|
|
274
309
|
catch (error) {
|
|
@@ -276,11 +311,24 @@ async function main() {
|
|
|
276
311
|
}
|
|
277
312
|
});
|
|
278
313
|
onShutdown(removeEcwebConfigListener);
|
|
279
|
-
void
|
|
314
|
+
void trace.track('daemon.ecwebLaunch', async (phase) => {
|
|
315
|
+
phase('waiting', 'priority Ready');
|
|
316
|
+
await priorityStartupGate.promise;
|
|
317
|
+
if (startupCancelled)
|
|
318
|
+
return false;
|
|
319
|
+
if (!startupCancelled) {
|
|
320
|
+
phase('running');
|
|
321
|
+
startupEcwebState = 'starting';
|
|
322
|
+
await ecwebSupervisor.start();
|
|
323
|
+
startupEcwebState = 'ready';
|
|
324
|
+
}
|
|
325
|
+
}, undefined, { initialPhase: 'waiting' }).catch((error) => {
|
|
326
|
+
startupEcwebState = 'failed';
|
|
280
327
|
logger.warn(`ECWeb supervisor 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
|
|
281
328
|
});
|
|
282
329
|
}
|
|
283
330
|
if (bindBootstrapMode && process.env.EVOLCORE_WEB_INIT !== '1' && daemonCfg.aid && loadAllAgents().agents.length === 0) {
|
|
331
|
+
priorityStartupGate.settle('ready');
|
|
284
332
|
await runBindBootstrapDaemon(daemonCfg);
|
|
285
333
|
return;
|
|
286
334
|
}
|
|
@@ -288,9 +336,12 @@ async function main() {
|
|
|
288
336
|
trace.mark('daemon.agentRegistry');
|
|
289
337
|
const agentRegistry = new EvolAgentRegistry(paths.agentsDir);
|
|
290
338
|
const { primaryAgent, runtimeStatus } = loadStartupAgentRegistry(agentRegistry);
|
|
339
|
+
const teamWorkspaceManagementService = new TeamWorkspaceManagementService(new TeamWorkspaceBootstrapService());
|
|
291
340
|
let agentRuntimeState = runtimeStatus.state;
|
|
292
341
|
let agentRuntimeError = runtimeStatus.error;
|
|
293
342
|
const startupAgents = [...agentRegistry.runnableAgents()];
|
|
343
|
+
const controlAid = daemonCfg.aid || '__daemon__';
|
|
344
|
+
const daemonTriggerAid = startupAgents.some(agent => agent.aid === controlAid) ? `${controlAid}#daemon` : controlAid;
|
|
294
345
|
// 进程级设置独立来自 daemon.json,不进入 Agent 覆盖链。
|
|
295
346
|
const globalSettings = {
|
|
296
347
|
idleMonitor: daemonCfg.idleMonitor,
|
|
@@ -302,6 +353,7 @@ async function main() {
|
|
|
302
353
|
trace.mark('daemon.eventBus');
|
|
303
354
|
const eventBus = new EventBus();
|
|
304
355
|
const daemonPluginLifecycle = new PluginHandle('daemon');
|
|
356
|
+
daemonPluginLifecycle.defer(() => startupCpuProfile?.stop('shutdown'), 'startup CPU profile');
|
|
305
357
|
logger.info('✓ Event bus initialized');
|
|
306
358
|
// 把所有事件录到 events.log(受 EVENT_LOG 环境变量控制)
|
|
307
359
|
daemonPluginLifecycle.subscribe(eventBus, '*', (event) => logger.event(event));
|
|
@@ -331,6 +383,50 @@ async function main() {
|
|
|
331
383
|
sessionManager.registerFileAdapter(new CodexSessionFileAdapter());
|
|
332
384
|
sessionManager.registerFileAdapter(new GeminiSessionFileAdapter());
|
|
333
385
|
sessionManager.registerFileAdapter(new EcagentSessionFileAdapter());
|
|
386
|
+
let capturedStartupQueue;
|
|
387
|
+
const startupQueueCaptured = new Promise(resolve => { capturedStartupQueue = resolve; });
|
|
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 = [];
|
|
399
|
+
const startupWorkPromise = trace.track('daemon.startupWorkDiscovery', () => discoverStartupWork({
|
|
400
|
+
agentAids: startupAgents.map(agent => agent.aid), daemonTriggerAid,
|
|
401
|
+
primaryAid: primaryAgent?.aid, sessionsRoot: paths.sessionsDir, queuePath: daemonQueuePath(),
|
|
402
|
+
onQueueCaptured: capturedStartupQueue,
|
|
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 => {
|
|
415
|
+
discoveredStartupWork = plan;
|
|
416
|
+
trace.setMeta('priorityAgents', String(plan.priorityAids.size));
|
|
417
|
+
trace.setMeta('recoveringTriggerOwners', String(plan.triggerAids.size));
|
|
418
|
+
trace.setMeta('recoveryScan', JSON.stringify(scanTimings));
|
|
419
|
+
logger.info(`[startup] Recovery priority: agents=${plan.priorityAids.size}/${startupAgents.length}`
|
|
420
|
+
+ ` triggerOwners=${plan.triggerAids.size} pendingSessions=${plan.pendingSessions.length}`);
|
|
421
|
+
if (!plan.priorityAids.size)
|
|
422
|
+
priorityStartupGate.settle('ready');
|
|
423
|
+
return plan;
|
|
424
|
+
}).catch(error => {
|
|
425
|
+
cancelStartupClassification();
|
|
426
|
+
throw error;
|
|
427
|
+
});
|
|
428
|
+
// Classification is also consumed later by channel/recovery dispatch.
|
|
429
|
+
void startupWorkPromise.catch(() => { });
|
|
334
430
|
// Agent 插件系统:每个 EvolAgent × 每个 baseagent 一个独立 runner(H1/H2 修复)
|
|
335
431
|
const agentLoader = new AgentLoader();
|
|
336
432
|
agentLoader.register(new ClaudeAgentPlugin());
|
|
@@ -347,14 +443,19 @@ async function main() {
|
|
|
347
443
|
const primaryRunnerKey = primaryAgent ? `${primaryAgent.aid}::${primaryBaseagent}` : '<empty>::claude';
|
|
348
444
|
const startupRunnerInstances = new Map();
|
|
349
445
|
const startupRunnerReadyResolvers = new Map();
|
|
446
|
+
// Startup admission: idle Agents resolve with no instances and load on first use.
|
|
350
447
|
const startupRunnerReady = new Map();
|
|
351
448
|
const startupOperationReadyResolvers = new Map();
|
|
352
449
|
const startupOperationReady = new Map();
|
|
450
|
+
const startupRunnerTraces = new Map();
|
|
353
451
|
const channelInstancesByAgent = new Map();
|
|
354
452
|
const runnerResultsByAgent = new Map();
|
|
355
453
|
const runnerSettledAgents = new Set();
|
|
454
|
+
const activeRunnerSettledAgents = new Set();
|
|
455
|
+
const deferredStartupRunners = new Set();
|
|
356
456
|
let startupChannelsRegistered = false;
|
|
357
|
-
let
|
|
457
|
+
let checkStartupTaskReady = () => { };
|
|
458
|
+
const settleStartupTaskReady = trace.startTask('daemon.taskReady', undefined, { summary: true });
|
|
358
459
|
const resolveStartupOperation = (aid) => {
|
|
359
460
|
if (startupCancelled || (startupChannelsRegistered && runnerSettledAgents.has(aid))) {
|
|
360
461
|
startupOperationReadyResolvers.get(aid)?.(runnerResultsByAgent.get(aid) ?? []);
|
|
@@ -363,12 +464,13 @@ async function main() {
|
|
|
363
464
|
const boundStartupAgents = new Set();
|
|
364
465
|
const bindStartupAgentChannels = (agent, runners) => {
|
|
365
466
|
if (boundStartupAgents.has(agent.aid) || startupCancelled
|
|
366
|
-
|| agent.status === 'error' || agent.status === 'disabled'
|
|
467
|
+
|| agent.status === 'error' || agent.status === 'disabled'
|
|
468
|
+
|| (runners.length === 0 && !deferredStartupRunners.has(agent.aid)))
|
|
367
469
|
return;
|
|
368
470
|
const channels = channelInstancesByAgent.get(agent.aid);
|
|
369
471
|
if (!channels)
|
|
370
472
|
return;
|
|
371
|
-
bindStartupChannelsToAgents(channels, agentRegistry, runners);
|
|
473
|
+
bindStartupChannelsToAgents(channels, agentRegistry, runners, deferredStartupRunners);
|
|
372
474
|
boundStartupAgents.add(agent.aid);
|
|
373
475
|
};
|
|
374
476
|
for (const agent of startupAgents) {
|
|
@@ -379,10 +481,13 @@ async function main() {
|
|
|
379
481
|
startupOperationReadyResolvers.set(agent.aid, resolve);
|
|
380
482
|
}));
|
|
381
483
|
}
|
|
382
|
-
|
|
484
|
+
const awaitStartupAgent = async (aid) => {
|
|
485
|
+
await startupOperationReady.get(aid);
|
|
486
|
+
};
|
|
487
|
+
// Status has a config-only snapshot immediately. Slow machine detection is
|
|
488
|
+
// observational and must not gate IPC or other backends' runners/channels.
|
|
489
|
+
const baseagentSnapshot = await getBaseagentSnapshot({ loaded: [], probe: false });
|
|
383
490
|
const refreshLoadedBaseagents = () => {
|
|
384
|
-
if (!baseagentSnapshot)
|
|
385
|
-
return;
|
|
386
491
|
const loaded = new Set(loadedBaseagentIds(agentMap.keys()));
|
|
387
492
|
for (const baseagent of baseagentSnapshot.baseagents)
|
|
388
493
|
baseagent.loaded = loaded.has(baseagent.id);
|
|
@@ -392,41 +497,77 @@ async function main() {
|
|
|
392
497
|
process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
|
|
393
498
|
const startupRunnersStartedAtMs = Date.now();
|
|
394
499
|
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
|
-
|
|
422
|
-
|
|
500
|
+
void trace.track('daemon.baseagentProbeComplete', () => getBaseagentSnapshot({ loaded: [], probe: true }), undefined, { initialPhase: 'running' })
|
|
501
|
+
.then(snapshot => { Object.assign(baseagentSnapshot, snapshot); refreshLoadedBaseagents(); })
|
|
502
|
+
.catch(error => logger.warn(`[startup] Baseagent inventory probe failed: ${error}`));
|
|
503
|
+
const startupRunnersPromise = trace.track('daemon.agentRunnersReady', async () => {
|
|
504
|
+
return createStartupAgentRunners({
|
|
505
|
+
agentRegistry,
|
|
506
|
+
agentLoader,
|
|
507
|
+
sessionManager,
|
|
508
|
+
primaryAgent,
|
|
509
|
+
agentInstances,
|
|
510
|
+
agentMap,
|
|
511
|
+
isCancelled: () => startupCancelled,
|
|
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
|
+
},
|
|
533
|
+
configureInstances: instances => {
|
|
534
|
+
for (const instance of instances) {
|
|
535
|
+
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
536
|
+
configureRunnerCallbacks?.(instance);
|
|
537
|
+
}
|
|
538
|
+
},
|
|
539
|
+
onAgentReady: (agent, instances, timing) => {
|
|
540
|
+
activeRunnerSettledAgents.add(agent.aid);
|
|
541
|
+
startupRunnerInstances.set(agent.aid, instances);
|
|
542
|
+
bindStartupAgentChannels(agent, instances);
|
|
543
|
+
refreshLoadedBaseagents();
|
|
544
|
+
startupRunnerReadyResolvers.get(agent.aid)?.(instances);
|
|
545
|
+
trace.addSpan('daemon.agentRunnerActive', timing.startedAtMs, timing.completedAtMs, `aid=${agent.aid}; runner=${agent.baseagent}`, instances.length ? 'ok' : 'failed');
|
|
546
|
+
logger.info(`[startup] Active runner ${instances.length ? 'ready' : 'unavailable'}: aid=${agent.aid} baseagent=${agent.baseagent} duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
547
|
+
checkStartupTaskReady();
|
|
548
|
+
},
|
|
549
|
+
onAgentCreated: (agent, instances, timing) => {
|
|
550
|
+
runnerResultsByAgent.set(agent.aid, instances);
|
|
551
|
+
runnerSettledAgents.add(agent.aid);
|
|
552
|
+
startupRunnerInstances.set(agent.aid, instances);
|
|
553
|
+
refreshLoadedBaseagents();
|
|
554
|
+
resolveStartupOperation(agent.aid);
|
|
555
|
+
startupRunnerTraces.get(agent.aid)?.(startupCancelled ? 'cancelled'
|
|
556
|
+
: instances.some(instance => instance.baseagent === agent.baseagent) ? 'ok' : 'failed');
|
|
557
|
+
logger.info(`[startup] Agent runners ready: aid=${agent.aid} runners=${instances.length}`
|
|
558
|
+
+ ` duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
559
|
+
checkStartupTaskReady();
|
|
560
|
+
},
|
|
561
|
+
});
|
|
562
|
+
}, undefined, { summary: true }).then(result => {
|
|
423
563
|
if (result.runtimeError) {
|
|
424
564
|
agentRuntimeState = 'error';
|
|
425
565
|
agentRuntimeError = result.runtimeError;
|
|
426
566
|
}
|
|
427
567
|
logger.info(`[startup] Agent runner batch complete: agents=${startupAgents.length}`
|
|
428
568
|
+ ` runners=${agentMap.size} duration=${Date.now() - startupRunnersStartedAtMs}ms`);
|
|
429
|
-
trace.
|
|
569
|
+
trace.setMeta('activeAgents', String(startupAgents.length));
|
|
570
|
+
trace.setMeta('runners', String(agentMap.size));
|
|
430
571
|
return result;
|
|
431
572
|
});
|
|
432
573
|
void startupRunnersPromise.catch(error => {
|
|
@@ -435,15 +576,20 @@ async function main() {
|
|
|
435
576
|
agentRuntimeError = message;
|
|
436
577
|
logger.error(`[startup] Agent runner batch failed: ${message}`);
|
|
437
578
|
for (const agent of startupAgents) {
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
agent.
|
|
579
|
+
startupRunnerTraces.get(agent.aid)?.('failed');
|
|
580
|
+
if (!runnerSettledAgents.has(agent.aid)) {
|
|
581
|
+
if (!activeRunnerSettledAgents.has(agent.aid)) {
|
|
582
|
+
agent.status = 'error';
|
|
583
|
+
agent.error = message;
|
|
584
|
+
activeRunnerSettledAgents.add(agent.aid);
|
|
585
|
+
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
586
|
+
}
|
|
441
587
|
runnerSettledAgents.add(agent.aid);
|
|
442
|
-
runnerResultsByAgent.set(agent.aid, []);
|
|
443
|
-
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
588
|
+
runnerResultsByAgent.set(agent.aid, startupRunnerInstances.get(agent.aid) ?? []);
|
|
444
589
|
resolveStartupOperation(agent.aid);
|
|
445
590
|
}
|
|
446
591
|
}
|
|
592
|
+
checkStartupTaskReady();
|
|
447
593
|
});
|
|
448
594
|
// 交互路由器
|
|
449
595
|
const interactionRouter = new InteractionRouter();
|
|
@@ -464,11 +610,20 @@ async function main() {
|
|
|
464
610
|
trace.mark('daemon.channelCreate');
|
|
465
611
|
const channelLoader = new ChannelLoader(daemonCfg.debug, daemonCfg.aun?.defaultEncrypt);
|
|
466
612
|
await registerBuiltinChannelPlugins(channelLoader);
|
|
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());
|
|
617
|
+
const schedulerQueue = new StartupTaskQueue(2, 50);
|
|
618
|
+
channelLoader.setConnectionAdmission(instance => connectionQueue.run(() => instance.connect(), () => !startupCancelled && !instance.lifecycle?.signal.aborted));
|
|
619
|
+
daemonPluginLifecycle.defer(() => { connectionQueue.stop(); schedulerQueue.stop(); }, 'startup admission');
|
|
467
620
|
// Create channel instances: 每个 self-agent 各自的 channels
|
|
468
621
|
const evolagentInstances = [];
|
|
469
622
|
for (const agent of startupAgents) {
|
|
470
623
|
try {
|
|
471
|
-
const
|
|
624
|
+
const aun = await channelLoader.createAunForAgent(agent);
|
|
625
|
+
const external = await channelLoader.createExternalForAgent(agent);
|
|
626
|
+
const instances = [...aun, ...external];
|
|
472
627
|
channelInstancesByAgent.set(agent.aid, instances);
|
|
473
628
|
evolagentInstances.push(...instances);
|
|
474
629
|
bindStartupAgentChannels(agent, startupRunnerInstances.get(agent.aid) ?? []);
|
|
@@ -528,9 +683,12 @@ async function main() {
|
|
|
528
683
|
}
|
|
529
684
|
}
|
|
530
685
|
});
|
|
531
|
-
|
|
686
|
+
// ownerResolver.stop() 交给 daemon shutdown 在发出下线通知之后执行:信号回调
|
|
687
|
+
// 比 shutdown 先注册,在这里清空共识会让下线通知过不了出站准入。
|
|
688
|
+
onShutdown(() => { stopOwnerNotifications(); });
|
|
532
689
|
// 创建命令处理器
|
|
533
690
|
const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
|
|
691
|
+
cmdHandler.setTeamWorkspaceManagementService(teamWorkspaceManagementService);
|
|
534
692
|
cmdHandler.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
535
693
|
cmdHandler.setPermissionGateway(permissionGateway);
|
|
536
694
|
cmdHandler.setInteractionRouter(interactionRouter);
|
|
@@ -580,6 +738,7 @@ async function main() {
|
|
|
580
738
|
// 设置交互路由器
|
|
581
739
|
processor.setInteractionRouter(interactionRouter);
|
|
582
740
|
// 创建消息队列
|
|
741
|
+
const startupHintsReady = new Set();
|
|
583
742
|
const messageQueue = new MessageQueue(async (message) => {
|
|
584
743
|
const owner = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
585
744
|
if (owner)
|
|
@@ -590,6 +749,27 @@ async function main() {
|
|
|
590
749
|
}, {
|
|
591
750
|
persistencePath: daemonQueuePath(),
|
|
592
751
|
dedupPath: daemonMessageDedupPath(),
|
|
752
|
+
blockedReason: message => {
|
|
753
|
+
const aid = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
754
|
+
if (!aid || !startupRunnerReady.has(aid))
|
|
755
|
+
return;
|
|
756
|
+
if (!startupHintsReady.has(aid))
|
|
757
|
+
return 'startup observer hint registration';
|
|
758
|
+
const baseagent = message.baseagent || agentRegistry.get(aid)?.baseagent;
|
|
759
|
+
if (!activeRunnerSettledAgents.has(aid)
|
|
760
|
+
|| (baseagent && !agentMap.has(`${aid}::${baseagent}`) && !runnerSettledAgents.has(aid))) {
|
|
761
|
+
return 'Agent runner initialization';
|
|
762
|
+
}
|
|
763
|
+
const channelType = message.channelType || message.channel.split('#', 1)[0];
|
|
764
|
+
if (channelType !== 'aun' && channelType !== 'daemon') {
|
|
765
|
+
const transport = channelInstancesByAgent.get(aid)?.find(instance => instance.adapter.channelKey === message.channel || instance.adapter.channelName === message.channel);
|
|
766
|
+
if (transport && transport.channel.getStatus?.().connected !== true)
|
|
767
|
+
return 'channel transport initialization';
|
|
768
|
+
}
|
|
769
|
+
if (channelType === 'aun' && ownerResolver.snapshot(aid).consensusStatus === 'unavailable') {
|
|
770
|
+
return 'AUN authorization snapshot';
|
|
771
|
+
}
|
|
772
|
+
},
|
|
593
773
|
});
|
|
594
774
|
// 设置中断回调(精确中断正在处理的 agent)
|
|
595
775
|
messageQueue.setInterruptCallback(async (sessionKey, baseagent, evolagentName, reason = 'new_message', timeout, strict, target) => {
|
|
@@ -603,6 +783,8 @@ async function main() {
|
|
|
603
783
|
messageQueue.setEventBus(eventBus);
|
|
604
784
|
// Restore persisted input before Trigger schedulers start. Trigger-owned work
|
|
605
785
|
// is deliberately dropped here and reclaimed from active.json by its scheduler.
|
|
786
|
+
// Capture queued inputs before restorePersisted rewrites their snapshot.
|
|
787
|
+
await startupQueueCaptured;
|
|
606
788
|
messageQueue.restorePersisted(false);
|
|
607
789
|
const droppedTriggerSessionIds = new Set(messageQueue.consumeDroppedTriggerSessionIds());
|
|
608
790
|
// 进程退出时立即刷盘队列状态(防止 debounce 期间的消息丢失)
|
|
@@ -617,6 +799,14 @@ async function main() {
|
|
|
617
799
|
cmdHandler.setHandoffRuntime(handoffRuntime);
|
|
618
800
|
// Trigger runtime: daemon-level script + feedback scheduler.
|
|
619
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
|
+
}));
|
|
620
810
|
const sessionIdleMonitor = new SessionIdleMonitor({
|
|
621
811
|
eventBus,
|
|
622
812
|
statePath: path.join(paths.dataDir, 'session-idle-state.json'),
|
|
@@ -700,9 +890,8 @@ async function main() {
|
|
|
700
890
|
}
|
|
701
891
|
catch { }
|
|
702
892
|
const triggerStartupAgents = startupAgents;
|
|
703
|
-
const controlAid = daemonCfg.aid || '__daemon__';
|
|
704
893
|
const daemonTriggerOwner = {
|
|
705
|
-
aid:
|
|
894
|
+
aid: daemonTriggerAid,
|
|
706
895
|
originPeerId: controlAid,
|
|
707
896
|
baseagent: primaryAgent?.baseagent || 'codex',
|
|
708
897
|
projectPath: primaryAgent?.projectPath || process.cwd(),
|
|
@@ -771,20 +960,33 @@ async function main() {
|
|
|
771
960
|
}, opts));
|
|
772
961
|
};
|
|
773
962
|
cmdHandler.setTriggerSchedulerResolver((agentAid) => triggerSchedulers.get(agentAid));
|
|
774
|
-
const ensureTriggerSchedulerStarted = async (agent) => {
|
|
963
|
+
const ensureTriggerSchedulerStarted = async (agent, phase) => {
|
|
964
|
+
phase?.('waiting', 'Agent startup admission');
|
|
775
965
|
await startupRunnerReady.get(agent.aid);
|
|
776
966
|
if (startupCancelled || agent.status === 'error' || agent.status === 'disabled')
|
|
777
967
|
return;
|
|
778
|
-
|
|
968
|
+
phase?.('queued', 'scheduler admission');
|
|
969
|
+
await triggerSchedulers.ensureStarted(agent.aid, async () => {
|
|
970
|
+
await schedulerQueue.run(() => { phase?.('running'); return startTriggerScheduler(agent); }, () => !startupCancelled && agent.status !== 'disabled' && agent.status !== 'error');
|
|
971
|
+
});
|
|
779
972
|
};
|
|
780
|
-
const ensureDaemonTriggerSchedulerStarted = async () => {
|
|
781
|
-
|
|
973
|
+
const ensureDaemonTriggerSchedulerStarted = async (phase) => {
|
|
974
|
+
phase?.('waiting', 'primary Agent startup admission');
|
|
975
|
+
if (primaryAgent)
|
|
976
|
+
await startupRunnerReady.get(primaryAgent.aid);
|
|
782
977
|
if (startupCancelled)
|
|
783
978
|
return;
|
|
784
|
-
if (primaryAgent && (
|
|
979
|
+
if (primaryAgent && (primaryAgent.status === 'error' || primaryAgent.status === 'disabled'))
|
|
785
980
|
return;
|
|
786
|
-
|
|
981
|
+
phase?.('queued', 'scheduler admission');
|
|
982
|
+
await triggerSchedulers.ensureStarted(daemonTriggerOwner.aid, async () => {
|
|
983
|
+
await schedulerQueue.run(() => { phase?.('running'); return startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }); }, () => !startupCancelled);
|
|
984
|
+
});
|
|
787
985
|
};
|
|
986
|
+
const startupTriggerReady = new Set();
|
|
987
|
+
const startupTriggerFailed = new Set();
|
|
988
|
+
const startupSessionsReady = new Set();
|
|
989
|
+
const startupTriggerPromises = new Map();
|
|
788
990
|
const defaultPolicy = createDefaultChannelPolicy();
|
|
789
991
|
processor.registerChannel(daemonChannel, defaultPolicy, { channelType: 'daemon' });
|
|
790
992
|
cmdHandler.registerAdapter(daemonChannel);
|
|
@@ -841,7 +1043,10 @@ async function main() {
|
|
|
841
1043
|
};
|
|
842
1044
|
const registerChannelInstance = (inst) => {
|
|
843
1045
|
registerChannelRuntimeInstance(inst, channelRuntimeDependencies);
|
|
1046
|
+
// Initial instances are observed below; hot-loaded instances use the same entry.
|
|
1047
|
+
channelConnectionRuntime?.observeChannel(inst);
|
|
844
1048
|
};
|
|
1049
|
+
let channelConnectionRuntime;
|
|
845
1050
|
// ── 注册所有渠道实例 ──
|
|
846
1051
|
trace.mark('daemon.channelRegister');
|
|
847
1052
|
for (const inst of channelInstances) {
|
|
@@ -868,39 +1073,42 @@ async function main() {
|
|
|
868
1073
|
preloadChannelThreads(channelInstances, sessionManager);
|
|
869
1074
|
const connectedChannels = new Set();
|
|
870
1075
|
const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
|
|
1076
|
+
const upmsg = daemonCfg.debug?.upmsg ?? true;
|
|
871
1077
|
const { sendOnlineNoticeForChannel, trySendPendingRestartNotice, summarizeConnectedChannels, } = createChannelStartupNotifications({
|
|
872
1078
|
channelInstances,
|
|
873
1079
|
agentRegistry,
|
|
874
1080
|
commandHandler: cmdHandler,
|
|
875
1081
|
connectedChannels,
|
|
876
1082
|
pendingFile,
|
|
877
|
-
upmsg
|
|
1083
|
+
upmsg,
|
|
878
1084
|
});
|
|
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
1085
|
const startupObserverRecoveries = [];
|
|
883
|
-
// handoff 启动恢复是否还在收集 hint。与"队列是否已放行"是两件事:
|
|
884
|
-
// 队列有超时兜底会提前放行,而恢复可能还在等渠道。
|
|
885
1086
|
let startupRecoveryPending = true;
|
|
886
|
-
// AUN 上下线系统提示(volatile)。系统行为,无配置开关。
|
|
887
1087
|
const lifecycleNotices = createLifecycleNoticeService({
|
|
1088
|
+
enabled: upmsg,
|
|
888
1089
|
channelInstances,
|
|
889
1090
|
resolveAgent: (channelKey, channelName) => agentRegistry.resolveByChannel(channelKey) ?? agentRegistry.resolveByChannel(channelName),
|
|
890
1091
|
});
|
|
891
|
-
|
|
1092
|
+
channelConnectionRuntime = createChannelConnectionRuntime({
|
|
892
1093
|
...channelRuntimeDependencies,
|
|
893
1094
|
channelInstances,
|
|
894
1095
|
connectedChannels,
|
|
895
1096
|
bootstrapService,
|
|
896
|
-
ensureTriggerSchedulerStarted,
|
|
897
1097
|
sendOnlineNoticeForChannel,
|
|
898
1098
|
sendLifecycleNoticeForChannel: instance => lifecycleNotices.online(instance),
|
|
899
1099
|
trySendPendingRestartNotice,
|
|
900
1100
|
sessionsDir: paths.sessionsDir,
|
|
901
|
-
startupObserverRecoveries,
|
|
902
1101
|
isStartupRecoveryPending: () => startupRecoveryPending,
|
|
1102
|
+
isCancelled: () => startupCancelled,
|
|
1103
|
+
refreshAunAuthorization: async (aid) => {
|
|
1104
|
+
const view = await ownerResolver.refresh(aid, { source: 'startup' });
|
|
1105
|
+
return view.consensusStatus !== 'unavailable';
|
|
1106
|
+
},
|
|
903
1107
|
});
|
|
1108
|
+
const { markChannelConnected, unregisterRuntimeChannel, queuePendingObserverHints } = channelConnectionRuntime;
|
|
1109
|
+
for (const instance of channelInstances)
|
|
1110
|
+
channelConnectionRuntime.observeChannel(instance);
|
|
1111
|
+
daemonPluginLifecycle.defer(() => channelConnectionRuntime?.stop(), 'channel startup followups');
|
|
904
1112
|
// Bind the per-HOME IPC endpoint before any AUN connection is attempted.
|
|
905
1113
|
// A failed bind (for example, a stale Windows named pipe) must abort startup
|
|
906
1114
|
// without creating a second AUN session that can kick the old daemon.
|
|
@@ -917,7 +1125,6 @@ async function main() {
|
|
|
917
1125
|
let pendingShutdownReason;
|
|
918
1126
|
let pendingShutdownTraceId;
|
|
919
1127
|
trace.mark('daemon.baseagentProbe');
|
|
920
|
-
baseagentSnapshot = await baseagentSnapshotPromise;
|
|
921
1128
|
refreshLoadedBaseagents();
|
|
922
1129
|
const getStatusSnapshot = () => {
|
|
923
1130
|
const now = Date.now();
|
|
@@ -976,17 +1183,36 @@ async function main() {
|
|
|
976
1183
|
agentRegistry,
|
|
977
1184
|
messageQueue,
|
|
978
1185
|
runMode: devMode ? 'dev' : 'install',
|
|
979
|
-
|
|
980
|
-
runtimeBuildIdentity,
|
|
981
|
-
diskDistDir,
|
|
1186
|
+
getBuildDiagnostics: () => buildDiagnostics,
|
|
982
1187
|
getProcessOwners: processLevelOwners,
|
|
983
1188
|
getAgentRuntimeState: () => agentRuntimeState,
|
|
984
1189
|
getAgentRuntimeError: () => agentRuntimeError,
|
|
1190
|
+
getStartupProgress: () => ({
|
|
1191
|
+
phase: normalTaskState === 'failed' ? 'failed' : !discoveredStartupWork ? 'classifying' : normalTaskState === 'ready' ? 'ready'
|
|
1192
|
+
: priorityStartupGate.status === 'pending' ? 'recovering' : 'loading',
|
|
1193
|
+
priorityRelease: priorityStartupGate.status,
|
|
1194
|
+
optionalRelease: normalStartupGate.status,
|
|
1195
|
+
ecweb: startupEcwebState === 'waiting' && ecwebSupervisor?.status().enabled ? 'waiting'
|
|
1196
|
+
: startupEcwebState === 'failed' ? 'failed' : ecwebSupervisor?.status().state ?? 'disabled',
|
|
1197
|
+
agents: startupAgents.map(agent => ({
|
|
1198
|
+
aid: agent.aid, priority: agentWorkPriority.get(agent.aid) ?? false,
|
|
1199
|
+
runner: agentMap.has(`${agent.aid}::${agent.baseagent}`) ? 'ready'
|
|
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',
|
|
1204
|
+
aun: channelInstancesByAgent.get(agent.aid)?.some(inst => inst.channelType === 'aun' && inst.channel.getStatus?.().connected === true) ?? false,
|
|
1205
|
+
recovery: startupHintsReady.has(agent.aid) && startupSessionsReady.has(agent.aid),
|
|
1206
|
+
trigger: startupTriggerFailed.has(agent.aid) ? 'failed' : startupTriggerReady.has(agent.aid) ? 'ready' : discoveredStartupWork?.triggerAids.has(agent.aid) ? 'recovering'
|
|
1207
|
+
: normalStartupGate.status === 'pending' ? 'waiting' : 'starting',
|
|
1208
|
+
})),
|
|
1209
|
+
triggers: { loaded: startupTriggerReady.size, total: startupAgents.length + 1,
|
|
1210
|
+
recovering: discoveredStartupWork?.triggerAids.size ?? 0 },
|
|
1211
|
+
}),
|
|
985
1212
|
daemonAid: daemonCfg.aid,
|
|
986
1213
|
getControlAidState: () => controlChannel?.getAidState(),
|
|
987
1214
|
getHost: () => hostProvider.getSnapshot().host,
|
|
988
1215
|
baseagents: baseagentSnapshot,
|
|
989
|
-
diskDistId,
|
|
990
1216
|
getTriggerSummary: () => {
|
|
991
1217
|
const now = new Date();
|
|
992
1218
|
const from = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
|
|
@@ -1027,7 +1253,25 @@ async function main() {
|
|
|
1027
1253
|
aidStatsCollector,
|
|
1028
1254
|
handoffRuntime,
|
|
1029
1255
|
messageQueue,
|
|
1030
|
-
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) : [];
|
|
1031
1275
|
});
|
|
1032
1276
|
registerRelationConsolidationEvents({ eventBus, agentRegistry, responseEngine, enqueueConsolidation });
|
|
1033
1277
|
globalThis.__evolcore_reloadHooks = reloadHooks;
|
|
@@ -1054,13 +1298,13 @@ async function main() {
|
|
|
1054
1298
|
setAgentRuntimeError: error => { agentRuntimeError = error; },
|
|
1055
1299
|
});
|
|
1056
1300
|
globalThis.__evolcore_hotLoadAgent = async (aid) => {
|
|
1057
|
-
await
|
|
1301
|
+
await awaitStartupAgent(aid);
|
|
1058
1302
|
if (startupCancelled)
|
|
1059
1303
|
throw new Error('Daemon is shutting down');
|
|
1060
1304
|
return agentRuntimeOperations.hotLoad(aid);
|
|
1061
1305
|
};
|
|
1062
1306
|
globalThis.__evolcore_resyncAgents = async () => {
|
|
1063
|
-
await Promise.all(
|
|
1307
|
+
await Promise.all([...startupOperationReady.keys()].map(awaitStartupAgent));
|
|
1064
1308
|
if (startupCancelled)
|
|
1065
1309
|
throw new Error('Daemon is shutting down');
|
|
1066
1310
|
return agentRuntimeOperations.resync();
|
|
@@ -1101,9 +1345,9 @@ async function main() {
|
|
|
1101
1345
|
aunAidStats: () => aidStatsCollector.getAllSnapshots(),
|
|
1102
1346
|
beforeAgentOperation: async (aid) => {
|
|
1103
1347
|
if (aid)
|
|
1104
|
-
await
|
|
1348
|
+
await awaitStartupAgent(aid);
|
|
1105
1349
|
else
|
|
1106
|
-
await Promise.all(startupOperationReady.
|
|
1350
|
+
await Promise.all([...startupOperationReady.keys()].map(awaitStartupAgent));
|
|
1107
1351
|
},
|
|
1108
1352
|
});
|
|
1109
1353
|
const agentInitializationService = createAgentInitializationRuntime({
|
|
@@ -1133,6 +1377,11 @@ async function main() {
|
|
|
1133
1377
|
trace.mark('daemon.ipcRegister');
|
|
1134
1378
|
console.error('[EvolCore] ✓ Configuring IPC...');
|
|
1135
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
|
+
},
|
|
1136
1385
|
lifecycle: daemonPluginLifecycle,
|
|
1137
1386
|
ipcServer,
|
|
1138
1387
|
agentRegistry,
|
|
@@ -1168,6 +1417,7 @@ async function main() {
|
|
|
1168
1417
|
daemonAid: daemonCfg.aid,
|
|
1169
1418
|
triggerControlToken,
|
|
1170
1419
|
triggerSchedulers,
|
|
1420
|
+
eventCenter,
|
|
1171
1421
|
daemonTriggerOwner,
|
|
1172
1422
|
primaryAgent,
|
|
1173
1423
|
triggerAuthorization: {
|
|
@@ -1188,206 +1438,420 @@ async function main() {
|
|
|
1188
1438
|
console.error('[EvolCore] ✓ Starting IPC server...');
|
|
1189
1439
|
await ipcServer.start();
|
|
1190
1440
|
console.error('[EvolCore] ✓ IPC server started');
|
|
1191
|
-
|
|
1192
|
-
trace.
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
|
|
1441
|
+
let stopReadinessObservers = () => { };
|
|
1442
|
+
const startupTaskRuntimePromise = trace.track('daemon.taskRuntimeStartup', async () => {
|
|
1443
|
+
// Let the main flow publish ready.signal and install shutdown first.
|
|
1444
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
1445
|
+
if (startupCancelled)
|
|
1446
|
+
return;
|
|
1447
|
+
// Control handlers only need the registered IPC/runtime services. Historical
|
|
1448
|
+
// work classification gates Agent admission, not the control transport.
|
|
1449
|
+
trace.point('daemon.controlChannel');
|
|
1450
|
+
controlChannel = startDaemonControlAid({
|
|
1451
|
+
daemonCfg,
|
|
1452
|
+
cmdHandler,
|
|
1453
|
+
bindService,
|
|
1454
|
+
diagService,
|
|
1455
|
+
getProcessOwners: getDaemonOwners,
|
|
1456
|
+
ecwebSupervisor,
|
|
1457
|
+
startupTrace: trace,
|
|
1458
|
+
waitForServices: waitForBackgroundStartup,
|
|
1459
|
+
connectChannel: channel => trace.track('daemon.controlChannelConnect', phase => connectionQueue.run(() => { phase('running'); return channel.connect(); }, () => !startupCancelled), undefined, { initialPhase: 'queued' }),
|
|
1460
|
+
onServiceProxyManager: manager => {
|
|
1461
|
+
const authorizeManagedOperation = createDelegationAuthorizer({
|
|
1462
|
+
agentDelegationRegistry,
|
|
1463
|
+
sessionManager,
|
|
1464
|
+
getProcessOwners: getDaemonOwners,
|
|
1465
|
+
});
|
|
1466
|
+
registerProxyIpcExecutor(ipcServer, {
|
|
1467
|
+
manager,
|
|
1468
|
+
authorizeManagedOperation,
|
|
1469
|
+
getSession: sessionId => sessionManager.getSessionById(sessionId),
|
|
1470
|
+
});
|
|
1471
|
+
},
|
|
1472
|
+
});
|
|
1473
|
+
// ── 连接所有渠道(后台首连,AUN/任意渠道故障不阻塞 daemon 主流程)──
|
|
1474
|
+
trace.point('daemon.channelConnectDispatch');
|
|
1475
|
+
const channelConnectTimings = new Map(channelInstances.map(instance => {
|
|
1197
1476
|
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1198
1477
|
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1199
|
-
|
|
1200
|
-
|
|
1201
|
-
|
|
1202
|
-
|
|
1478
|
+
const channel = instance.adapter.channelKey;
|
|
1479
|
+
return [instance, trace.startTask('daemon.channelConnect', owner ? `aid=${owner.aid}; channel=${channel}` : channel, { initialPhase: 'waiting' })];
|
|
1480
|
+
}));
|
|
1481
|
+
logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
|
|
1482
|
+
const backgroundConnections = new Set();
|
|
1483
|
+
const connectOptions = {
|
|
1484
|
+
sharedAdmission: true,
|
|
1485
|
+
beforeConnect: async (instance) => {
|
|
1486
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1487
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
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
|
+
}
|
|
1500
|
+
// Transport and authenticated control messages do not require a model runner.
|
|
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;
|
|
1505
|
+
},
|
|
1506
|
+
shouldConnect: (instance) => {
|
|
1507
|
+
if (startupCancelled || !channelInstances.includes(instance))
|
|
1508
|
+
return false;
|
|
1509
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1510
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1511
|
+
return !owner || owner.status !== 'disabled';
|
|
1512
|
+
},
|
|
1513
|
+
onConnected: markChannelConnected,
|
|
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
|
+
},
|
|
1526
|
+
onFailed: (inst, error) => {
|
|
1527
|
+
channelConnectTimings.get(inst)?.('failed');
|
|
1528
|
+
logger.warn(`[startup] ${inst.adapter.channelName} initial connect failed: ${error}`);
|
|
1529
|
+
},
|
|
1530
|
+
};
|
|
1531
|
+
const isPriorityChannel = (instance) => {
|
|
1532
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey);
|
|
1533
|
+
return !!owner && (startupWork.requiredExternalAids.has(owner.aid)
|
|
1534
|
+
|| startupWork.requiredChannelKeys.has(instance.adapter.channelKey)
|
|
1535
|
+
|| startupWork.requiredChannelKeys.has(instance.adapter.channelName));
|
|
1536
|
+
};
|
|
1537
|
+
// Partition outside connectAll's workers so a deferred channel cannot hold
|
|
1538
|
+
// a slot required by a recovering Agent. All groups share actual admission.
|
|
1539
|
+
const connectAfter = async (instances, gate) => {
|
|
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
|
+
}
|
|
1554
|
+
};
|
|
1555
|
+
const aunInstances = channelInstances.filter(inst => inst.channelType === 'aun');
|
|
1556
|
+
const externalInstances = channelInstances.filter(inst => inst.channelType !== 'aun');
|
|
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
|
+
}
|
|
1576
|
+
const externalConnections = Promise.all([
|
|
1577
|
+
connectAfter(externalInstances.filter(isPriorityChannel)),
|
|
1578
|
+
connectAfter(externalInstances.filter(inst => !isPriorityChannel(inst)), normalStartupGate),
|
|
1579
|
+
]).then(groups => groups.flat());
|
|
1580
|
+
const connectAllPromise = Promise.all([aunConnections, externalConnections]).then(groups => {
|
|
1581
|
+
finishConnections('ok');
|
|
1582
|
+
return groups.flat();
|
|
1583
|
+
}, error => { finishConnections('failed'); throw error; });
|
|
1584
|
+
connectAllPromise.then((connected) => {
|
|
1585
|
+
const channelSummary = summarizeConnectedChannels(connected);
|
|
1586
|
+
logger.info(`✅ ${connected.length} channel(s) connected: ${channelSummary}`);
|
|
1587
|
+
eventBus.publish({
|
|
1588
|
+
type: 'system:started',
|
|
1589
|
+
channels: connected.map(c => c.toLowerCase()),
|
|
1590
|
+
timestamp: Date.now()
|
|
1591
|
+
});
|
|
1592
|
+
}).catch((e) => {
|
|
1593
|
+
logger.warn(`[startup] channel connection task failed unexpectedly: ${e}`);
|
|
1594
|
+
});
|
|
1595
|
+
// Single scheduler startup entry. Runner waits occur before bounded admission.
|
|
1596
|
+
trace.point('daemon.triggerSchedulerDispatch');
|
|
1597
|
+
void trace.track('daemon.triggerSchedulersReady', () => new Promise(resolve => setImmediate(resolve)).then(() => {
|
|
1598
|
+
const owners = [
|
|
1599
|
+
{ aid: daemonTriggerOwner.aid, start: ensureDaemonTriggerSchedulerStarted },
|
|
1600
|
+
...triggerStartupAgents.map(agent => ({ aid: agent.aid, start: (phase) => ensureTriggerSchedulerStarted(agent, phase) })),
|
|
1601
|
+
];
|
|
1602
|
+
for (const owner of owners) {
|
|
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
|
+
}
|
|
1609
|
+
if (startupCancelled)
|
|
1610
|
+
return false;
|
|
1611
|
+
await owner.start(phase);
|
|
1612
|
+
if (startupCancelled)
|
|
1613
|
+
return false;
|
|
1614
|
+
if (triggerSchedulers.get(owner.aid))
|
|
1615
|
+
startupTriggerReady.add(owner.aid);
|
|
1616
|
+
checkStartupTaskReady();
|
|
1617
|
+
}, owner.aid, { initialPhase: 'waiting' }).then(() => { }).catch(e => {
|
|
1618
|
+
startupTriggerFailed.add(owner.aid);
|
|
1619
|
+
logger.warn(`[startup] trigger scheduler start failed for ${owner.aid}: ${e}`);
|
|
1620
|
+
checkStartupTaskReady();
|
|
1621
|
+
});
|
|
1622
|
+
startupTriggerPromises.set(owner.aid, starting);
|
|
1623
|
+
}
|
|
1624
|
+
return Promise.all(startupTriggerPromises.values()).then(() => {
|
|
1625
|
+
// scheduler 起来之后再采一次 session:idle trigger 身份:idle monitor 的
|
|
1626
|
+
// activate() 早于这里执行,那时列表还是空的。
|
|
1627
|
+
sessionIdleMonitor.refreshTriggerIdentities();
|
|
1628
|
+
});
|
|
1629
|
+
}), undefined, { summary: true });
|
|
1630
|
+
sessionIdleMonitor.activate();
|
|
1631
|
+
relationIdleMonitor.start();
|
|
1632
|
+
// 首轮 SDK 自动生成的会话名必须走与 `ec thread rename` 相同的出口:
|
|
1633
|
+
// 更新话题索引、落盘并给对端发 `topic.renamed`。只调 `renameSession` 的话,
|
|
1634
|
+
// 名字只在本地存活——对端看不到,话题索引也停在占位名上。
|
|
1635
|
+
// 必须放在 registerDaemonIpc 之后:系统消息发送器在那里才注册到 CommandHandler。
|
|
1636
|
+
responseEngine.setSessionTitleSyncer(async (session, newName) => {
|
|
1637
|
+
if ((session.channelType || session.channel.split('#', 1)[0]) !== 'aun')
|
|
1203
1638
|
return false;
|
|
1204
|
-
const
|
|
1205
|
-
|
|
1639
|
+
const selfAid = session.selfAID;
|
|
1640
|
+
const peer = session.channelId;
|
|
1641
|
+
if (!selfAid || !peer)
|
|
1206
1642
|
return false;
|
|
1207
|
-
|
|
1208
|
-
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
|
|
1643
|
+
const { ThreadService } = await import('./core/thread/thread-service.js');
|
|
1644
|
+
const { notifyThreadRename } = await import('./core/thread/thread-operation.js');
|
|
1645
|
+
const { sessionTopicThreadId } = await import('./core/thread/topic-id.js');
|
|
1646
|
+
const svc = new ThreadService(sessionManager);
|
|
1647
|
+
const threadId = sessionTopicThreadId(session) ?? '';
|
|
1648
|
+
try {
|
|
1649
|
+
const result = await svc.renameThread({ selfAid, peer, threadId, name: newName });
|
|
1650
|
+
await notifyThreadRename({
|
|
1651
|
+
selfAid,
|
|
1652
|
+
peer,
|
|
1653
|
+
threadId,
|
|
1654
|
+
result,
|
|
1655
|
+
threadService: svc,
|
|
1656
|
+
sendSystemMsg: cmdHandler.getThreadSystemMsgSender(),
|
|
1657
|
+
});
|
|
1658
|
+
return true;
|
|
1659
|
+
}
|
|
1660
|
+
catch (error) {
|
|
1661
|
+
// 主会话目录还没落盘(首轮尚未持久化)时没有可改的对象,退回纯本地改名。
|
|
1662
|
+
logger.debug(`[Daemon] session title sync skipped: ${error instanceof Error ? error.message : String(error)}`);
|
|
1212
1663
|
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()
|
|
1664
|
+
}
|
|
1229
1665
|
});
|
|
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
|
-
|
|
1666
|
+
// 统一 channel:health 跨通道通知(仅 auth_error)
|
|
1667
|
+
registerChannelHealthNotifications({ eventBus, channelInstances, agentRegistry });
|
|
1668
|
+
// Local recovery registration runs independently of transport and remote delivery.
|
|
1669
|
+
trace.point('daemon.handoffRecovery');
|
|
1670
|
+
const recoveryAids = triggerStartupAgents.map(agent => agent.aid);
|
|
1671
|
+
const recoverStartupQueue = async () => {
|
|
1672
|
+
await recoverStartupHandoffs({
|
|
1673
|
+
channelInstances,
|
|
1674
|
+
recoveryAids,
|
|
1675
|
+
agentRegistry,
|
|
1676
|
+
queuePendingObserverHints,
|
|
1677
|
+
startupObserverRecoveries,
|
|
1678
|
+
handoffRuntime,
|
|
1679
|
+
cleanupAgentHandoffs: async (aid, options) => {
|
|
1680
|
+
const snapshots = await handoffRuntime.prepareRecovery(aid, {
|
|
1681
|
+
...options, snapshots: startupWork.handoffSnapshots.get(aid),
|
|
1682
|
+
});
|
|
1683
|
+
startupWork.handoffSnapshots.delete(aid);
|
|
1684
|
+
return snapshots;
|
|
1685
|
+
},
|
|
1686
|
+
trace,
|
|
1687
|
+
setStartupRecoveryPending: value => { startupRecoveryPending = value; },
|
|
1688
|
+
onAgentHintsRecovered: aid => {
|
|
1689
|
+
startupHintsReady.add(aid);
|
|
1690
|
+
messageQueue.startRestored();
|
|
1691
|
+
checkStartupTaskReady();
|
|
1692
|
+
},
|
|
1693
|
+
beforeAgentRecovery: async (aid) => {
|
|
1694
|
+
if (!startupWork.priorityAids.has(aid))
|
|
1695
|
+
await priorityStartupGate.promise;
|
|
1696
|
+
},
|
|
1697
|
+
waitForNormalReady: async () => await taskReadyGate.promise === 'ready' && !startupCancelled,
|
|
1698
|
+
isCancelled: () => startupCancelled,
|
|
1699
|
+
});
|
|
1700
|
+
};
|
|
1701
|
+
void trace.track('daemon.handoffRecoveryComplete', recoverStartupQueue, undefined, { summary: true })
|
|
1702
|
+
.catch(error => logger.error('[Handoff] startup recovery coordinator failed:', error));
|
|
1703
|
+
trace.point('daemon.resumeSessions');
|
|
1704
|
+
const settleSessionRecovery = trace.startTask('daemon.resumeSessionsComplete', `sessions=${startupWork.pendingSessions.length}`, { summary: true });
|
|
1705
|
+
if (!startupWork.pendingSessions.length)
|
|
1706
|
+
settleSessionRecovery('skipped');
|
|
1707
|
+
void (async () => {
|
|
1708
|
+
// Scheduler dispatch registers its promises in the next I/O turn.
|
|
1709
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
1710
|
+
await Promise.all(startupAgents.map(async (agent) => {
|
|
1711
|
+
const pendingSessions = startupWork.pendingSessions.filter(session => (session.selfAID || agentRegistry.resolveByChannel(session.channel)?.aid) === agent.aid);
|
|
1712
|
+
if (!pendingSessions.length) {
|
|
1713
|
+
if (!startupCancelled)
|
|
1714
|
+
startupSessionsReady.add(agent.aid);
|
|
1715
|
+
checkStartupTaskReady();
|
|
1716
|
+
return;
|
|
1717
|
+
}
|
|
1718
|
+
await trace.track('daemon.resumeSessionsAgent', async (phase) => {
|
|
1719
|
+
// Restore only the backends these sessions actually bind to.
|
|
1720
|
+
phase('waiting', 'session Runner');
|
|
1721
|
+
await startupRunnerReady.get(agent.aid);
|
|
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' });
|
|
1736
|
+
}));
|
|
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)}`);
|
|
1257
1741
|
});
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
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');
|
|
1749
|
+
for (const session of startupWork.staleSessions) {
|
|
1750
|
+
if (startupCancelled)
|
|
1751
|
+
return false;
|
|
1752
|
+
const current = await sessionManager.getSessionById(session.id);
|
|
1753
|
+
if (current?.processingState === session.processingState)
|
|
1754
|
+
sessionManager.clearProcessing(session.id);
|
|
1755
|
+
}
|
|
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.
|
|
1761
|
+
let taskReadinessSettled = false;
|
|
1762
|
+
const finishPriorityStartup = trace.startTask('daemon.priorityTaskReady', undefined, { summary: true });
|
|
1763
|
+
priorityStartupGate.releaseAfter(9_000, () => {
|
|
1764
|
+
logger.warn('[startup] Priority recovery still pending after 9s; admitting idle Agents and ECWeb without reporting Ready');
|
|
1765
|
+
});
|
|
1766
|
+
void priorityStartupGate.promise.then(outcome => {
|
|
1767
|
+
trace.setMeta('priorityRelease', outcome);
|
|
1768
|
+
finishPriorityStartup(outcome === 'ready' ? 'ok' : outcome === 'cancelled' ? 'cancelled' : 'skipped');
|
|
1769
|
+
});
|
|
1770
|
+
normalStartupGate.releaseAfter(30_000, () => {
|
|
1771
|
+
logger.warn('[startup] Normal Ready still pending after 30s; admitting optional startup in degraded mode');
|
|
1772
|
+
});
|
|
1773
|
+
checkStartupTaskReady = () => {
|
|
1774
|
+
if (startupCancelled || taskReadinessSettled)
|
|
1775
|
+
return;
|
|
1776
|
+
const agentStates = startupAgents.filter(agent => agent.status !== 'disabled').map(agent => {
|
|
1777
|
+
const runnerReady = agentMap.has(`${agent.aid}::${agent.baseagent}`)
|
|
1778
|
+
|| (deferredStartupRunners.has(agent.aid) && agent.status === 'running');
|
|
1779
|
+
const aun = channelInstancesByAgent.get(agent.aid)?.find(instance => instance.channelType === 'aun');
|
|
1780
|
+
return { aid: agent.aid,
|
|
1781
|
+
runnerReady,
|
|
1782
|
+
runnerFailed: activeRunnerSettledAgents.has(agent.aid) && !runnerReady,
|
|
1783
|
+
aunReady: aun?.channel.getStatus?.().connected === true,
|
|
1784
|
+
recoveryReady: startupHintsReady.has(agent.aid) && startupSessionsReady.has(agent.aid),
|
|
1785
|
+
authorizationReady: ownerResolver.snapshot(agent.aid).consensusStatus !== 'unavailable',
|
|
1786
|
+
};
|
|
1274
1787
|
});
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1788
|
+
const controlAunReady = !daemonCfg.aid || controlChannel?.getStatus().connected === true;
|
|
1789
|
+
const priorityState = startupTaskReadiness({ ipcReady: true, controlAunReady,
|
|
1790
|
+
agents: agentStates.filter(agent => startupWork.priorityAids.has(agent.aid)) });
|
|
1791
|
+
const triggersReady = [...startupWork.triggerAids].every(aid => startupTriggerReady.has(aid));
|
|
1792
|
+
const priorityChannelsReady = externalInstances.filter(inst => startupWork.requiredChannelKeys.has(inst.adapter.channelKey) || startupWork.requiredChannelKeys.has(inst.adapter.channelName))
|
|
1793
|
+
.every(inst => inst.channel.getStatus?.().connected === true);
|
|
1794
|
+
const triggerRecoveryFailed = [...startupWork.triggerAids].some(aid => startupTriggerFailed.has(aid));
|
|
1795
|
+
if (priorityState === 'failed' || triggerRecoveryFailed)
|
|
1796
|
+
priorityStartupGate.settle('failed');
|
|
1797
|
+
else if (priorityState === 'ready' && triggersReady && priorityChannelsReady)
|
|
1798
|
+
priorityStartupGate.settle('ready');
|
|
1799
|
+
let state = startupTaskReadiness({
|
|
1800
|
+
ipcReady: true, // Registered handlers, bound endpoint and ready.signal above.
|
|
1801
|
+
controlAunReady,
|
|
1802
|
+
agents: agentStates,
|
|
1279
1803
|
});
|
|
1280
|
-
|
|
1804
|
+
if (triggerRecoveryFailed)
|
|
1805
|
+
state = 'failed';
|
|
1806
|
+
if (state === 'ready' && (!triggersReady || !priorityChannelsReady))
|
|
1807
|
+
state = 'pending';
|
|
1808
|
+
if (state === 'pending')
|
|
1809
|
+
return;
|
|
1810
|
+
normalTaskState = state;
|
|
1811
|
+
taskReadinessSettled = true;
|
|
1812
|
+
taskReadyGate.settle(state);
|
|
1813
|
+
normalStartupGate.settle(state);
|
|
1814
|
+
if (state === 'ready') {
|
|
1815
|
+
trace.tasksReady();
|
|
1816
|
+
void startupCpuProfile?.stop('task-ready');
|
|
1817
|
+
logger.info(`[startup] Tasks ready: activeAgents=${startupAgents.length} duration=${Date.now() - trace.startedAtMs}ms`);
|
|
1818
|
+
}
|
|
1819
|
+
else {
|
|
1820
|
+
void startupCpuProfile?.stop('startup-failed');
|
|
1821
|
+
logger.warn(`[startup] Tasks unavailable: ${triggerRecoveryFailed ? 'unfinished Trigger recovery failed' : 'an active Agent runner failed'}`);
|
|
1822
|
+
}
|
|
1823
|
+
settleStartupTaskReady(state === 'ready' ? 'ok' : 'failed');
|
|
1824
|
+
stopReadinessObservers();
|
|
1825
|
+
};
|
|
1826
|
+
const stopOwnerReadinessObserver = ownerResolver.onUpdate(checkStartupTaskReady);
|
|
1827
|
+
const stopChannelReadinessObserver = eventBus.subscribe('channel:connected', checkStartupTaskReady);
|
|
1828
|
+
const stopControlReadinessObserver = controlChannel?.onTransportState(checkStartupTaskReady);
|
|
1829
|
+
stopReadinessObservers = () => {
|
|
1830
|
+
stopOwnerReadinessObserver();
|
|
1831
|
+
stopChannelReadinessObserver();
|
|
1832
|
+
stopControlReadinessObserver?.();
|
|
1833
|
+
};
|
|
1834
|
+
daemonPluginLifecycle.defer(stopReadinessObservers, 'startup task readiness');
|
|
1835
|
+
checkStartupTaskReady();
|
|
1281
1836
|
});
|
|
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
|
-
}
|
|
1837
|
+
void startupTaskRuntimePromise.catch(error => {
|
|
1838
|
+
normalTaskState = 'failed';
|
|
1839
|
+
priorityStartupGate.settle('failed');
|
|
1840
|
+
normalStartupGate.settle('failed');
|
|
1841
|
+
taskReadyGate.settle('failed');
|
|
1842
|
+
settleStartupTaskReady('failed');
|
|
1843
|
+
logger.error('[startup] Task runtime dispatch failed:', error);
|
|
1315
1844
|
});
|
|
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
1845
|
trace.mark('daemon.cpuTracking');
|
|
1367
1846
|
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` 看到待兑现项)可能短暂看不到恢复结果。
|
|
1847
|
+
// IPC status is available while work classification and task recovery continue.
|
|
1383
1848
|
trace.mark('daemon.readySignal');
|
|
1384
1849
|
const readySignalPath = resolvePaths().readySignal;
|
|
1385
1850
|
fs.writeFileSync(readySignalPath, String(Date.now()));
|
|
1386
1851
|
logger.info(`✓ Ready signal written: ${readySignalPath}`);
|
|
1387
|
-
// 甘特图记录在写 ready 之后落盘:此时各阶段都已闭合。
|
|
1388
1852
|
trace.setMeta('channelInstances', String(channelInstances.length));
|
|
1389
1853
|
trace.setMeta('agents', String(agentRegistry.list().length));
|
|
1390
|
-
trace.
|
|
1854
|
+
trace.ready();
|
|
1391
1855
|
// 配置 reload 走 IPC `evolagent.reload` 触发,不再用 watchFile。
|
|
1392
1856
|
// 双 rename 原子写下 watchFile 的语义会被破坏,且新结构有 N 个 config.json 要监控;
|
|
1393
1857
|
// 显式触发更可控。
|
|
@@ -1397,6 +1861,7 @@ async function main() {
|
|
|
1397
1861
|
beginShutdown: () => lifecycleNotices.beginShutdown(),
|
|
1398
1862
|
sendOffline: signal => lifecycleNotices.sendOffline(signal),
|
|
1399
1863
|
},
|
|
1864
|
+
stopOwnership: () => ownerResolver.stop(),
|
|
1400
1865
|
ipcServer,
|
|
1401
1866
|
readySignalPath,
|
|
1402
1867
|
bindService,
|
|
@@ -1413,14 +1878,31 @@ async function main() {
|
|
|
1413
1878
|
channelLoader,
|
|
1414
1879
|
channelInstances,
|
|
1415
1880
|
startupRunners: Promise.allSettled([startupRunnersPromise, startupAgentRuntimePromise]),
|
|
1881
|
+
waitForRunnerLoads: runnerDemand.waitForIdle,
|
|
1416
1882
|
cancelStartup: () => {
|
|
1417
1883
|
startupCancelled = true;
|
|
1884
|
+
cancelStartupClassification();
|
|
1885
|
+
priorityStartupGate.settle('cancelled');
|
|
1886
|
+
normalStartupGate.settle('cancelled');
|
|
1887
|
+
taskReadyGate.settle('cancelled');
|
|
1888
|
+
void startupCpuProfile?.stop('shutdown');
|
|
1889
|
+
stopReadinessObservers();
|
|
1890
|
+
settleStartupTaskReady('cancelled');
|
|
1891
|
+
connectionQueue.stop();
|
|
1892
|
+
schedulerQueue.stop();
|
|
1893
|
+
channelConnectionRuntime?.stop();
|
|
1418
1894
|
for (const aid of startupRunnerReady.keys()) {
|
|
1895
|
+
startupRunnerTraces.get(aid)?.('cancelled');
|
|
1419
1896
|
startupRunnerReadyResolvers.get(aid)?.([]);
|
|
1420
1897
|
startupOperationReadyResolvers.get(aid)?.([]);
|
|
1421
1898
|
}
|
|
1422
1899
|
},
|
|
1423
|
-
|
|
1900
|
+
// Control AUN is created in a background I/O turn. Resolve it
|
|
1901
|
+
// at shutdown time rather than capturing the initial undefined value.
|
|
1902
|
+
controlChannel: {
|
|
1903
|
+
prepareShutdown: () => controlChannel?.prepareShutdown(),
|
|
1904
|
+
disconnect: () => controlChannel?.disconnect(),
|
|
1905
|
+
},
|
|
1424
1906
|
sessionManager,
|
|
1425
1907
|
removeAll,
|
|
1426
1908
|
exit: code => process.exit(code),
|
|
@@ -1462,10 +1944,11 @@ async function main() {
|
|
|
1462
1944
|
// 仅在直接执行时启动;导入此模块(如单元测试)时不触发 main()。
|
|
1463
1945
|
import { isMainScript, onShutdown } from './utils/cross-platform.js';
|
|
1464
1946
|
if (isMainScript(import.meta.url)) {
|
|
1465
|
-
main().catch((error) => {
|
|
1947
|
+
main().catch(async (error) => {
|
|
1466
1948
|
const msg = `Fatal error: ${error?.stack || error}`;
|
|
1467
1949
|
logger.error('Fatal error:', error);
|
|
1468
1950
|
console.error(msg); // ensure it lands in stdout.log for self-heal diagnostics
|
|
1951
|
+
await startupCpuProfile?.stop('startup-failed');
|
|
1469
1952
|
process.exit(1);
|
|
1470
1953
|
});
|
|
1471
1954
|
}
|