evolcore 0.0.41 → 0.0.42-test.0
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 +36 -0
- package/bin/codex-managed-hook.mjs +9 -5
- package/dist/agents/baseagent.js +156 -16
- package/dist/agents/claude-runner.js +10 -3
- package/dist/agents/codex/catalog.js +8 -4
- package/dist/agents/codex-runner.js +236 -59
- package/dist/agents/ecagent-runner.js +82 -13
- package/dist/aun/aid/agentmd.js +106 -27
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +65 -13
- package/dist/aun/aid/identity.js +70 -4
- package/dist/aun/aid/index.js +2 -2
- package/dist/aun/service-proxy.js +25 -1
- package/dist/channels/aun.js +242 -209
- package/dist/channels/dingtalk.js +1 -1
- package/dist/channels/feishu.js +1 -1
- package/dist/channels/qqbot.js +1 -1
- package/dist/channels/wechat.js +1 -1
- package/dist/channels/wecom.js +1 -1
- package/dist/cli/agent-command.js +183 -3
- package/dist/cli/agent-create.js +92 -86
- package/dist/cli/agent.js +136 -1
- package/dist/cli/aun-commands.js +137 -35
- package/dist/cli/bench.js +8 -2
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +235 -51
- package/dist/cli/debug-mode.js +1 -1
- package/dist/cli/directory.js +170 -0
- package/dist/cli/index.js +40 -30
- package/dist/cli/init-channel.js +4 -4
- package/dist/cli/init.js +47 -32
- package/dist/cli/managed-command-guard.js +4 -1
- package/dist/cli/model.js +27 -18
- package/dist/cli/pa-workspace-command.js +191 -0
- package/dist/cli/{contact.js → peer.js} +19 -25
- package/dist/cli/restart-monitor.js +11 -4
- package/dist/cli/thread-command.js +47 -18
- package/dist/cli/version.js +18 -18
- package/dist/config/access-policy.js +29 -12
- package/dist/config/boot-log.js +65 -10
- package/dist/config/builtin-roles.js +2 -4
- package/dist/config/config-field-policy.js +3 -0
- package/dist/config/config-manager.js +28 -20
- package/dist/config/{contact-bind-code.js → peer-bind-code.js} +6 -6
- package/dist/config/{contact-book-store.js → peer-book-store.js} +75 -75
- package/dist/config/{contact-book-v2-startup.js → peer-book-v2-startup.js} +2 -2
- package/dist/config/{contact-book.js → peer-book.js} +47 -47
- package/dist/config/peer-operation-service.js +132 -0
- package/dist/config/{contact-request-service.js → peer-request-service.js} +90 -90
- package/dist/config/peer-role-resolver.js +3 -3
- package/dist/config/providers-config.js +17 -8
- package/dist/config/providers.js +1 -1
- package/dist/config/schema-migration.js +336 -39
- package/dist/core/agent-application-service.js +8 -2
- package/dist/core/agent-create-status.js +4 -5
- package/dist/core/agent-ipc-registration.js +5 -4
- package/dist/core/agent-runtime.js +30 -17
- package/dist/core/auth/operation-authorizer.js +0 -24
- package/dist/core/auth/operation-catalog.js +4 -20
- package/dist/core/baseagent-loader.js +27 -3
- package/dist/core/bootstrap-service.js +5 -22
- package/dist/core/capability/capability-manager.js +52 -35
- package/dist/core/channel-loader.js +43 -2
- package/dist/core/channel-runtime.js +2 -2
- package/dist/core/command/agent-control.js +54 -18
- package/dist/core/command/command-handler.js +92 -72
- package/dist/core/command/connect-menu.js +35 -42
- package/dist/core/command/daemon-diagnostics.js +41 -5
- package/dist/core/command/data-root-error.js +10 -0
- package/dist/core/command/data-root-resolver.js +53 -13
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +163 -65
- package/dist/core/command/menu-protocol.js +52 -0
- package/dist/core/command/pa-workspace-calendar.js +223 -0
- package/dist/core/command/pa-workspace-store.js +459 -0
- package/dist/core/command/role-menu.js +2 -2
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +57 -41
- package/dist/core/daemon-lifecycle.js +90 -31
- package/dist/core/evolagent.js +6 -10
- package/dist/core/handoff/runtime.js +11 -4
- package/dist/core/host-snapshot.js +208 -0
- package/dist/core/initialization/service.js +152 -20
- package/dist/core/ipc-registration.js +33 -4
- package/dist/core/memory/batch-meta.js +27 -0
- package/dist/core/memory/consolidation-ops-records.js +44 -1
- package/dist/core/memory/consolidation.js +169 -27
- package/dist/core/message/aun-ipc-sender.js +2 -8
- package/dist/core/message/im-renderer.js +56 -3
- package/dist/core/message/message-admission.js +121 -124
- package/dist/core/message/message-bridge.js +38 -54
- package/dist/core/message/message-queue.js +7 -0
- package/dist/core/message/outbound.js +34 -9
- package/dist/core/message/response-engine.js +154 -73
- package/dist/core/model/catalog-service.js +1 -1
- package/dist/core/model/config-scope.js +2 -2
- package/dist/core/model/model-catalog.js +5 -4
- package/dist/core/model/model-diagnostics.js +6 -5
- package/dist/core/model/model-fallback.js +3 -6
- package/dist/core/model/model-permission.js +1 -1
- package/dist/core/ownership/owner-resolver.js +9 -9
- package/dist/core/permission/approval-gateway.js +1 -1
- package/dist/core/permission/ec-command-parser.js +2 -2
- package/dist/core/permission/tool-canonical.js +96 -46
- package/dist/core/permission/tool-error-code.js +41 -0
- package/dist/core/permission/tool-policy.js +71 -47
- package/dist/core/role/runtime-policy.js +1 -1
- package/dist/core/session/session-idle-monitor.js +10 -0
- package/dist/core/session/session-manager.js +2 -4
- package/dist/core/session/session-title.js +36 -8
- package/dist/core/system-session/memory.js +2 -7
- package/dist/core/thread/command-parser.js +6 -2
- package/dist/core/thread/ipc-operation.js +51 -36
- package/dist/core/thread/thread-operation.js +29 -61
- package/dist/core/thread/thread-service.js +57 -13
- package/dist/directory/canonical-digest.js +54 -0
- package/dist/directory/owner-directory-admission.js +114 -43
- package/dist/directory/owner-directory-agentmd-sync.js +89 -0
- package/dist/directory/owner-directory-cache.js +847 -459
- package/dist/directory/owner-directory-markdown.js +272 -0
- package/dist/directory/owner-directory-query-operation.js +195 -0
- package/dist/directory/owner-directory-remark-operation.js +147 -0
- package/dist/directory/owner-directory-remarks.js +145 -0
- package/dist/directory/owner-directory-scope.js +55 -0
- package/dist/directory/owner-directory-search.js +148 -0
- package/dist/directory/owner-directory-store.js +227 -0
- package/dist/eck/kit-renderer.js +1 -0
- package/dist/ecweb/basic-settings-service.js +4 -1
- package/dist/ecweb/message-context-service.js +13 -9
- package/dist/index.js +195 -37
- package/dist/ipc.js +86 -22
- package/dist/paths.js +11 -8
- package/dist/product.js +2 -0
- package/dist/proxy/manager.js +13 -2
- package/dist/proxy/service-supervisor.js +8 -1
- package/dist/trigger/history.js +23 -0
- package/dist/trigger/scheduler.js +3 -0
- package/dist/utils/atomic-write.js +21 -0
- package/dist/utils/cross-platform.js +35 -0
- package/dist/utils/ecweb-supervisor.js +42 -0
- package/dist/utils/error-utils.js +2 -1
- package/dist/utils/evolcore-version.js +19 -0
- package/dist/utils/host-info.js +242 -5
- package/dist/utils/instance-registry.js +28 -6
- package/dist/utils/logger.js +59 -14
- package/dist/utils/machine-info.js +46 -0
- package/dist/utils/process-introspect.js +166 -2
- package/dist/utils/startup-trace.js +245 -0
- package/ecagent/dist/agent-loop.js +27 -13
- package/ecagent/dist/harness/agent-harness.js +3 -3
- package/ecagent/dist/harness/types.d.ts +1 -0
- package/ecagent/dist/types.d.ts +1 -0
- package/kits/docs/INDEX.md +1 -1
- package/kits/docs/aun/AUN/346/266/210/346/201/257/347/261/273/345/236/213/344/270/216/345/261/236/346/200/247.md +72 -0
- package/kits/docs/evolcore/INDEX.md +3 -2
- package/kits/docs/evolcore/agent-create.md +17 -27
- package/kits/docs/evolcore/agent.md +4 -1
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +16 -5
- package/kits/docs/evolcore/ctl.md +9 -0
- package/kits/docs/evolcore/ec-capabilities.md +19 -0
- package/kits/docs/evolcore/memory-consolidation-batches.md +79 -5
- package/kits/docs/evolcore/menu-exec-schema-commands.md +2 -1
- package/kits/docs/evolcore/menu-protocol.md +1 -0
- package/kits/docs/evolcore/model.md +13 -4
- package/kits/docs/evolcore/msg.md +1 -1
- package/kits/docs/evolcore/pa-workspace.md +51 -0
- package/kits/docs/evolcore/peer.md +73 -0
- package/kits/docs/evolcore/thread-chain.md +4 -1
- package/kits/eck_manifest.json +21 -0
- package/kits/rules/06-channel.md +1 -1
- package/kits/schemas/_meta.json +12 -1
- package/kits/schemas/agent-config.schema.16.json +6 -0
- package/kits/schemas/agent-config.schema.17.json +897 -0
- package/kits/schemas/daemon.schema.9.json +8 -1
- package/kits/skills/ec-agent-create/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +45 -27
- package/kits/skills/ec-service-proxy/SKILL.md +7 -2
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +4 -5
- package/kits/skills/thread-ops/SKILL.md +11 -11
- package/kits/templates/bootstrap-welcome.md +3 -15
- package/kits/templates/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/bootstrap.md +24 -23
- package/kits/templates/system-fragments/commands.md +12 -5
- package/kits/templates/system-fragments/thread.md +18 -3
- package/package.json +6 -4
- package/dist/config/contact-operation-service.js +0 -235
- package/dist/directory/owner-directory-authorization.js +0 -309
- package/kits/docs/evolcore/contact.md +0 -78
- /package/dist/config/{contact-alias.js → peer-alias.js} +0 -0
package/dist/index.js
CHANGED
|
@@ -18,8 +18,8 @@ import { inspectClaudeSandboxDependencies, formatClaudeSandboxDependencies } fro
|
|
|
18
18
|
import { migrateRelationSharedDirectories } from './core/relation/shared-data.js';
|
|
19
19
|
import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode } from './config/daemon-services.js';
|
|
20
20
|
import { ConfigTarget, clearConfiguredOwnerAfterConsensus, onConfigWrite, } from './config/config-manager.js';
|
|
21
|
-
import {
|
|
22
|
-
import {
|
|
21
|
+
import { expirePendingPeerRequests } from './config/peer-request-service.js';
|
|
22
|
+
import { synchronizeOwnershipPeersSync } from './config/peer-book-store.js';
|
|
23
23
|
import { createSessionIdentityResolver } from './config/peer-role-resolver.js';
|
|
24
24
|
import { initializeStartupConfig, prepareStartupConfig, recordStartupConfig } from './config/boot-log.js';
|
|
25
25
|
import { CONFIG_SCHEMA_VERSION } from './types.js';
|
|
@@ -48,7 +48,7 @@ import { startDaemonControlAid } from './core/daemon-control.js';
|
|
|
48
48
|
import { createDelegationAuthorizer } from './core/auth/delegation-authorization.js';
|
|
49
49
|
import { registerProxyIpcExecutor } from './proxy/ipc-service.js';
|
|
50
50
|
import { ownerResolver, getDaemonOwners, getPrimaryOwner } from './core/ownership/owner-resolver.js';
|
|
51
|
-
import { cleanupStartupHandoffs, recoverStartupHandoffs, resumePendingSessions, createDaemonShutdown, daemonConversationTotalExecutionMs, daemonConversationWatchdogMs, daemonIdleTimeoutMs, } from './core/daemon-lifecycle.js';
|
|
51
|
+
import { cleanupStartupHandoffs, recoverStartupHandoffs, releaseRestoredQueue, resumePendingSessions, createDaemonShutdown, daemonConversationTotalExecutionMs, daemonConversationWatchdogMs, daemonIdleTimeoutMs, } from './core/daemon-lifecycle.js';
|
|
52
52
|
import { BootstrapService, createBootstrapCompletionHandler, createBootstrapOwnerBoundHandler } from './core/bootstrap-service.js';
|
|
53
53
|
import { MessageCache } from './core/message/message-cache.js';
|
|
54
54
|
import { createAunHandoffSender } from './core/message/aun-ipc-sender.js';
|
|
@@ -75,9 +75,10 @@ import { registerChannelInstance as registerChannelRuntimeInstance, createChanne
|
|
|
75
75
|
import { createIpcStatusProvider, registerDaemonIpc } from './core/ipc-registration.js';
|
|
76
76
|
import { AgentLoader } from './core/baseagent-loader.js';
|
|
77
77
|
import { EvolAgentRegistry } from './core/evolagent-registry.js';
|
|
78
|
-
import { createAgentInitializationRuntime, createAgentReloadRuntime, createAgentRuntimeOperations, createStartupAgentRunners, completeStartupAgentRuntime, loadStartupAgentRegistry, recoverIncompleteAgentInitializations, } from './core/agent-runtime.js';
|
|
78
|
+
import { createAgentInitializationRuntime, createAgentReloadRuntime, createAgentRuntimeOperations, createStartupAgentRunners, completeStartupAgentRuntime, bindAgentCreationOwner, loadStartupAgentRegistry, recoverIncompleteAgentInitializations, } from './core/agent-runtime.js';
|
|
79
79
|
import { IpcServer } from './ipc.js';
|
|
80
|
-
import { installChannelSdkConsoleFilter, logger, logOwnershipEvent, ownershipErrorCode, setLogLevel } from './utils/logger.js';
|
|
80
|
+
import { installChannelSdkConsoleFilter, logger, logOwnershipEvent, ownershipErrorCode, setChannelLogsEnabled, setLogLevel } from './utils/logger.js';
|
|
81
|
+
import { StartupTracer, STARTUP_TRACE_ID_ENV } from './utils/startup-trace.js';
|
|
81
82
|
import { DiagService } from './core/command/diag-service.js';
|
|
82
83
|
import { createEcwebSupervisor } from './utils/ecweb-supervisor.js';
|
|
83
84
|
import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
|
|
@@ -93,24 +94,40 @@ import { DAEMON_RUNTIME_EPOCH_ENV, ensureProcessManagedTempDir } from './cli/tas
|
|
|
93
94
|
import fs from 'fs';
|
|
94
95
|
import crypto from 'crypto';
|
|
95
96
|
import { getBaseagentSnapshot, loadedBaseagentIds } from './agents/baseagent-availability.js';
|
|
96
|
-
import {
|
|
97
|
+
import { createHostSnapshotProvider } from './core/host-snapshot.js';
|
|
97
98
|
import { queryStatusActivity, queryStatusActivityByAgent } from './stats/query.js';
|
|
98
99
|
export { resolvePersistedRestartDelivery } from './core/message/outbound.js';
|
|
99
100
|
export function readEvolcoreVersion() {
|
|
100
101
|
return readInstalledEvolcoreVersion();
|
|
101
102
|
}
|
|
102
103
|
async function main() {
|
|
104
|
+
// 启动甘特图埋点。firstPhase 之前的时间(node 启动 + 模块加载 + tsx/dist 编译)
|
|
105
|
+
// 全部记进 daemon.bootstrap;traceId 由 `ec start` 通过环境变量传进来,
|
|
106
|
+
// 没传说明是 restart-monitor 或其它途径拉起的,自己生成一个。
|
|
107
|
+
const trace = new StartupTracer('daemon', {
|
|
108
|
+
firstPhase: 'daemon.bootstrap',
|
|
109
|
+
traceId: process.env[STARTUP_TRACE_ID_ENV] || undefined,
|
|
110
|
+
});
|
|
111
|
+
trace.setMeta('launchedBy', process.env.EVOLCORE_LAUNCHED_BY || 'start');
|
|
112
|
+
trace.setMeta('node', process.version);
|
|
113
|
+
// 提前失败/被并发选举淘汰而 exit 的路径也要留一条记录,否则甘特图里只看到 CLI 那一半。
|
|
114
|
+
process.once('exit', () => trace.finish(false));
|
|
103
115
|
// Service managers do not necessarily export TMPDIR. Establish the private
|
|
104
116
|
// managed root before any runner or task runtime is initialized.
|
|
105
117
|
ensureProcessManagedTempDir();
|
|
118
|
+
trace.mark('daemon.versionReport');
|
|
106
119
|
const { runtimeIsDist, runtimeBuildIdentity, diskDistDir, diskDistId } = reportEvolcoreStartup(import.meta.url, message => logger.info(message));
|
|
120
|
+
trace.mark('daemon.sdkFilter');
|
|
107
121
|
installChannelSdkConsoleFilter();
|
|
108
122
|
console.error('[EvolCore] ✓ Console filter installed');
|
|
123
|
+
trace.mark('daemon.loggerInit');
|
|
109
124
|
logger.info(`EvolCore v${readEvolcoreVersion()} starting... (fastaun v${readFastaunVersion()})`);
|
|
110
125
|
console.error('[EvolCore] ✓ Logger initialized');
|
|
111
126
|
// 确保数据目录存在
|
|
127
|
+
trace.mark('daemon.dataDirs');
|
|
112
128
|
ensureDataDirs();
|
|
113
129
|
console.error('[EvolCore] ✓ Data dirs ensured');
|
|
130
|
+
trace.mark('daemon.seedCheck');
|
|
114
131
|
// AUN keystore seed is an EvolCore application constant. A custom value can
|
|
115
132
|
// make existing identities unreadable, so fail before migrations, snapshots,
|
|
116
133
|
// instance registration, and service startup.
|
|
@@ -128,6 +145,7 @@ async function main() {
|
|
|
128
145
|
// .env 文件已在模块顶部加载,此处不再重复加载
|
|
129
146
|
// ── 单实例保护(pre-check + post-write self-check)──
|
|
130
147
|
// pre-check:发现已有活 main 直接退出,避免起任何副作用
|
|
148
|
+
trace.mark('daemon.instancePreCheck');
|
|
131
149
|
{
|
|
132
150
|
const pre = scanInstances();
|
|
133
151
|
const aliveOthers = pre.mains.filter(m => m.alive && m.record.pid !== process.pid);
|
|
@@ -140,8 +158,9 @@ async function main() {
|
|
|
140
158
|
}
|
|
141
159
|
}
|
|
142
160
|
// 在登记 daemon 实例前自动备份并迁移旧配置;失败才阻止启动。
|
|
161
|
+
trace.mark('daemon.startupConfigMigrate');
|
|
143
162
|
try {
|
|
144
|
-
await prepareStartupConfig(recoverAllRoleMutationsSync);
|
|
163
|
+
await prepareStartupConfig(recoverAllRoleMutationsSync, step => trace.mark(`daemon.configMigrate.${step}`));
|
|
145
164
|
}
|
|
146
165
|
catch (e) {
|
|
147
166
|
const msg = `❌ ${e instanceof Error ? e.message : String(e)}`;
|
|
@@ -150,6 +169,7 @@ async function main() {
|
|
|
150
169
|
process.exit(1);
|
|
151
170
|
}
|
|
152
171
|
// 立即登记自己(让其他并发启动者能看见我)
|
|
172
|
+
trace.mark('daemon.instanceRecord');
|
|
153
173
|
const launchedBy = process.env.EVOLCORE_LAUNCHED_BY || 'start';
|
|
154
174
|
// 本次运行模式在这里定下(首次求值时会读走并删除 `ec start --as-mode` 的覆盖文件)
|
|
155
175
|
const devMode = isDevMode();
|
|
@@ -166,6 +186,7 @@ async function main() {
|
|
|
166
186
|
}
|
|
167
187
|
}
|
|
168
188
|
// ── 自动迁移 ──
|
|
189
|
+
trace.mark('daemon.migrations');
|
|
169
190
|
migrateIdentitiesIfNeeded();
|
|
170
191
|
const relationSharedMigration = migrateRelationSharedDirectories();
|
|
171
192
|
if (relationSharedMigration.copied > 0) {
|
|
@@ -174,6 +195,7 @@ async function main() {
|
|
|
174
195
|
migrateLegacyConsolidationBatches();
|
|
175
196
|
// daemon.json 的旧 ecweb/serviceProxy 结构已在启动前归一化为 services[]。
|
|
176
197
|
// ── Skill 监控器启动(采用懒加载机制)──
|
|
198
|
+
trace.mark('daemon.skillWatcher');
|
|
177
199
|
try {
|
|
178
200
|
const { startSkillWatcher } = await import('./core/skill/startup.js');
|
|
179
201
|
startSkillWatcher();
|
|
@@ -182,6 +204,7 @@ async function main() {
|
|
|
182
204
|
logger.warn(`[skill] 监控器启动失败: ${e instanceof Error ? e.message : String(e)}`);
|
|
183
205
|
}
|
|
184
206
|
// ── 配置体系初始化(schema 字段不相交硬约束校验)──
|
|
207
|
+
trace.mark('daemon.configInit');
|
|
185
208
|
const configSnapshotsEnabled = await initializeStartupConfig(message => {
|
|
186
209
|
console.error(message);
|
|
187
210
|
process.exit(1);
|
|
@@ -190,14 +213,20 @@ async function main() {
|
|
|
190
213
|
if (daemonCfg.debug?.logLevel) {
|
|
191
214
|
setLogLevel(daemonCfg.debug.logLevel);
|
|
192
215
|
}
|
|
216
|
+
if (daemonCfg.debug?.channelLogs !== undefined) {
|
|
217
|
+
setChannelLogsEnabled(daemonCfg.debug.channelLogs === true);
|
|
218
|
+
}
|
|
193
219
|
if (initializeEckSnapshotsConfig(daemonCfg)) {
|
|
194
220
|
logger.warn(`[ECK] Debug snapshots enabled at ${eckDebugDir()}; files may contain sensitive context and local paths.`);
|
|
195
221
|
}
|
|
196
222
|
// ── ECK 运行时初始化 ──
|
|
223
|
+
trace.mark('daemon.eckInit');
|
|
197
224
|
initEck();
|
|
198
225
|
// 加载 ECK manifest + 清理旧调试文件
|
|
226
|
+
trace.mark('daemon.kitManifest');
|
|
199
227
|
cleanEckDebug();
|
|
200
228
|
loadKitManifest();
|
|
229
|
+
trace.mark('daemon.loadConfig');
|
|
201
230
|
// 加载配置(新结构:defaults.json + per-agent config.json)
|
|
202
231
|
const defaults = loadDefaults() ?? { $schema_version: CONFIG_SCHEMA_VERSION };
|
|
203
232
|
const sandboxDependencies = inspectClaudeSandboxDependencies();
|
|
@@ -217,6 +246,7 @@ async function main() {
|
|
|
217
246
|
// ECWeb has one lifecycle owner: the daemon. The CLI may have started an
|
|
218
247
|
// instance just before spawning us; the supervisor adopts it when healthy,
|
|
219
248
|
// otherwise starts one and keeps it alive for the daemon's lifetime.
|
|
249
|
+
trace.mark('daemon.ecwebSupervisor');
|
|
220
250
|
let ecwebSupervisor = null;
|
|
221
251
|
const ecwebConfig = ecwebService(daemonCfg.services);
|
|
222
252
|
{
|
|
@@ -254,6 +284,7 @@ async function main() {
|
|
|
254
284
|
return;
|
|
255
285
|
}
|
|
256
286
|
// ── EvolAgent Registry:加载 agents/<aid>/config.json ──
|
|
287
|
+
trace.mark('daemon.agentRegistry');
|
|
257
288
|
const agentRegistry = new EvolAgentRegistry(paths.agentsDir);
|
|
258
289
|
const { primaryAgent, runtimeStatus } = loadStartupAgentRegistry(agentRegistry);
|
|
259
290
|
let agentRuntimeState = runtimeStatus.state;
|
|
@@ -266,6 +297,7 @@ async function main() {
|
|
|
266
297
|
// 启动期 anthropic 凭证校验已移除:runner 创建时由 AgentLoader 错误处理
|
|
267
298
|
logger.info('✓ Config loaded');
|
|
268
299
|
// 创建事件总线
|
|
300
|
+
trace.mark('daemon.eventBus');
|
|
269
301
|
const eventBus = new EventBus();
|
|
270
302
|
logger.info('✓ Event bus initialized');
|
|
271
303
|
// 把所有事件录到 events.log(受 EVENT_LOG 环境变量控制)
|
|
@@ -281,11 +313,13 @@ async function main() {
|
|
|
281
313
|
releaseSessionPathGrants(event.sessionId);
|
|
282
314
|
});
|
|
283
315
|
// 统计收集器(近 1 小时滚动统计)
|
|
316
|
+
trace.mark('daemon.stats');
|
|
284
317
|
const statsCollector = new StatsCollector(eventBus);
|
|
285
318
|
// Per-AID 消息统计收集器(累计,供 watch aid 实时展示)
|
|
286
319
|
const aidStatsCollector = new AidStatsCollector(eventBus);
|
|
287
320
|
const stopStatsPersistence = initializeStatsPersistence(paths.root, aidStatsCollector, eventBus);
|
|
288
321
|
// 初始化 SessionManager(文件系统后端)
|
|
322
|
+
trace.mark('daemon.database');
|
|
289
323
|
const resolveSessionIdentity = createSessionIdentityResolver(agentRegistry);
|
|
290
324
|
const sessionManager = new SessionManager(paths.sessionsDir, eventBus, resolveSessionIdentity);
|
|
291
325
|
logger.info('✓ Database initialized');
|
|
@@ -300,6 +334,7 @@ async function main() {
|
|
|
300
334
|
agentLoader.register(new CodexAgentPlugin());
|
|
301
335
|
agentLoader.register(new GeminiAgentPlugin());
|
|
302
336
|
agentLoader.register(new EcagentAgentPlugin());
|
|
337
|
+
trace.mark('daemon.agentRunners');
|
|
303
338
|
const { agentInstances, agentMap, primaryBaseagent, primaryRunnerKey, runtimeError: runnerStartupError, } = await createStartupAgentRunners({ agentRegistry, agentLoader, sessionManager, primaryAgent });
|
|
304
339
|
if (runnerStartupError) {
|
|
305
340
|
agentRuntimeState = 'error';
|
|
@@ -321,6 +356,7 @@ async function main() {
|
|
|
321
356
|
inst.agent.setPermissionGateway?.(permissionGateway);
|
|
322
357
|
}
|
|
323
358
|
// 创建消息缓存
|
|
359
|
+
trace.mark('daemon.messageCache');
|
|
324
360
|
const messageCache = new MessageCache();
|
|
325
361
|
logger.info('✓ Message cache initialized');
|
|
326
362
|
// 定期清理过期消息(每小时)
|
|
@@ -328,6 +364,7 @@ async function main() {
|
|
|
328
364
|
messageCache.cleanupExpired();
|
|
329
365
|
}, 60 * 60 * 1000);
|
|
330
366
|
// 渠道插件系统
|
|
367
|
+
trace.mark('daemon.channelCreate');
|
|
331
368
|
const channelLoader = new ChannelLoader(daemonCfg.debug, daemonCfg.aun?.defaultEncrypt);
|
|
332
369
|
channelLoader.register(new FeishuChannelPlugin());
|
|
333
370
|
channelLoader.register(new WechatChannelPlugin());
|
|
@@ -349,11 +386,12 @@ async function main() {
|
|
|
349
386
|
}
|
|
350
387
|
}
|
|
351
388
|
const channelInstances = evolagentInstances;
|
|
389
|
+
trace.mark('daemon.channelInstances', `${channelInstances.length} 个渠道实例`);
|
|
352
390
|
logger.info(`✓ Created ${channelInstances.length} channel instance(s)`);
|
|
353
391
|
let bootstrapService;
|
|
354
392
|
const contactRequestExpiryTimer = setInterval(() => {
|
|
355
393
|
for (const agent of agentRegistry.runnableAgents()) {
|
|
356
|
-
void
|
|
394
|
+
void expirePendingPeerRequests(agent.aid).catch(error => {
|
|
357
395
|
logger.warn(`[contact-request] Pending expiry sweep failed: self=${agent.aid} error=${error instanceof Error ? error.message : String(error)}`);
|
|
358
396
|
});
|
|
359
397
|
}
|
|
@@ -375,7 +413,7 @@ async function main() {
|
|
|
375
413
|
permissionGateway.revalidatePendingApprovals(subjectAid);
|
|
376
414
|
if (agentRegistry.get(subjectAid)) {
|
|
377
415
|
try {
|
|
378
|
-
|
|
416
|
+
synchronizeOwnershipPeersSync(subjectAid);
|
|
379
417
|
}
|
|
380
418
|
catch (error) {
|
|
381
419
|
logOwnershipEvent('contacts.sync_failed', { subjectAid, ownerAid, errorCode: ownershipErrorCode(error) }, true);
|
|
@@ -646,6 +684,7 @@ async function main() {
|
|
|
646
684
|
cmdHandler.registerAdapter(daemonChannel);
|
|
647
685
|
cmdHandler.registerChannel(daemonChannel.channelName, daemonChannel, 'daemon');
|
|
648
686
|
// ── MessageBridge:Channel ↔ Core 消息桥梁 ──
|
|
687
|
+
trace.mark('daemon.messageBridge');
|
|
649
688
|
const defaultProjectPath = primaryAgent?.projectPath
|
|
650
689
|
?? defaults.projects?.defaultPath
|
|
651
690
|
?? path.join(paths.root, 'projects', 'default');
|
|
@@ -661,7 +700,6 @@ async function main() {
|
|
|
661
700
|
cmdHandler.setGroupInviteDecisionResolver((selfAid, ownerAid, inviteId, action) => groupInviteReviewService.decideManaged(selfAid, ownerAid, inviteId, action));
|
|
662
701
|
msgBridge.setContactBindRuntimeChecker(isContactBindChannelReady);
|
|
663
702
|
msgBridge.setAidStatsCollector(aidStatsCollector);
|
|
664
|
-
cmdHandler.setContactRequestSubmitter((input) => msgBridge.submitAgentContactRequest(input));
|
|
665
703
|
bootstrapService = new BootstrapService(agentRegistry, eventBus);
|
|
666
704
|
msgBridge.setBootstrapService(bootstrapService);
|
|
667
705
|
msgBridge.setHandoffRuntime(handoffRuntime);
|
|
@@ -692,6 +730,7 @@ async function main() {
|
|
|
692
730
|
registerChannelRuntimeInstance(inst, channelRuntimeDependencies);
|
|
693
731
|
};
|
|
694
732
|
// ── 注册所有渠道实例 ──
|
|
733
|
+
trace.mark('daemon.channelRegister');
|
|
695
734
|
for (const inst of channelInstances) {
|
|
696
735
|
registerChannelInstance(inst);
|
|
697
736
|
}
|
|
@@ -699,9 +738,11 @@ async function main() {
|
|
|
699
738
|
bindStartupChannelsToAgents(channelInstances, agentRegistry, agentInstances);
|
|
700
739
|
({ state: agentRuntimeState, error: agentRuntimeError } = await completeStartupAgentRuntime(agentRegistry, { state: agentRuntimeState, error: agentRuntimeError }));
|
|
701
740
|
// ── 配置快照 + 启动日志(启动完毕锚点,网络无关)──────────────────
|
|
741
|
+
trace.mark('daemon.startupConfigRecord');
|
|
702
742
|
recordStartupConfig(configSnapshotsEnabled);
|
|
703
743
|
// 预填充 Feishu 已知 thread_id(重启后避免误判话题创建)。
|
|
704
744
|
// 必须早于 connect(),后台连接后 Feishu 可能立即收到消息。
|
|
745
|
+
trace.mark('daemon.preloadThreads');
|
|
705
746
|
preloadChannelThreads(channelInstances, sessionManager);
|
|
706
747
|
const connectedChannels = new Set();
|
|
707
748
|
const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
|
|
@@ -717,7 +758,9 @@ async function main() {
|
|
|
717
758
|
// recovery promises so restored ordinary messages cannot start ahead of
|
|
718
759
|
// pending priority hints for the same session.
|
|
719
760
|
const startupObserverRecoveries = [];
|
|
720
|
-
|
|
761
|
+
// handoff 启动恢复是否还在收集 hint。与"队列是否已放行"是两件事:
|
|
762
|
+
// 队列有超时兜底会提前放行,而恢复可能还在等渠道。
|
|
763
|
+
let startupRecoveryPending = true;
|
|
721
764
|
const { markChannelConnected, unregisterRuntimeChannel, queuePendingObserverHints } = createChannelConnectionRuntime({
|
|
722
765
|
...channelRuntimeDependencies,
|
|
723
766
|
channelInstances,
|
|
@@ -728,7 +771,7 @@ async function main() {
|
|
|
728
771
|
trySendPendingRestartNotice,
|
|
729
772
|
sessionsDir: paths.sessionsDir,
|
|
730
773
|
startupObserverRecoveries,
|
|
731
|
-
|
|
774
|
+
isStartupRecoveryPending: () => startupRecoveryPending,
|
|
732
775
|
});
|
|
733
776
|
// Bind the per-HOME IPC endpoint before any AUN connection is attempted.
|
|
734
777
|
// A failed bind (for example, a stale Windows named pipe) must abort startup
|
|
@@ -744,7 +787,8 @@ async function main() {
|
|
|
744
787
|
cmdHandler.setDiagService(diagService);
|
|
745
788
|
let shutdown;
|
|
746
789
|
let pendingShutdownReason;
|
|
747
|
-
|
|
790
|
+
let pendingShutdownTraceId;
|
|
791
|
+
trace.mark('daemon.baseagentProbe');
|
|
748
792
|
const baseagentSnapshot = await getBaseagentSnapshot({ loaded: loadedBaseagentIds(agentMap.keys()), probe: true });
|
|
749
793
|
const getStatusSnapshot = () => {
|
|
750
794
|
const now = Date.now();
|
|
@@ -781,6 +825,18 @@ async function main() {
|
|
|
781
825
|
}),
|
|
782
826
|
};
|
|
783
827
|
};
|
|
828
|
+
// 主机信息唯一出口:CLI、菜单、ecweb 都读这一份,别各自探测。
|
|
829
|
+
// 静态探测(虚拟化、运行时版本)异步跑,不阻塞启动。
|
|
830
|
+
const hostProvider = createHostSnapshotProvider({
|
|
831
|
+
messageQueue,
|
|
832
|
+
statsCollector,
|
|
833
|
+
agentRegistry,
|
|
834
|
+
daemonAid: daemonCfg.aid,
|
|
835
|
+
runMode: devMode ? 'dev' : 'install',
|
|
836
|
+
getSystemCpuPercent: () => ipcServer.getSystemCpuPercent(),
|
|
837
|
+
getControlAidState: () => controlChannel?.getAidState(),
|
|
838
|
+
});
|
|
839
|
+
trace.mark('daemon.ipcCreate');
|
|
784
840
|
const ipcServer = new IpcServer(resolvePaths().socket, createIpcStatusProvider({
|
|
785
841
|
channelInstances,
|
|
786
842
|
statsCollector,
|
|
@@ -795,7 +851,7 @@ async function main() {
|
|
|
795
851
|
getAgentRuntimeError: () => agentRuntimeError,
|
|
796
852
|
daemonAid: daemonCfg.aid,
|
|
797
853
|
getControlAidState: () => controlChannel?.getAidState(),
|
|
798
|
-
|
|
854
|
+
getHost: () => hostProvider.getSnapshot().host,
|
|
799
855
|
baseagents: baseagentSnapshot,
|
|
800
856
|
diskDistId,
|
|
801
857
|
getTriggerSummary: () => {
|
|
@@ -887,7 +943,9 @@ async function main() {
|
|
|
887
943
|
const { agentCreateNonInteractive } = await import('./cli/agent-create.js');
|
|
888
944
|
return await agentCreateNonInteractive(options, {
|
|
889
945
|
hotLoadAgent: coreHotLoadAgent,
|
|
890
|
-
|
|
946
|
+
// The new Agent has no long-lived channel yet. Reuse the audited short
|
|
947
|
+
// client and fresh preflight used by initialization.
|
|
948
|
+
bindOwnerAgent: (aid, ownerAid) => bindAgentCreationOwner(aid, ownerAid),
|
|
891
949
|
});
|
|
892
950
|
},
|
|
893
951
|
aunAids: () => channelInstances.flatMap(instance => {
|
|
@@ -910,15 +968,19 @@ async function main() {
|
|
|
910
968
|
cmdHandler.setAgentApplicationService(agentApplicationService);
|
|
911
969
|
ipcServer.setRemoteAccessOwnerProvider(() => processLevelOwners()[0]);
|
|
912
970
|
cmdHandler.setDaemonMonitorProvider(() => ipcServer.getMonitorSnapshot().snapshot);
|
|
913
|
-
|
|
971
|
+
cmdHandler.setDaemonHostProvider(() => hostProvider.getSnapshot());
|
|
972
|
+
ipcServer.setHostSnapshotProvider(() => hostProvider.getSnapshot());
|
|
973
|
+
ipcServer.setShutdownExecutor(async (reason, traceId) => {
|
|
914
974
|
if (!shutdown) {
|
|
915
975
|
pendingShutdownReason = reason;
|
|
976
|
+
pendingShutdownTraceId = traceId;
|
|
916
977
|
return;
|
|
917
978
|
}
|
|
918
|
-
await shutdown(reason);
|
|
979
|
+
await shutdown(reason, traceId);
|
|
919
980
|
});
|
|
920
981
|
// Register every IPC executor/provider before exposing the endpoint. The
|
|
921
982
|
// failed bind still aborts before any AUN connection is attempted.
|
|
983
|
+
trace.mark('daemon.ipcRegister');
|
|
922
984
|
console.error('[EvolCore] ✓ Configuring IPC...');
|
|
923
985
|
registerDaemonIpc({
|
|
924
986
|
ipcServer,
|
|
@@ -966,10 +1028,12 @@ async function main() {
|
|
|
966
1028
|
},
|
|
967
1029
|
});
|
|
968
1030
|
recoverIncompleteAgentInitializations(agentInitializationService, paths.agentsDir);
|
|
1031
|
+
trace.mark('daemon.ipcStart');
|
|
969
1032
|
console.error('[EvolCore] ✓ Starting IPC server...');
|
|
970
1033
|
await ipcServer.start();
|
|
971
1034
|
console.error('[EvolCore] ✓ IPC server started');
|
|
972
1035
|
// ── 连接所有渠道(后台首连,AUN/任意渠道故障不阻塞 daemon 主流程)──
|
|
1036
|
+
trace.mark('daemon.channelConnectDispatch');
|
|
973
1037
|
logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
|
|
974
1038
|
const connectAllPromise = channelLoader.connectAll(channelInstances, {
|
|
975
1039
|
concurrency: 10,
|
|
@@ -993,16 +1057,31 @@ async function main() {
|
|
|
993
1057
|
// (触发时若渠道未连,发送侧自行排队/重试)。markChannelConnected 里的
|
|
994
1058
|
// ensureTriggerSchedulerStarted 仅作"尽早启动"优化,此处保证即使渠道首连
|
|
995
1059
|
// 全部失败(如 gateway 宕机),trigger 仍无条件启动。Promise 去重,不会重复。
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1060
|
+
//
|
|
1061
|
+
// 同理也不在就绪判据里:cron 到点触发时若 scheduler 尚未起来,最坏是推迟一次
|
|
1062
|
+
// 触发,而通道连接本身已经是后台的。这里不 await,避免 21 个 scheduler 的
|
|
1063
|
+
// 冷启动抬出 1+ 秒的 ready 延迟。
|
|
1064
|
+
trace.mark('daemon.triggerScheduler');
|
|
1065
|
+
// `void Promise.all` 并不够:buildTriggerScheduler 是同步函数,每个任务会一路同步
|
|
1066
|
+
// 跑到第一个真正的 await 才让出,21 个 scheduler 的冷启动仍然串在同一轮事件循环里
|
|
1067
|
+
// (实测 745ms 照样落在 ready 之前)。放到 setImmediate 里,让 ready 先写出去。
|
|
1068
|
+
setImmediate(() => {
|
|
1069
|
+
void Promise.all([
|
|
1070
|
+
ensureDaemonTriggerSchedulerStarted().catch((e) => {
|
|
1071
|
+
logger.warn(`[startup] daemon trigger scheduler start failed for ${daemonTriggerOwner.aid}: ${e}`);
|
|
1072
|
+
}),
|
|
1073
|
+
...triggerStartupAgents.map(agent => ensureTriggerSchedulerStarted(agent).catch((e) => {
|
|
1074
|
+
logger.warn(`[startup] trigger scheduler start failed for ${agent.aid}: ${e}`);
|
|
1075
|
+
})),
|
|
1076
|
+
]).then(() => {
|
|
1077
|
+
// scheduler 起来之后再采一次 session:idle trigger 身份:idle monitor 的
|
|
1078
|
+
// activate() 早于这里执行,那时列表还是空的。
|
|
1079
|
+
sessionIdleMonitor.refreshTriggerIdentities();
|
|
1080
|
+
});
|
|
1081
|
+
});
|
|
1004
1082
|
sessionIdleMonitor.activate();
|
|
1005
1083
|
relationIdleMonitor.start();
|
|
1084
|
+
trace.mark('daemon.controlChannel');
|
|
1006
1085
|
controlChannel = startDaemonControlAid({
|
|
1007
1086
|
daemonCfg,
|
|
1008
1087
|
cmdHandler,
|
|
@@ -1023,26 +1102,85 @@ async function main() {
|
|
|
1023
1102
|
});
|
|
1024
1103
|
},
|
|
1025
1104
|
});
|
|
1105
|
+
// 首轮 SDK 自动生成的会话名必须走与 `ec thread rename` 相同的出口:
|
|
1106
|
+
// 更新话题索引、落盘并给对端发 `topic.renamed`。只调 `renameSession` 的话,
|
|
1107
|
+
// 名字只在本地存活——对端看不到,话题索引也停在占位名上。
|
|
1108
|
+
// 必须放在 registerDaemonIpc 之后:系统消息发送器在那里才注册到 CommandHandler。
|
|
1109
|
+
responseEngine.setSessionTitleSyncer(async (session, newName) => {
|
|
1110
|
+
if ((session.channelType || session.channel.split('#', 1)[0]) !== 'aun')
|
|
1111
|
+
return false;
|
|
1112
|
+
const selfAid = session.selfAID;
|
|
1113
|
+
const peer = session.channelId;
|
|
1114
|
+
if (!selfAid || !peer)
|
|
1115
|
+
return false;
|
|
1116
|
+
const { ThreadService } = await import('./core/thread/thread-service.js');
|
|
1117
|
+
const { notifyThreadRename } = await import('./core/thread/thread-operation.js');
|
|
1118
|
+
const { sessionTopicThreadId } = await import('./core/thread/topic-id.js');
|
|
1119
|
+
const svc = new ThreadService(sessionManager);
|
|
1120
|
+
const threadId = sessionTopicThreadId(session) ?? '';
|
|
1121
|
+
try {
|
|
1122
|
+
const result = await svc.renameThread({ selfAid, peer, threadId, name: newName });
|
|
1123
|
+
await notifyThreadRename({
|
|
1124
|
+
selfAid,
|
|
1125
|
+
peer,
|
|
1126
|
+
threadId,
|
|
1127
|
+
result,
|
|
1128
|
+
threadService: svc,
|
|
1129
|
+
sendSystemMsg: cmdHandler.getThreadSystemMsgSender(),
|
|
1130
|
+
});
|
|
1131
|
+
return true;
|
|
1132
|
+
}
|
|
1133
|
+
catch (error) {
|
|
1134
|
+
// 主会话目录还没落盘(首轮尚未持久化)时没有可改的对象,退回纯本地改名。
|
|
1135
|
+
logger.debug(`[Daemon] session title sync skipped: ${error instanceof Error ? error.message : String(error)}`);
|
|
1136
|
+
return false;
|
|
1137
|
+
}
|
|
1138
|
+
});
|
|
1026
1139
|
// 统一 channel:health 跨通道通知(仅 auth_error)
|
|
1027
1140
|
registerChannelHealthNotifications({ eventBus, channelInstances, agentRegistry });
|
|
1028
1141
|
// Trigger scheduler 已在队列恢复之后启动;这里只协调其余持久化工作。
|
|
1029
1142
|
// runnableAgents() only returns pre-start `stopped` agents. Reuse the stable
|
|
1030
1143
|
// startup snapshot because channel connection may already mark them running.
|
|
1144
|
+
//
|
|
1145
|
+
// handoff 清理与恢复都不在就绪判据里:它们只影响历史 handoff 的到期回收和
|
|
1146
|
+
// 队列兑现,控制面(IPC + 已注册的 handler)在此期间已完全可用。
|
|
1147
|
+
// 重启前读回的队列消息由 releaseRestoredQueue 放行(等 hint 恢复 + 渠道首连,
|
|
1148
|
+
// 最多 30s 兜底),所以提前宣告 ready 不会让排队消息抢跑。
|
|
1149
|
+
trace.mark('daemon.handoffRecovery');
|
|
1031
1150
|
const recoveryAids = triggerStartupAgents.map(agent => agent.aid);
|
|
1032
|
-
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1040
|
-
|
|
1041
|
-
|
|
1042
|
-
|
|
1151
|
+
// TTL 清理是纯本地 I/O,不依赖任何渠道:直接并发跑,不要挂在 connectAllPromise 后面。
|
|
1152
|
+
// 挂在后面意味着网关宕机/认证退避期间过期 handoff 永远回收不掉,而这正是它要解决的问题。
|
|
1153
|
+
void cleanupStartupHandoffs(recoveryAids, handoffRuntime)
|
|
1154
|
+
.catch(error => logger.error('[Handoff] startup TTL cleanup failed:', error));
|
|
1155
|
+
// 队列放行要等 observer hint 恢复完:hint 是同一 session 的优先提示,先放行
|
|
1156
|
+
// 普通消息会让恢复出的回复抢到提示前面。hint 恢复本身不依赖渠道连上,
|
|
1157
|
+
// 所以这个信号不会被"某条通道卡住"拖住。
|
|
1158
|
+
let markStartupHintsRecovered = () => { };
|
|
1159
|
+
const startupHintsRecovered = new Promise(resolve => { markStartupHintsRecovered = resolve; });
|
|
1160
|
+
const recoverStartupQueue = async () => {
|
|
1161
|
+
await recoverStartupHandoffs({
|
|
1162
|
+
channelInstances,
|
|
1163
|
+
recoveryAids,
|
|
1164
|
+
agentRegistry,
|
|
1165
|
+
queuePendingObserverHints,
|
|
1166
|
+
startupObserverRecoveries,
|
|
1167
|
+
handoffRuntime,
|
|
1168
|
+
setStartupRecoveryPending: value => { startupRecoveryPending = value; },
|
|
1169
|
+
onStartupHintsRecovered: () => markStartupHintsRecovered(),
|
|
1170
|
+
});
|
|
1171
|
+
};
|
|
1043
1172
|
void connectAllPromise
|
|
1044
1173
|
.then(recoverStartupQueue, recoverStartupQueue)
|
|
1045
1174
|
.catch(error => logger.error('[Handoff] startup recovery coordinator failed:', error));
|
|
1175
|
+
// 队列放行独立于 handoff 兑现:正常情况下等 hint 恢复完 + 渠道首连结束,
|
|
1176
|
+
// 超时则先放行。详见 releaseRestoredQueue 的注释——connectAll 没有总时限,
|
|
1177
|
+
// 不能让它决定重启前消息的命运。
|
|
1178
|
+
void releaseRestoredQueue({
|
|
1179
|
+
channelConnectSettled: Promise.all([startupHintsRecovered, connectAllPromise]),
|
|
1180
|
+
pendingCount: () => messageQueue.getTotalQueueLength(),
|
|
1181
|
+
startRestoredQueue: () => messageQueue.startRestored(),
|
|
1182
|
+
}).catch(error => logger.error('[Queue] restored queue release failed:', error));
|
|
1183
|
+
trace.mark('daemon.resumeSessions');
|
|
1046
1184
|
resumePendingSessions({
|
|
1047
1185
|
sessionManager,
|
|
1048
1186
|
messageQueue,
|
|
@@ -1050,12 +1188,31 @@ async function main() {
|
|
|
1050
1188
|
agentRegistry,
|
|
1051
1189
|
agentMap,
|
|
1052
1190
|
});
|
|
1191
|
+
trace.mark('daemon.cpuTracking');
|
|
1053
1192
|
ipcServer.startCpuTracking();
|
|
1054
1193
|
// IPC was bound before channel connection. At this point all handlers are
|
|
1055
1194
|
// registered, so the ready signal can safely expose the control plane.
|
|
1195
|
+
//
|
|
1196
|
+
// 就绪判据 = 控制面可用(IPC 已绑定、命令/菜单 handler 已注册、trigger
|
|
1197
|
+
// scheduler 已启动、channel 实例已在后台连接),不包含以下几类"历史数据整理":
|
|
1198
|
+
// - handoff 到期回收 / 启动恢复(见上方 recoverStartupQueue,后台继续)
|
|
1199
|
+
// - ecweb 代理(由 daemon 监督,独立生命周期)
|
|
1200
|
+
// - 各渠道首次连接的完成(连不上会记 WARN,不影响控制面)
|
|
1201
|
+
// 这些工作过去排在 ready 之前,任一环节变慢(例如 handoff 目录里堆了上百个
|
|
1202
|
+
// 快照、某条 AUN 通道认证退避)都会把 CLI 的 30s 等待顶穿,报出"启动失败"
|
|
1203
|
+
// 的红叉,而 daemon 其实几十秒后自己就绪了。
|
|
1204
|
+
//
|
|
1205
|
+
// 代价:ready 之后的一小段时间里,历史 handoff 尚未恢复完、被延后的排队消息
|
|
1206
|
+
// 尚未启动。此时 IPC 接受的命令照常执行,但依赖"重启前未完成的 handoff 已回填"
|
|
1207
|
+
// 的逻辑(例如 `ec handoff list` 看到待兑现项)可能短暂看不到恢复结果。
|
|
1208
|
+
trace.mark('daemon.readySignal');
|
|
1056
1209
|
const readySignalPath = resolvePaths().readySignal;
|
|
1057
1210
|
fs.writeFileSync(readySignalPath, String(Date.now()));
|
|
1058
1211
|
logger.info(`✓ Ready signal written: ${readySignalPath}`);
|
|
1212
|
+
// 甘特图记录在写 ready 之后落盘:此时各阶段都已闭合。
|
|
1213
|
+
trace.setMeta('channelInstances', String(channelInstances.length));
|
|
1214
|
+
trace.setMeta('agents', String(agentRegistry.list().length));
|
|
1215
|
+
trace.finish(true);
|
|
1059
1216
|
// 配置 reload 走 IPC `evolagent.reload` 触发,不再用 watchFile。
|
|
1060
1217
|
// 双 rename 原子写下 watchFile 的语义会被破坏,且新结构有 N 个 config.json 要监控;
|
|
1061
1218
|
// 显式触发更可控。
|
|
@@ -1082,7 +1239,8 @@ async function main() {
|
|
|
1082
1239
|
});
|
|
1083
1240
|
if (pendingShutdownReason) {
|
|
1084
1241
|
const reason = pendingShutdownReason;
|
|
1085
|
-
|
|
1242
|
+
const pendingTraceId = pendingShutdownTraceId;
|
|
1243
|
+
setImmediate(() => { void shutdown?.(reason, pendingTraceId); });
|
|
1086
1244
|
}
|
|
1087
1245
|
process.on('SIGINT', () => shutdown('SIGINT'));
|
|
1088
1246
|
process.on('SIGTERM', () => shutdown('SIGTERM'));
|