evolcore 0.0.43-test.6 → 0.0.43-test.8
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 +188 -58
- package/dist/agent-template/jobs.js +62 -0
- package/dist/agent-template/runtime.js +214 -0
- package/dist/agent-template/service.js +465 -0
- package/dist/agent-template/tool-runner.js +45 -0
- package/dist/agent-template/types.js +5 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/claude-runner.js +1 -1
- package/dist/agents/codex/app-server-client.js +22 -0
- package/dist/agents/codex-runner.js +69 -2
- package/dist/aun/aid/agentmd.js +56 -1
- package/dist/aun/aid/client.js +3 -1
- package/dist/aun/menu/client.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/channels/aun.js +277 -49
- package/dist/cli/agent-command.js +5 -0
- package/dist/cli/agent-create.js +7 -3
- package/dist/cli/agent-template.js +124 -0
- package/dist/cli/aun-commands.js +2 -2
- package/dist/cli/ctl-command.js +2 -1
- package/dist/cli/daemon-commands.js +11 -66
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +35 -2
- package/dist/cli/events-command.js +109 -0
- package/dist/cli/index.js +60 -14
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/net-check.js +1 -1
- package/dist/cli/restart-monitor.js +160 -83
- package/dist/cli/services-command.js +137 -0
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +103 -13
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +8 -8
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +0 -7
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/schema-migration.js +45 -15
- package/dist/config-store.js +2 -1
- package/dist/core/agent-ipc-registration.js +25 -4
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +106 -10
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-authorizer.js +2 -0
- package/dist/core/auth/operation-catalog.js +29 -0
- package/dist/core/baseagent-loader.js +60 -130
- package/dist/core/channel-loader.js +10 -1
- package/dist/core/channel-runtime.js +20 -12
- package/dist/core/command/agent-control.js +12 -2
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/agent-template-menu.js +147 -0
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +80 -17
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +468 -0
- package/dist/core/command/menu-catalog.js +15 -0
- package/dist/core/command/menu-handler.js +216 -90
- package/dist/core/command/menu-protocol.js +71 -13
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +22 -5
- package/dist/core/daemon-lifecycle.js +323 -191
- package/dist/core/handoff/runtime.js +45 -13
- 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 +50 -7
- package/dist/core/legacy-rename.js +41 -0
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +252 -17
- package/dist/core/message/im-renderer.js +116 -85
- package/dist/core/message/message-bridge.js +4 -0
- package/dist/core/message/message-queue.js +66 -15
- 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 +29 -5
- package/dist/core/message/response-engine.js +194 -61
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +50 -5
- package/dist/core/ownership/owner-resolver.js +7 -0
- package/dist/core/pack-auth.js +94 -0
- package/dist/core/pack-install.js +194 -0
- package/dist/core/permission/ec-command-parser.js +51 -17
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/rate-window.js +48 -0
- package/dist/core/relation/peer-identity.js +28 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +67 -28
- package/dist/core/session/session-idle-monitor.js +59 -19
- package/dist/core/session/session-manager.js +13 -4
- 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/core/thread/thread-service.js +52 -3
- package/dist/directory/owner-directory-admission.js +40 -53
- package/dist/directory/owner-directory-cache.js +89 -113
- package/dist/directory/owner-directory-query-operation.js +8 -10
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/eck/message-renderer.js +2 -0
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +6 -2
- package/dist/ecweb/runtime/supervisor.js +19 -4
- package/dist/event-center/admission-materializer.js +124 -0
- package/dist/event-center/bus-gate.js +154 -0
- package/dist/event-center/bus-host.js +307 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +127 -0
- package/dist/event-center/daemon.js +44 -0
- package/dist/event-center/directory-source.js +55 -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 +73 -0
- package/dist/event-center/ipc-operation.js +423 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +207 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +463 -0
- package/dist/event-center/runtime.js +837 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +51 -0
- package/dist/event-center/validation.js +435 -0
- package/dist/index.js +424 -135
- package/dist/ipc.js +106 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +5 -1
- package/dist/proxy/service-supervisor.js +13 -4
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/engines/v1/proactive-flow.js +4 -2
- 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 +550 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +215 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +98 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +18 -0
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/scheduler.js +38 -0
- package/dist/trigger/script-sandbox.js +170 -24
- package/dist/utils/cross-platform.js +24 -10
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +2 -1
- package/dist/utils/package-version-info.js +6 -3
- package/dist/utils/process-introspect.js +45 -9
- package/dist/utils/startup-trace.js +74 -37
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +9 -15
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +3 -1
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/agent.md +22 -1
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/event-center.md +227 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +5 -3
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-protocol.md +28 -1
- package/kits/docs/evolcore/msg.md +21 -9
- package/kits/docs/evolcore/provider.md +3 -1
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +294 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/docs/evolcore/thread-chain.md +15 -3
- package/kits/eck_manifest.json +26 -0
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +1 -0
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-group/SKILL.md +5 -8
- 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/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/reply.md +1 -5
- package/kits/templates/system-fragments/thread.md +13 -10
- package/package.json +5 -6
- package/scripts/agent-template/index.mjs +40 -0
- package/scripts/agent-template/inspect.mjs +240 -0
- package/scripts/agent-template/overlay.mjs +71 -0
- package/scripts/agent-template/pack.mjs +169 -0
- package/scripts/agent-template/shared/common.mjs +235 -0
- package/scripts/agent-template/shared/evolcore.mjs +75 -0
- package/scripts/agent-template/shared/plan.mjs +129 -0
- package/scripts/agent-template/shared/team-schema.json +70 -0
- package/scripts/agent-template/shared/template-contract.mjs +154 -0
- package/scripts/agent-template/shared/template-package.mjs +265 -0
- package/scripts/agent-template/shared/template-runtime.mjs +80 -0
- package/scripts/agent-template/shared/template.mjs +142 -0
- 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 { StartupTaskQueue, StartupGate, discoverStartupWork,
|
|
49
|
+
import { StartupTaskQueue, StartupGate, discoverStartupWork, recoverStartupObserverHints, StartupHandoffRecovery, 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,7 +75,7 @@ import { createIpcStatusProvider, registerDaemonIpc } from './core/ipc-registrat
|
|
|
75
75
|
import { AgentLoader } from './core/baseagent-loader.js';
|
|
76
76
|
import { PluginHandle } from './core/plugin-lifecycle.js';
|
|
77
77
|
import { EvolAgentRegistry } from './core/evolagent-registry.js';
|
|
78
|
-
import { createAgentInitializationRuntime, createAgentReloadRuntime, createAgentRuntimeOperations, createStartupAgentRunners, completeStartupAgentRuntime, bindAgentCreationOwner, loadStartupAgentRegistry, recoverIncompleteAgentInitializations, } from './core/agent-runtime.js';
|
|
78
|
+
import { createAgentInitializationRuntime, createOnDemandAgentRunners, createAgentReloadRuntime, createAgentRuntimeOperations, createStartupAgentRunners, completeStartupAgentRuntime, bindAgentCreationOwner, loadStartupAgentRegistry, recoverIncompleteAgentInitializations, } from './core/agent-runtime.js';
|
|
79
79
|
import { IpcServer } from './ipc.js';
|
|
80
80
|
import { installChannelSdkConsoleFilter, logger, logOwnershipEvent, ownershipErrorCode, setChannelLogsEnabled, setLogLevel } from './utils/logger.js';
|
|
81
81
|
import { StartupTracer, startRequestedStartupCpuProfile } from './utils/startup-trace.js';
|
|
@@ -89,13 +89,19 @@ 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
|
+
import { createAgentTemplateRuntime, restoreTemplatesBeforeStartup } from './agent-template/runtime.js';
|
|
97
|
+
import { setAgentTemplateService } from './agent-template/service.js';
|
|
95
98
|
import crypto from 'crypto';
|
|
96
99
|
import { getBaseagentSnapshot, loadedBaseagentIds } from './agents/baseagent-availability.js';
|
|
97
100
|
import { createHostSnapshotProvider } from './core/host-snapshot.js';
|
|
98
101
|
import { queryStatusActivity, queryStatusActivityByAgent } from './stats/query.js';
|
|
102
|
+
import { TeamWorkspaceManagementService } from './core/command/team-workspace-management.js';
|
|
103
|
+
import { TeamWorkspaceBootstrapService } from './core/command/team-workspace-bootstrap.js';
|
|
104
|
+
import { peekServiceRouter } from './services/index.js';
|
|
99
105
|
export { resolvePersistedRestartDelivery } from './core/message/outbound.js';
|
|
100
106
|
export function readEvolcoreVersion() {
|
|
101
107
|
return readInstalledEvolcoreVersion();
|
|
@@ -107,6 +113,7 @@ async function main() {
|
|
|
107
113
|
// 没传说明是 restart-monitor 或其它途径拉起的,自己生成一个。
|
|
108
114
|
const trace = new StartupTracer('daemon', {
|
|
109
115
|
firstPhase: 'daemon.bootstrap',
|
|
116
|
+
initialPhase: 'running',
|
|
110
117
|
});
|
|
111
118
|
trace.setMeta('launchedBy', process.env.EVOLCORE_LAUNCHED_BY || 'start');
|
|
112
119
|
trace.setMeta('node', process.version);
|
|
@@ -115,8 +122,11 @@ async function main() {
|
|
|
115
122
|
// Service managers do not necessarily export TMPDIR. Establish the private
|
|
116
123
|
// managed root before any runner or task runtime is initialized.
|
|
117
124
|
ensureProcessManagedTempDir();
|
|
118
|
-
|
|
119
|
-
|
|
125
|
+
const buildDiagnostics = createEvolcoreStartupDiagnostics(import.meta.url);
|
|
126
|
+
void trace.track('daemon.versionReport', () => reportEvolcoreStartup(import.meta.url, message => logger.info(message), buildDiagnostics), undefined, { initialPhase: 'running' }).catch(error => {
|
|
127
|
+
buildDiagnostics.state = 'unavailable';
|
|
128
|
+
logger.warn(`[Build] startup diagnostics unavailable: ${error instanceof Error ? error.message : String(error)}`);
|
|
129
|
+
});
|
|
120
130
|
trace.mark('daemon.sdkFilter');
|
|
121
131
|
installChannelSdkConsoleFilter();
|
|
122
132
|
console.error('[EvolCore] ✓ Console filter installed');
|
|
@@ -147,7 +157,7 @@ async function main() {
|
|
|
147
157
|
// pre-check:发现已有活 main 直接退出,避免起任何副作用
|
|
148
158
|
trace.mark('daemon.instancePreCheck');
|
|
149
159
|
{
|
|
150
|
-
const pre = scanInstances();
|
|
160
|
+
const pre = scanInstances({ kind: 'main', includeAidActivity: false });
|
|
151
161
|
const aliveOthers = pre.mains.filter(m => m.alive && m.record.pid !== process.pid);
|
|
152
162
|
if (aliveOthers.length > 0) {
|
|
153
163
|
const pids = aliveOthers.map(m => m.record.pid).join(', ');
|
|
@@ -249,6 +259,7 @@ async function main() {
|
|
|
249
259
|
const bindBootstrapMode = process.env.EVOLCORE_BIND_BOOTSTRAP === '1';
|
|
250
260
|
const paths = resolvePaths();
|
|
251
261
|
let startupCancelled = false;
|
|
262
|
+
let cancelStartupClassification = () => { };
|
|
252
263
|
let normalTaskState = 'pending';
|
|
253
264
|
let startupEcwebState = 'waiting';
|
|
254
265
|
const priorityStartupGate = new StartupGate();
|
|
@@ -258,6 +269,7 @@ async function main() {
|
|
|
258
269
|
const waitForBackgroundStartup = async () => await normalStartupGate.promise !== 'cancelled' && !startupCancelled;
|
|
259
270
|
onShutdown(() => {
|
|
260
271
|
startupCancelled = true;
|
|
272
|
+
cancelStartupClassification();
|
|
261
273
|
priorityStartupGate.settle('cancelled');
|
|
262
274
|
normalStartupGate.settle('cancelled');
|
|
263
275
|
taskReadyGate.settle('cancelled');
|
|
@@ -301,14 +313,18 @@ async function main() {
|
|
|
301
313
|
}
|
|
302
314
|
});
|
|
303
315
|
onShutdown(removeEcwebConfigListener);
|
|
304
|
-
void trace.track('daemon.ecwebLaunch', async () => {
|
|
316
|
+
void trace.track('daemon.ecwebLaunch', async (phase) => {
|
|
317
|
+
phase('waiting', 'priority Ready');
|
|
305
318
|
await priorityStartupGate.promise;
|
|
319
|
+
if (startupCancelled)
|
|
320
|
+
return false;
|
|
306
321
|
if (!startupCancelled) {
|
|
322
|
+
phase('running');
|
|
307
323
|
startupEcwebState = 'starting';
|
|
308
324
|
await ecwebSupervisor.start();
|
|
309
325
|
startupEcwebState = 'ready';
|
|
310
326
|
}
|
|
311
|
-
}).catch((error) => {
|
|
327
|
+
}, undefined, { initialPhase: 'waiting' }).catch((error) => {
|
|
312
328
|
startupEcwebState = 'failed';
|
|
313
329
|
logger.warn(`ECWeb supervisor 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
|
|
314
330
|
});
|
|
@@ -319,9 +335,19 @@ async function main() {
|
|
|
319
335
|
return;
|
|
320
336
|
}
|
|
321
337
|
// ── EvolAgent Registry:加载 agents/<aid>/config.json ──
|
|
338
|
+
const templateStartupRecovery = await restoreTemplatesBeforeStartup(paths.root);
|
|
322
339
|
trace.mark('daemon.agentRegistry');
|
|
323
340
|
const agentRegistry = new EvolAgentRegistry(paths.agentsDir);
|
|
324
|
-
const {
|
|
341
|
+
const { runtimeStatus } = loadStartupAgentRegistry(agentRegistry);
|
|
342
|
+
for (const aid of new Set([...templateStartupRecovery.blocked, ...templateStartupRecovery.pending])) {
|
|
343
|
+
const agent = agentRegistry.get(aid);
|
|
344
|
+
if (agent) {
|
|
345
|
+
agent.status = 'disabled';
|
|
346
|
+
agent.error = 'Template installation requires recovery';
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
const primaryAgent = agentRegistry.runnableAgents()[0];
|
|
350
|
+
const teamWorkspaceManagementService = new TeamWorkspaceManagementService(new TeamWorkspaceBootstrapService());
|
|
325
351
|
let agentRuntimeState = runtimeStatus.state;
|
|
326
352
|
let agentRuntimeError = runtimeStatus.error;
|
|
327
353
|
const startupAgents = [...agentRegistry.runnableAgents()];
|
|
@@ -371,20 +397,60 @@ async function main() {
|
|
|
371
397
|
let capturedStartupQueue;
|
|
372
398
|
const startupQueueCaptured = new Promise(resolve => { capturedStartupQueue = resolve; });
|
|
373
399
|
let discoveredStartupWork;
|
|
400
|
+
const agentWorkPriority = new Map();
|
|
401
|
+
const agentWorkResolvers = new Map();
|
|
402
|
+
const agentWorkReady = new Map(startupAgents.map(agent => [agent.aid,
|
|
403
|
+
new Promise(resolve => { agentWorkResolvers.set(agent.aid, resolve); }),
|
|
404
|
+
]));
|
|
405
|
+
cancelStartupClassification = () => {
|
|
406
|
+
for (const resolve of agentWorkResolvers.values())
|
|
407
|
+
resolve(undefined);
|
|
408
|
+
};
|
|
409
|
+
const scanTimings = [];
|
|
374
410
|
const startupWorkPromise = trace.track('daemon.startupWorkDiscovery', () => discoverStartupWork({
|
|
375
411
|
agentAids: startupAgents.map(agent => agent.aid), daemonTriggerAid,
|
|
376
412
|
primaryAid: primaryAgent?.aid, sessionsRoot: paths.sessionsDir, queuePath: daemonQueuePath(),
|
|
377
413
|
onQueueCaptured: capturedStartupQueue,
|
|
378
|
-
|
|
414
|
+
onScan: timing => { scanTimings.push(timing); },
|
|
415
|
+
onDiagnostics: timing => {
|
|
416
|
+
trace.setMeta('recoveryScan.eventLoop', JSON.stringify(timing));
|
|
417
|
+
logger.info(`[startup] Recovery scan event loop: active=${timing.loopActiveMs}ms idle=${timing.loopIdleMs}ms maxDelay=${timing.loopMaxMs}ms`);
|
|
418
|
+
},
|
|
419
|
+
onAgentPrioritized: (aid, reason) => {
|
|
420
|
+
if (startupCancelled)
|
|
421
|
+
return;
|
|
422
|
+
agentWorkPriority.set(aid, true);
|
|
423
|
+
agentWorkResolvers.get(aid)?.(true);
|
|
424
|
+
logger.info(`[startup] Recovery work identified: aid=${aid} source=${reason}; admitting Runner/AUN while scan continues`);
|
|
425
|
+
},
|
|
426
|
+
onAgentDiscovered: (aid, plan) => {
|
|
427
|
+
if (startupCancelled)
|
|
428
|
+
return;
|
|
429
|
+
const priority = plan.priorityAids.has(aid);
|
|
430
|
+
agentWorkPriority.set(aid, priority);
|
|
431
|
+
agentWorkResolvers.get(aid)?.(priority);
|
|
432
|
+
logger.info(`[startup] Recovery scan: aid=${aid} priority=${priority} `
|
|
433
|
+
+ scanTimings.filter(timing => timing.aid === aid)
|
|
434
|
+
.map(timing => `${timing.phase}=${timing.durationMs}ms/${timing.files}`
|
|
435
|
+
+ (timing.phase === 'sessions' ? ` [dirs=${timing.directoryMs}ms threads=${timing.threadDirectoryMs}ms`
|
|
436
|
+
+ ` metadata=${timing.metadataMs}ms readMax=${timing.readMaxMs}ms io=${JSON.stringify(timing.io)}]` : '')).join(' '));
|
|
437
|
+
},
|
|
438
|
+
}), undefined, { initialPhase: 'running' }).then(plan => {
|
|
379
439
|
discoveredStartupWork = plan;
|
|
380
440
|
trace.setMeta('priorityAgents', String(plan.priorityAids.size));
|
|
381
441
|
trace.setMeta('recoveringTriggerOwners', String(plan.triggerAids.size));
|
|
442
|
+
trace.setMeta('recoveryScan', JSON.stringify(scanTimings));
|
|
382
443
|
logger.info(`[startup] Recovery priority: agents=${plan.priorityAids.size}/${startupAgents.length}`
|
|
383
444
|
+ ` triggerOwners=${plan.triggerAids.size} pendingSessions=${plan.pendingSessions.length}`);
|
|
384
445
|
if (!plan.priorityAids.size)
|
|
385
446
|
priorityStartupGate.settle('ready');
|
|
386
447
|
return plan;
|
|
448
|
+
}).catch(error => {
|
|
449
|
+
cancelStartupClassification();
|
|
450
|
+
throw error;
|
|
387
451
|
});
|
|
452
|
+
// Classification is also consumed later by channel/recovery dispatch.
|
|
453
|
+
void startupWorkPromise.catch(() => { });
|
|
388
454
|
// Agent 插件系统:每个 EvolAgent × 每个 baseagent 一个独立 runner(H1/H2 修复)
|
|
389
455
|
const agentLoader = new AgentLoader();
|
|
390
456
|
agentLoader.register(new ClaudeAgentPlugin());
|
|
@@ -401,16 +467,19 @@ async function main() {
|
|
|
401
467
|
const primaryRunnerKey = primaryAgent ? `${primaryAgent.aid}::${primaryBaseagent}` : '<empty>::claude';
|
|
402
468
|
const startupRunnerInstances = new Map();
|
|
403
469
|
const startupRunnerReadyResolvers = new Map();
|
|
470
|
+
// Startup admission: idle Agents resolve with no instances and load on first use.
|
|
404
471
|
const startupRunnerReady = new Map();
|
|
405
472
|
const startupOperationReadyResolvers = new Map();
|
|
406
473
|
const startupOperationReady = new Map();
|
|
474
|
+
const startupRunnerTraces = new Map();
|
|
407
475
|
const channelInstancesByAgent = new Map();
|
|
408
476
|
const runnerResultsByAgent = new Map();
|
|
409
477
|
const runnerSettledAgents = new Set();
|
|
410
478
|
const activeRunnerSettledAgents = new Set();
|
|
479
|
+
const deferredStartupRunners = new Set();
|
|
411
480
|
let startupChannelsRegistered = false;
|
|
412
481
|
let checkStartupTaskReady = () => { };
|
|
413
|
-
const settleStartupTaskReady = trace.startTask('daemon.taskReady');
|
|
482
|
+
const settleStartupTaskReady = trace.startTask('daemon.taskReady', undefined, { summary: true });
|
|
414
483
|
const resolveStartupOperation = (aid) => {
|
|
415
484
|
if (startupCancelled || (startupChannelsRegistered && runnerSettledAgents.has(aid))) {
|
|
416
485
|
startupOperationReadyResolvers.get(aid)?.(runnerResultsByAgent.get(aid) ?? []);
|
|
@@ -419,12 +488,13 @@ async function main() {
|
|
|
419
488
|
const boundStartupAgents = new Set();
|
|
420
489
|
const bindStartupAgentChannels = (agent, runners) => {
|
|
421
490
|
if (boundStartupAgents.has(agent.aid) || startupCancelled
|
|
422
|
-
|| agent.status === 'error' || agent.status === 'disabled'
|
|
491
|
+
|| agent.status === 'error' || agent.status === 'disabled'
|
|
492
|
+
|| (runners.length === 0 && !deferredStartupRunners.has(agent.aid)))
|
|
423
493
|
return;
|
|
424
494
|
const channels = channelInstancesByAgent.get(agent.aid);
|
|
425
495
|
if (!channels)
|
|
426
496
|
return;
|
|
427
|
-
bindStartupChannelsToAgents(channels, agentRegistry, runners);
|
|
497
|
+
bindStartupChannelsToAgents(channels, agentRegistry, runners, deferredStartupRunners);
|
|
428
498
|
boundStartupAgents.add(agent.aid);
|
|
429
499
|
};
|
|
430
500
|
for (const agent of startupAgents) {
|
|
@@ -435,6 +505,9 @@ async function main() {
|
|
|
435
505
|
startupOperationReadyResolvers.set(agent.aid, resolve);
|
|
436
506
|
}));
|
|
437
507
|
}
|
|
508
|
+
const awaitStartupAgent = async (aid) => {
|
|
509
|
+
await startupOperationReady.get(aid);
|
|
510
|
+
};
|
|
438
511
|
// Status has a config-only snapshot immediately. Slow machine detection is
|
|
439
512
|
// observational and must not gate IPC or other backends' runners/channels.
|
|
440
513
|
const baseagentSnapshot = await getBaseagentSnapshot({ loaded: [], probe: false });
|
|
@@ -448,11 +521,10 @@ async function main() {
|
|
|
448
521
|
process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
|
|
449
522
|
const startupRunnersStartedAtMs = Date.now();
|
|
450
523
|
trace.mark('daemon.agentRunnerDispatch');
|
|
451
|
-
void trace.track('daemon.baseagentProbeComplete', () => getBaseagentSnapshot({ loaded: [], probe: true }))
|
|
524
|
+
void trace.track('daemon.baseagentProbeComplete', () => getBaseagentSnapshot({ loaded: [], probe: true }), undefined, { initialPhase: 'running' })
|
|
452
525
|
.then(snapshot => { Object.assign(baseagentSnapshot, snapshot); refreshLoadedBaseagents(); })
|
|
453
526
|
.catch(error => logger.warn(`[startup] Baseagent inventory probe failed: ${error}`));
|
|
454
527
|
const startupRunnersPromise = trace.track('daemon.agentRunnersReady', async () => {
|
|
455
|
-
const work = await startupWorkPromise;
|
|
456
528
|
return createStartupAgentRunners({
|
|
457
529
|
agentRegistry,
|
|
458
530
|
agentLoader,
|
|
@@ -461,7 +533,27 @@ async function main() {
|
|
|
461
533
|
agentInstances,
|
|
462
534
|
agentMap,
|
|
463
535
|
isCancelled: () => startupCancelled,
|
|
464
|
-
|
|
536
|
+
waitForClassification: async (aid) => {
|
|
537
|
+
const priority = await agentWorkReady.get(aid);
|
|
538
|
+
if (priority === undefined && !startupCancelled)
|
|
539
|
+
throw new Error(`Work classification unavailable for ${aid}`);
|
|
540
|
+
return priority === true;
|
|
541
|
+
},
|
|
542
|
+
onAgentDeferred: agent => {
|
|
543
|
+
deferredStartupRunners.add(agent.aid);
|
|
544
|
+
activeRunnerSettledAgents.add(agent.aid);
|
|
545
|
+
runnerSettledAgents.add(agent.aid);
|
|
546
|
+
runnerResultsByAgent.set(agent.aid, []);
|
|
547
|
+
startupRunnerInstances.set(agent.aid, []);
|
|
548
|
+
bindStartupAgentChannels(agent, []);
|
|
549
|
+
startupRunnerReadyResolvers.get(agent.aid)?.([]);
|
|
550
|
+
resolveStartupOperation(agent.aid);
|
|
551
|
+
checkStartupTaskReady();
|
|
552
|
+
},
|
|
553
|
+
// Startup measures the selected backend only; other backends load on demand.
|
|
554
|
+
onAgentStarting: agent => {
|
|
555
|
+
startupRunnerTraces.set(agent.aid, trace.startTask('daemon.agentRunner', `aid=${agent.aid}; runner=${agent.baseagent}`, { summary: true }));
|
|
556
|
+
},
|
|
465
557
|
configureInstances: instances => {
|
|
466
558
|
for (const instance of instances) {
|
|
467
559
|
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
@@ -484,13 +576,14 @@ async function main() {
|
|
|
484
576
|
startupRunnerInstances.set(agent.aid, instances);
|
|
485
577
|
refreshLoadedBaseagents();
|
|
486
578
|
resolveStartupOperation(agent.aid);
|
|
487
|
-
|
|
579
|
+
startupRunnerTraces.get(agent.aid)?.(startupCancelled ? 'cancelled'
|
|
580
|
+
: instances.some(instance => instance.baseagent === agent.baseagent) ? 'ok' : 'failed');
|
|
488
581
|
logger.info(`[startup] Agent runners ready: aid=${agent.aid} runners=${instances.length}`
|
|
489
582
|
+ ` duration=${timing.completedAtMs - timing.startedAtMs}ms`);
|
|
490
583
|
checkStartupTaskReady();
|
|
491
584
|
},
|
|
492
585
|
});
|
|
493
|
-
}).then(result => {
|
|
586
|
+
}, undefined, { summary: true }).then(result => {
|
|
494
587
|
if (result.runtimeError) {
|
|
495
588
|
agentRuntimeState = 'error';
|
|
496
589
|
agentRuntimeError = result.runtimeError;
|
|
@@ -507,6 +600,7 @@ async function main() {
|
|
|
507
600
|
agentRuntimeError = message;
|
|
508
601
|
logger.error(`[startup] Agent runner batch failed: ${message}`);
|
|
509
602
|
for (const agent of startupAgents) {
|
|
603
|
+
startupRunnerTraces.get(agent.aid)?.('failed');
|
|
510
604
|
if (!runnerSettledAgents.has(agent.aid)) {
|
|
511
605
|
if (!activeRunnerSettledAgents.has(agent.aid)) {
|
|
512
606
|
agent.status = 'error';
|
|
@@ -540,6 +634,8 @@ async function main() {
|
|
|
540
634
|
trace.mark('daemon.channelCreate');
|
|
541
635
|
const channelLoader = new ChannelLoader(daemonCfg.debug, daemonCfg.aun?.defaultEncrypt);
|
|
542
636
|
await registerBuiltinChannelPlugins(channelLoader);
|
|
637
|
+
// Ready control/recovery connections take the next available slot. Idle AUN
|
|
638
|
+
// may use spare capacity without waiting for unrelated work classification.
|
|
543
639
|
const connectionQueue = new StartupTaskQueue(2, 50);
|
|
544
640
|
const schedulerQueue = new StartupTaskQueue(2, 50);
|
|
545
641
|
channelLoader.setConnectionAdmission(instance => connectionQueue.run(() => instance.connect(), () => !startupCancelled && !instance.lifecycle?.signal.aborted));
|
|
@@ -615,6 +711,7 @@ async function main() {
|
|
|
615
711
|
onShutdown(() => { stopOwnerNotifications(); });
|
|
616
712
|
// 创建命令处理器
|
|
617
713
|
const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
|
|
714
|
+
cmdHandler.setTeamWorkspaceManagementService(teamWorkspaceManagementService);
|
|
618
715
|
cmdHandler.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
619
716
|
cmdHandler.setPermissionGateway(permissionGateway);
|
|
620
717
|
cmdHandler.setInteractionRouter(interactionRouter);
|
|
@@ -634,14 +731,6 @@ async function main() {
|
|
|
634
731
|
return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
|
|
635
732
|
}, primaryRunnerKey);
|
|
636
733
|
responseEngine.setAgentDelegationRegistry(agentDelegationRegistry);
|
|
637
|
-
// A persisted session can use a standby backend even when the Agent's active
|
|
638
|
-
// backend is already ready. Wait for the actual session binding before lookup.
|
|
639
|
-
responseEngine.setRunnerReadiness(async (aid, baseagent) => {
|
|
640
|
-
if (!agentMap.has(`${aid}::${baseagent}`))
|
|
641
|
-
await startupOperationReady.get(aid);
|
|
642
|
-
if (startupCancelled)
|
|
643
|
-
throw new Error('Daemon is shutting down');
|
|
644
|
-
});
|
|
645
734
|
const processor = responseEngine;
|
|
646
735
|
configureRunnerCallbacks = instance => {
|
|
647
736
|
instance.agent.setCompactStartCallback?.((sessionId) => {
|
|
@@ -673,6 +762,8 @@ async function main() {
|
|
|
673
762
|
processor.setInteractionRouter(interactionRouter);
|
|
674
763
|
// 创建消息队列
|
|
675
764
|
const startupHintsReady = new Set();
|
|
765
|
+
let startupHandoffRecovery;
|
|
766
|
+
let sessionIdleRestoreState = 'waiting';
|
|
676
767
|
const messageQueue = new MessageQueue(async (message) => {
|
|
677
768
|
const owner = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
678
769
|
if (owner)
|
|
@@ -683,12 +774,15 @@ async function main() {
|
|
|
683
774
|
}, {
|
|
684
775
|
persistencePath: daemonQueuePath(),
|
|
685
776
|
dedupPath: daemonMessageDedupPath(),
|
|
686
|
-
blockedReason: message => {
|
|
777
|
+
blockedReason: (message, sessionId) => {
|
|
687
778
|
const aid = message.selfAID || agentRegistry.resolveByChannel(message.channel)?.aid;
|
|
688
779
|
if (!aid || !startupRunnerReady.has(aid))
|
|
689
780
|
return;
|
|
690
781
|
if (!startupHintsReady.has(aid))
|
|
691
782
|
return 'startup observer hint registration';
|
|
783
|
+
const handoffBlocked = startupHandoffRecovery?.blockedReason(aid, sessionId);
|
|
784
|
+
if (handoffBlocked)
|
|
785
|
+
return handoffBlocked;
|
|
692
786
|
const baseagent = message.baseagent || agentRegistry.get(aid)?.baseagent;
|
|
693
787
|
if (!activeRunnerSettledAgents.has(aid)
|
|
694
788
|
|| (baseagent && !agentMap.has(`${aid}::${baseagent}`) && !runnerSettledAgents.has(aid))) {
|
|
@@ -729,10 +823,33 @@ async function main() {
|
|
|
729
823
|
const handoffQueueTtlMs = daemonIdleTimeoutMs(globalSettings);
|
|
730
824
|
const taskExecutionTtlMs = daemonConversationTotalExecutionMs(globalSettings);
|
|
731
825
|
const handoffRuntime = new HandoffRuntime(sessionManager, messageQueue, createAunHandoffSender(sessionManager, channelInstances, sessionId => responseEngine.getOutboundDebug(sessionId)), undefined, { queueTtlMs: handoffQueueTtlMs });
|
|
826
|
+
startupHandoffRecovery = new StartupHandoffRecovery({
|
|
827
|
+
aids: startupAgents.map(agent => agent.aid), runtime: handoffRuntime, trace,
|
|
828
|
+
onProgress: () => messageQueue.startRestored(), isCancelled: () => startupCancelled,
|
|
829
|
+
});
|
|
732
830
|
responseEngine.setHandoffRuntime(handoffRuntime);
|
|
733
831
|
cmdHandler.setHandoffRuntime(handoffRuntime);
|
|
734
832
|
// Trigger runtime: daemon-level script + feedback scheduler.
|
|
735
833
|
const triggerSchedulers = new TriggerSchedulerRegistry();
|
|
834
|
+
// 事件中心(Event Center):文件驱动事件包,生命周期跟随 Trigger 调度器。
|
|
835
|
+
// 0.5.34 起复用 agent 主 AUN 连接(bus/pub/sub 同连接多角色),不再开专用 slot。
|
|
836
|
+
// 渠道重连会整个换掉 client 实例:这里必须每次动态读取、绝不缓存引用。
|
|
837
|
+
const eventCenter = createDaemonEventCenter({
|
|
838
|
+
triggerSchedulers,
|
|
839
|
+
agentRegistry,
|
|
840
|
+
getClient: aid => {
|
|
841
|
+
const instance = channelInstancesByAgent.get(aid)?.find(candidate => candidate.channelType === 'aun');
|
|
842
|
+
const channel = instance?.channel;
|
|
843
|
+
const client = typeof channel?.getClient === 'function' ? channel.getClient() : undefined;
|
|
844
|
+
return (client ?? null);
|
|
845
|
+
},
|
|
846
|
+
});
|
|
847
|
+
cmdHandler.setEventCenter(eventCenter);
|
|
848
|
+
// ECK 能力清单变量:只读两个运行时的内存包集合,不扫目录。
|
|
849
|
+
responseEngine.setCapabilityIndexes(selfAid => ({
|
|
850
|
+
hasServicePacks: peekServiceRouter(selfAid)?.hasActivePacks() ?? false,
|
|
851
|
+
hasEventPacks: eventCenter.hasActivePacks(selfAid),
|
|
852
|
+
}));
|
|
736
853
|
const sessionIdleMonitor = new SessionIdleMonitor({
|
|
737
854
|
eventBus,
|
|
738
855
|
statePath: path.join(paths.dataDir, 'session-idle-state.json'),
|
|
@@ -886,22 +1003,27 @@ async function main() {
|
|
|
886
1003
|
}, opts));
|
|
887
1004
|
};
|
|
888
1005
|
cmdHandler.setTriggerSchedulerResolver((agentAid) => triggerSchedulers.get(agentAid));
|
|
889
|
-
const ensureTriggerSchedulerStarted = async (agent) => {
|
|
1006
|
+
const ensureTriggerSchedulerStarted = async (agent, phase) => {
|
|
1007
|
+
phase?.('waiting', 'Agent startup admission');
|
|
890
1008
|
await startupRunnerReady.get(agent.aid);
|
|
891
1009
|
if (startupCancelled || agent.status === 'error' || agent.status === 'disabled')
|
|
892
1010
|
return;
|
|
1011
|
+
phase?.('queued', 'scheduler admission');
|
|
893
1012
|
await triggerSchedulers.ensureStarted(agent.aid, async () => {
|
|
894
|
-
await schedulerQueue.run(() => startTriggerScheduler(agent), () => !startupCancelled && agent.status !== 'disabled' && agent.status !== 'error');
|
|
1013
|
+
await schedulerQueue.run(() => { phase?.('running'); return startTriggerScheduler(agent); }, () => !startupCancelled && agent.status !== 'disabled' && agent.status !== 'error');
|
|
895
1014
|
});
|
|
896
1015
|
};
|
|
897
|
-
const ensureDaemonTriggerSchedulerStarted = async () => {
|
|
898
|
-
|
|
1016
|
+
const ensureDaemonTriggerSchedulerStarted = async (phase) => {
|
|
1017
|
+
phase?.('waiting', 'primary Agent startup admission');
|
|
1018
|
+
if (primaryAgent)
|
|
1019
|
+
await startupRunnerReady.get(primaryAgent.aid);
|
|
899
1020
|
if (startupCancelled)
|
|
900
1021
|
return;
|
|
901
|
-
if (primaryAgent && (
|
|
1022
|
+
if (primaryAgent && (primaryAgent.status === 'error' || primaryAgent.status === 'disabled'))
|
|
902
1023
|
return;
|
|
1024
|
+
phase?.('queued', 'scheduler admission');
|
|
903
1025
|
await triggerSchedulers.ensureStarted(daemonTriggerOwner.aid, async () => {
|
|
904
|
-
await schedulerQueue.run(() => startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }), () => !startupCancelled);
|
|
1026
|
+
await schedulerQueue.run(() => { phase?.('running'); return startTriggerScheduler(daemonTriggerOwner, { seedUpgradeCheck: true }); }, () => !startupCancelled);
|
|
905
1027
|
});
|
|
906
1028
|
};
|
|
907
1029
|
const startupTriggerReady = new Set();
|
|
@@ -1104,9 +1226,7 @@ async function main() {
|
|
|
1104
1226
|
agentRegistry,
|
|
1105
1227
|
messageQueue,
|
|
1106
1228
|
runMode: devMode ? 'dev' : 'install',
|
|
1107
|
-
|
|
1108
|
-
runtimeBuildIdentity,
|
|
1109
|
-
diskDistDir,
|
|
1229
|
+
getBuildDiagnostics: () => buildDiagnostics,
|
|
1110
1230
|
getProcessOwners: processLevelOwners,
|
|
1111
1231
|
getAgentRuntimeState: () => agentRuntimeState,
|
|
1112
1232
|
getAgentRuntimeError: () => agentRuntimeError,
|
|
@@ -1117,11 +1237,17 @@ async function main() {
|
|
|
1117
1237
|
optionalRelease: normalStartupGate.status,
|
|
1118
1238
|
ecweb: startupEcwebState === 'waiting' && ecwebSupervisor?.status().enabled ? 'waiting'
|
|
1119
1239
|
: startupEcwebState === 'failed' ? 'failed' : ecwebSupervisor?.status().state ?? 'disabled',
|
|
1240
|
+
backgroundRecovery: {
|
|
1241
|
+
handoff: startupHandoffRecovery?.status() ?? { completed: 0, total: triggerStartupAgents.length, retrying: 0 },
|
|
1242
|
+
sessionIdle: sessionIdleRestoreState,
|
|
1243
|
+
},
|
|
1120
1244
|
agents: startupAgents.map(agent => ({
|
|
1121
|
-
aid: agent.aid, priority:
|
|
1245
|
+
aid: agent.aid, priority: agentWorkPriority.get(agent.aid) ?? false,
|
|
1122
1246
|
runner: agentMap.has(`${agent.aid}::${agent.baseagent}`) ? 'ready'
|
|
1123
|
-
:
|
|
1124
|
-
:
|
|
1247
|
+
: runnerDemand.isLoading(agent.aid, agent.baseagent) ? 'starting'
|
|
1248
|
+
: deferredStartupRunners.has(agent.aid) ? 'deferred'
|
|
1249
|
+
: activeRunnerSettledAgents.has(agent.aid) ? 'failed'
|
|
1250
|
+
: !agentWorkPriority.has(agent.aid) ? 'waiting' : 'starting',
|
|
1125
1251
|
aun: channelInstancesByAgent.get(agent.aid)?.some(inst => inst.channelType === 'aun' && inst.channel.getStatus?.().connected === true) ?? false,
|
|
1126
1252
|
recovery: startupHintsReady.has(agent.aid) && startupSessionsReady.has(agent.aid),
|
|
1127
1253
|
trigger: startupTriggerFailed.has(agent.aid) ? 'failed' : startupTriggerReady.has(agent.aid) ? 'ready' : discoveredStartupWork?.triggerAids.has(agent.aid) ? 'recovering'
|
|
@@ -1134,7 +1260,6 @@ async function main() {
|
|
|
1134
1260
|
getControlAidState: () => controlChannel?.getAidState(),
|
|
1135
1261
|
getHost: () => hostProvider.getSnapshot().host,
|
|
1136
1262
|
baseagents: baseagentSnapshot,
|
|
1137
|
-
diskDistId,
|
|
1138
1263
|
getTriggerSummary: () => {
|
|
1139
1264
|
const now = new Date();
|
|
1140
1265
|
const from = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
|
|
@@ -1175,7 +1300,25 @@ async function main() {
|
|
|
1175
1300
|
aidStatsCollector,
|
|
1176
1301
|
handoffRuntime,
|
|
1177
1302
|
messageQueue,
|
|
1178
|
-
awaitStartupAgent
|
|
1303
|
+
awaitStartupAgent,
|
|
1304
|
+
});
|
|
1305
|
+
const runnerDemand = createOnDemandAgentRunners({
|
|
1306
|
+
agentRegistry, agentLoader, agentMap, coordinator: reloadCoordinator,
|
|
1307
|
+
callbacks: { onSessionIdUpdate: (sessionId, agentSessionId, context) => sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId, context?.turn) },
|
|
1308
|
+
waitForStartup: awaitStartupAgent,
|
|
1309
|
+
isCancelled: () => startupCancelled,
|
|
1310
|
+
configure: instances => {
|
|
1311
|
+
for (const instance of instances) {
|
|
1312
|
+
instance.agent.setPermissionGateway?.(permissionGateway);
|
|
1313
|
+
configureRunnerCallbacks?.(instance);
|
|
1314
|
+
}
|
|
1315
|
+
},
|
|
1316
|
+
onLoaded: refreshLoadedBaseagents,
|
|
1317
|
+
});
|
|
1318
|
+
responseEngine.setRunnerReadiness(runnerDemand.ensure);
|
|
1319
|
+
cmdHandler.setRunnerReadiness(runnerDemand.ensure, aid => {
|
|
1320
|
+
const agent = agentRegistry.get(aid);
|
|
1321
|
+
return agent && agent.config.enabled !== false ? agentLoader.enabledBaseagents(agent) : [];
|
|
1179
1322
|
});
|
|
1180
1323
|
registerRelationConsolidationEvents({ eventBus, agentRegistry, responseEngine, enqueueConsolidation });
|
|
1181
1324
|
globalThis.__evolcore_reloadHooks = reloadHooks;
|
|
@@ -1202,13 +1345,13 @@ async function main() {
|
|
|
1202
1345
|
setAgentRuntimeError: error => { agentRuntimeError = error; },
|
|
1203
1346
|
});
|
|
1204
1347
|
globalThis.__evolcore_hotLoadAgent = async (aid) => {
|
|
1205
|
-
await
|
|
1348
|
+
await awaitStartupAgent(aid);
|
|
1206
1349
|
if (startupCancelled)
|
|
1207
1350
|
throw new Error('Daemon is shutting down');
|
|
1208
1351
|
return agentRuntimeOperations.hotLoad(aid);
|
|
1209
1352
|
};
|
|
1210
1353
|
globalThis.__evolcore_resyncAgents = async () => {
|
|
1211
|
-
await Promise.all(startupOperationReady.
|
|
1354
|
+
await Promise.all([...startupOperationReady.keys()].map(awaitStartupAgent));
|
|
1212
1355
|
if (startupCancelled)
|
|
1213
1356
|
throw new Error('Daemon is shutting down');
|
|
1214
1357
|
return agentRuntimeOperations.resync();
|
|
@@ -1249,9 +1392,9 @@ async function main() {
|
|
|
1249
1392
|
aunAidStats: () => aidStatsCollector.getAllSnapshots(),
|
|
1250
1393
|
beforeAgentOperation: async (aid) => {
|
|
1251
1394
|
if (aid)
|
|
1252
|
-
await
|
|
1395
|
+
await awaitStartupAgent(aid);
|
|
1253
1396
|
else
|
|
1254
|
-
await Promise.all(startupOperationReady.
|
|
1397
|
+
await Promise.all([...startupOperationReady.keys()].map(awaitStartupAgent));
|
|
1255
1398
|
},
|
|
1256
1399
|
});
|
|
1257
1400
|
const agentInitializationService = createAgentInitializationRuntime({
|
|
@@ -1264,6 +1407,38 @@ async function main() {
|
|
|
1264
1407
|
initializationServiceForOwnerRecovery = agentInitializationService;
|
|
1265
1408
|
agentApplicationService.setInitializationService(agentInitializationService);
|
|
1266
1409
|
cmdHandler.setAgentApplicationService(agentApplicationService);
|
|
1410
|
+
setAgentTemplateService(createAgentTemplateRuntime({
|
|
1411
|
+
registry: agentRegistry, coordinator: reloadCoordinator,
|
|
1412
|
+
reloadInsideGate: async (aid) => { await agentRegistry.reload(aid, reloadHooks); },
|
|
1413
|
+
getControl: () => controlChannel,
|
|
1414
|
+
waitForControl: async () => {
|
|
1415
|
+
const deadline = Date.now() + 60_000;
|
|
1416
|
+
while (!controlChannel?.isConnected() && Date.now() < deadline && !startupCancelled) {
|
|
1417
|
+
await new Promise(resolve => setTimeout(resolve, 100));
|
|
1418
|
+
}
|
|
1419
|
+
},
|
|
1420
|
+
getScheduler: aid => triggerSchedulers.get(aid),
|
|
1421
|
+
recoveryComplete: (aid, succeeded) => {
|
|
1422
|
+
if (succeeded && templateStartupRecovery.pending.has(aid)) {
|
|
1423
|
+
const agent = agentRegistry.get(aid);
|
|
1424
|
+
if (agent)
|
|
1425
|
+
messageQueue.unmuteAgent(agent.name);
|
|
1426
|
+
templateStartupRecovery.pending.delete(aid);
|
|
1427
|
+
}
|
|
1428
|
+
},
|
|
1429
|
+
block: aid => {
|
|
1430
|
+
const agent = agentRegistry.get(aid);
|
|
1431
|
+
if (agent) {
|
|
1432
|
+
agent.status = 'disabled';
|
|
1433
|
+
agent.error = 'Template installation requires recovery';
|
|
1434
|
+
}
|
|
1435
|
+
},
|
|
1436
|
+
}));
|
|
1437
|
+
for (const aid of templateStartupRecovery.pending) {
|
|
1438
|
+
const agent = agentRegistry.get(aid);
|
|
1439
|
+
if (agent)
|
|
1440
|
+
messageQueue.muteAgent(agent.name);
|
|
1441
|
+
}
|
|
1267
1442
|
ipcServer.setRemoteAccessOwnerProvider(() => processLevelOwners()[0]);
|
|
1268
1443
|
cmdHandler.setDaemonMonitorProvider(() => ipcServer.getMonitorSnapshot().snapshot);
|
|
1269
1444
|
cmdHandler.setDaemonHostProvider(() => hostProvider.getSnapshot());
|
|
@@ -1281,6 +1456,11 @@ async function main() {
|
|
|
1281
1456
|
trace.mark('daemon.ipcRegister');
|
|
1282
1457
|
console.error('[EvolCore] ✓ Configuring IPC...');
|
|
1283
1458
|
registerDaemonIpc({
|
|
1459
|
+
getConfiguredBaseagents: aid => {
|
|
1460
|
+
const agent = agentRegistry.get(aid);
|
|
1461
|
+
return agent && agent.config.enabled !== false && agent.status !== 'disabled'
|
|
1462
|
+
? agentLoader.enabledBaseagents(agent) : [];
|
|
1463
|
+
},
|
|
1284
1464
|
lifecycle: daemonPluginLifecycle,
|
|
1285
1465
|
ipcServer,
|
|
1286
1466
|
agentRegistry,
|
|
@@ -1316,6 +1496,7 @@ async function main() {
|
|
|
1316
1496
|
daemonAid: daemonCfg.aid,
|
|
1317
1497
|
triggerControlToken,
|
|
1318
1498
|
triggerSchedulers,
|
|
1499
|
+
eventCenter,
|
|
1319
1500
|
daemonTriggerOwner,
|
|
1320
1501
|
primaryAgent,
|
|
1321
1502
|
triggerAuthorization: {
|
|
@@ -1354,7 +1535,7 @@ async function main() {
|
|
|
1354
1535
|
ecwebSupervisor,
|
|
1355
1536
|
startupTrace: trace,
|
|
1356
1537
|
waitForServices: waitForBackgroundStartup,
|
|
1357
|
-
connectChannel: channel => trace.track('daemon.controlChannelConnect',
|
|
1538
|
+
connectChannel: channel => trace.track('daemon.controlChannelConnect', phase => connectionQueue.run(() => { phase('running'); return channel.connect(); }, () => !startupCancelled), undefined, { initialPhase: 'queued' }),
|
|
1358
1539
|
onServiceProxyManager: manager => {
|
|
1359
1540
|
const authorizeManagedOperation = createDelegationAuthorizer({
|
|
1360
1541
|
agentDelegationRegistry,
|
|
@@ -1368,27 +1549,38 @@ async function main() {
|
|
|
1368
1549
|
});
|
|
1369
1550
|
},
|
|
1370
1551
|
});
|
|
1371
|
-
const startupWork = await startupWorkPromise;
|
|
1372
|
-
if (startupCancelled)
|
|
1373
|
-
return;
|
|
1374
|
-
if (startupWork.sessionScanFailed) {
|
|
1375
|
-
// Exceptional compatibility fallback; healthy starts reuse asynchronous discovery.
|
|
1376
|
-
startupWork.pendingSessions = sessionManager.getPendingProcessingSessions();
|
|
1377
|
-
}
|
|
1378
1552
|
// ── 连接所有渠道(后台首连,AUN/任意渠道故障不阻塞 daemon 主流程)──
|
|
1379
1553
|
trace.point('daemon.channelConnectDispatch');
|
|
1554
|
+
const channelConnectTimings = new Map(channelInstances.map(instance => {
|
|
1555
|
+
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1556
|
+
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1557
|
+
const channel = instance.adapter.channelKey;
|
|
1558
|
+
return [instance, trace.startTask('daemon.channelConnect', owner ? `aid=${owner.aid}; channel=${channel}` : channel, { initialPhase: 'waiting' })];
|
|
1559
|
+
}));
|
|
1380
1560
|
logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
|
|
1561
|
+
const backgroundConnections = new Set();
|
|
1381
1562
|
const connectOptions = {
|
|
1382
|
-
|
|
1383
|
-
// The shared queue already spaces control, Agent and external connections.
|
|
1384
|
-
intervalMs: 0,
|
|
1563
|
+
sharedAdmission: true,
|
|
1385
1564
|
beforeConnect: async (instance) => {
|
|
1386
1565
|
const owner = agentRegistry.resolveByChannel(instance.adapter.channelKey)
|
|
1387
1566
|
?? agentRegistry.resolveByChannel(instance.adapter.channelName);
|
|
1388
|
-
|
|
1389
|
-
|
|
1567
|
+
const timing = channelConnectTimings.get(instance);
|
|
1568
|
+
if (owner && instance.channelType === 'aun') {
|
|
1569
|
+
timing?.phase('waiting', 'Agent work classification');
|
|
1570
|
+
const priority = await agentWorkReady.get(owner.aid);
|
|
1571
|
+
if (priority === undefined) {
|
|
1572
|
+
if (startupCancelled)
|
|
1573
|
+
return false;
|
|
1574
|
+
throw new Error(`Work classification unavailable for ${owner.aid}`);
|
|
1575
|
+
}
|
|
1576
|
+
if (!priority)
|
|
1577
|
+
backgroundConnections.add(instance);
|
|
1578
|
+
}
|
|
1390
1579
|
// Transport and authenticated control messages do not require a model runner.
|
|
1391
|
-
|
|
1580
|
+
if (startupCancelled || owner?.status === 'disabled')
|
|
1581
|
+
return false;
|
|
1582
|
+
timing?.phase('queued', backgroundConnections.has(instance) ? 'idle connection admission' : 'priority connection admission');
|
|
1583
|
+
return true;
|
|
1392
1584
|
},
|
|
1393
1585
|
shouldConnect: (instance) => {
|
|
1394
1586
|
if (startupCancelled || !channelInstances.includes(instance))
|
|
@@ -1398,8 +1590,20 @@ async function main() {
|
|
|
1398
1590
|
return !owner || owner.status !== 'disabled';
|
|
1399
1591
|
},
|
|
1400
1592
|
onConnected: markChannelConnected,
|
|
1401
|
-
connect:
|
|
1593
|
+
connect: async (instance) => {
|
|
1594
|
+
const timing = channelConnectTimings.get(instance);
|
|
1595
|
+
try {
|
|
1596
|
+
const started = await connectionQueue.run(() => { timing.phase('running'); return instance.connect(); }, () => !startupCancelled && channelInstances.includes(instance) && !instance.lifecycle?.signal.aborted, backgroundConnections.has(instance) ? 'background' : 'foreground');
|
|
1597
|
+
timing(started ? 'ok' : 'cancelled');
|
|
1598
|
+
return started;
|
|
1599
|
+
}
|
|
1600
|
+
catch (error) {
|
|
1601
|
+
timing('failed');
|
|
1602
|
+
throw error;
|
|
1603
|
+
}
|
|
1604
|
+
},
|
|
1402
1605
|
onFailed: (inst, error) => {
|
|
1606
|
+
channelConnectTimings.get(inst)?.('failed');
|
|
1403
1607
|
logger.warn(`[startup] ${inst.adapter.channelName} initial connect failed: ${error}`);
|
|
1404
1608
|
},
|
|
1405
1609
|
};
|
|
@@ -1412,23 +1616,50 @@ async function main() {
|
|
|
1412
1616
|
// Partition outside connectAll's workers so a deferred channel cannot hold
|
|
1413
1617
|
// a slot required by a recovering Agent. All groups share actual admission.
|
|
1414
1618
|
const connectAfter = async (instances, gate) => {
|
|
1415
|
-
|
|
1416
|
-
|
|
1417
|
-
|
|
1418
|
-
|
|
1419
|
-
|
|
1619
|
+
try {
|
|
1620
|
+
if (gate) {
|
|
1621
|
+
for (const instance of instances)
|
|
1622
|
+
channelConnectTimings.get(instance)?.phase('waiting', gate === priorityStartupGate ? 'priority Ready' : 'normal Ready');
|
|
1623
|
+
await gate.promise;
|
|
1624
|
+
}
|
|
1625
|
+
if (startupCancelled)
|
|
1626
|
+
return [];
|
|
1627
|
+
return await channelLoader.connectAll(instances, connectOptions);
|
|
1628
|
+
}
|
|
1629
|
+
finally {
|
|
1630
|
+
for (const instance of instances)
|
|
1631
|
+
channelConnectTimings.get(instance)?.(startupCancelled ? 'cancelled' : 'skipped');
|
|
1632
|
+
}
|
|
1420
1633
|
};
|
|
1421
1634
|
const aunInstances = channelInstances.filter(inst => inst.channelType === 'aun');
|
|
1422
1635
|
const externalInstances = channelInstances.filter(inst => inst.channelType !== 'aun');
|
|
1423
|
-
const
|
|
1424
|
-
|
|
1425
|
-
|
|
1426
|
-
|
|
1636
|
+
const finishConnections = trace.startTask('daemon.channelConnectionsReady', `aun=${aunInstances.length}; other=${externalInstances.length}; control AUN tracked separately`, { summary: true });
|
|
1637
|
+
const aunConnections = connectAfter(aunInstances);
|
|
1638
|
+
void aunConnections.catch(() => { });
|
|
1639
|
+
// Agent AUN and Runner admission can progress as each scan finishes.
|
|
1640
|
+
// Cross-Agent channel routes and local recovery still need the complete plan.
|
|
1641
|
+
const startupWork = await startupWorkPromise.catch(error => {
|
|
1642
|
+
finishConnections('failed');
|
|
1643
|
+
for (const timing of channelConnectTimings.values())
|
|
1644
|
+
timing('failed');
|
|
1645
|
+
throw error;
|
|
1646
|
+
});
|
|
1647
|
+
if (startupCancelled) {
|
|
1648
|
+
finishConnections('cancelled');
|
|
1649
|
+
return;
|
|
1650
|
+
}
|
|
1651
|
+
if (startupWork.sessionScanFailed) {
|
|
1652
|
+
// Exceptional compatibility fallback; healthy starts reuse asynchronous discovery.
|
|
1653
|
+
startupWork.pendingSessions = sessionManager.getPendingProcessingSessions();
|
|
1654
|
+
}
|
|
1427
1655
|
const externalConnections = Promise.all([
|
|
1428
1656
|
connectAfter(externalInstances.filter(isPriorityChannel)),
|
|
1429
1657
|
connectAfter(externalInstances.filter(inst => !isPriorityChannel(inst)), normalStartupGate),
|
|
1430
1658
|
]).then(groups => groups.flat());
|
|
1431
|
-
const connectAllPromise =
|
|
1659
|
+
const connectAllPromise = Promise.all([aunConnections, externalConnections]).then(groups => {
|
|
1660
|
+
finishConnections('ok');
|
|
1661
|
+
return groups.flat();
|
|
1662
|
+
}, error => { finishConnections('failed'); throw error; });
|
|
1432
1663
|
connectAllPromise.then((connected) => {
|
|
1433
1664
|
const channelSummary = summarizeConnectedChannels(connected);
|
|
1434
1665
|
logger.info(`✅ ${connected.length} channel(s) connected: ${channelSummary}`);
|
|
@@ -1445,19 +1676,24 @@ async function main() {
|
|
|
1445
1676
|
void trace.track('daemon.triggerSchedulersReady', () => new Promise(resolve => setImmediate(resolve)).then(() => {
|
|
1446
1677
|
const owners = [
|
|
1447
1678
|
{ aid: daemonTriggerOwner.aid, start: ensureDaemonTriggerSchedulerStarted },
|
|
1448
|
-
...triggerStartupAgents.map(agent => ({ aid: agent.aid, start: () => ensureTriggerSchedulerStarted(agent) })),
|
|
1679
|
+
...triggerStartupAgents.map(agent => ({ aid: agent.aid, start: (phase) => ensureTriggerSchedulerStarted(agent, phase) })),
|
|
1449
1680
|
];
|
|
1450
1681
|
for (const owner of owners) {
|
|
1451
|
-
const starting = trace.track('daemon.triggerSchedulerReady', async () => {
|
|
1452
|
-
if (!startupWork.triggerAids.has(owner.aid)
|
|
1453
|
-
|
|
1682
|
+
const starting = trace.track('daemon.triggerSchedulerReady', async (phase) => {
|
|
1683
|
+
if (!startupWork.triggerAids.has(owner.aid)) {
|
|
1684
|
+
phase('waiting', 'normal Ready');
|
|
1685
|
+
if (!await waitForBackgroundStartup())
|
|
1686
|
+
return false;
|
|
1687
|
+
}
|
|
1454
1688
|
if (startupCancelled)
|
|
1455
|
-
return;
|
|
1456
|
-
await owner.start();
|
|
1689
|
+
return false;
|
|
1690
|
+
await owner.start(phase);
|
|
1691
|
+
if (startupCancelled)
|
|
1692
|
+
return false;
|
|
1457
1693
|
if (triggerSchedulers.get(owner.aid))
|
|
1458
1694
|
startupTriggerReady.add(owner.aid);
|
|
1459
1695
|
checkStartupTaskReady();
|
|
1460
|
-
}, owner.aid).catch(e => {
|
|
1696
|
+
}, owner.aid, { initialPhase: 'waiting' }).then(() => { }).catch(e => {
|
|
1461
1697
|
startupTriggerFailed.add(owner.aid);
|
|
1462
1698
|
logger.warn(`[startup] trigger scheduler start failed for ${owner.aid}: ${e}`);
|
|
1463
1699
|
checkStartupTaskReady();
|
|
@@ -1469,8 +1705,30 @@ async function main() {
|
|
|
1469
1705
|
// activate() 早于这里执行,那时列表还是空的。
|
|
1470
1706
|
sessionIdleMonitor.refreshTriggerIdentities();
|
|
1471
1707
|
});
|
|
1472
|
-
}));
|
|
1473
|
-
|
|
1708
|
+
}), undefined, { summary: true });
|
|
1709
|
+
void trace.track('daemon.sessionIdleRestoreComplete', async (phase) => {
|
|
1710
|
+
let admitted = true;
|
|
1711
|
+
sessionIdleRestoreState = 'restoring';
|
|
1712
|
+
await sessionIdleMonitor.activate({
|
|
1713
|
+
waitForBackground: async () => {
|
|
1714
|
+
sessionIdleRestoreState = 'waiting';
|
|
1715
|
+
phase('waiting', 'normal Ready');
|
|
1716
|
+
admitted = await taskReadyGate.promise === 'ready' && !startupCancelled;
|
|
1717
|
+
if (admitted) {
|
|
1718
|
+
sessionIdleRestoreState = 'restoring';
|
|
1719
|
+
phase('running');
|
|
1720
|
+
}
|
|
1721
|
+
return admitted;
|
|
1722
|
+
},
|
|
1723
|
+
onRestored: (group, from, to, count) => {
|
|
1724
|
+
trace.addSpan(`daemon.sessionIdleRestore.${group}`, from, to, `sessions=${count}`, count ? 'ok' : 'skipped');
|
|
1725
|
+
trace.setMeta(`sessionIdleRestore.${group}`, String(count));
|
|
1726
|
+
},
|
|
1727
|
+
});
|
|
1728
|
+
sessionIdleRestoreState = startupCancelled || !admitted ? 'cancelled' : 'ready';
|
|
1729
|
+
if (sessionIdleRestoreState === 'cancelled')
|
|
1730
|
+
return false;
|
|
1731
|
+
}, undefined, { summary: true }).catch(error => logger.warn(`[startup] session idle restore failed: ${error}`));
|
|
1474
1732
|
relationIdleMonitor.start();
|
|
1475
1733
|
// 首轮 SDK 自动生成的会话名必须走与 `ec thread rename` 相同的出口:
|
|
1476
1734
|
// 更新话题索引、落盘并给对端发 `topic.renamed`。只调 `renameSession` 的话,
|
|
@@ -1508,76 +1766,103 @@ async function main() {
|
|
|
1508
1766
|
});
|
|
1509
1767
|
// 统一 channel:health 跨通道通知(仅 auth_error)
|
|
1510
1768
|
registerChannelHealthNotifications({ eventBus, channelInstances, agentRegistry });
|
|
1511
|
-
//
|
|
1512
|
-
|
|
1513
|
-
|
|
1514
|
-
|
|
1515
|
-
|
|
1516
|
-
|
|
1517
|
-
|
|
1518
|
-
|
|
1519
|
-
|
|
1520
|
-
|
|
1521
|
-
|
|
1522
|
-
|
|
1523
|
-
|
|
1524
|
-
|
|
1525
|
-
|
|
1526
|
-
|
|
1527
|
-
|
|
1528
|
-
|
|
1529
|
-
|
|
1530
|
-
|
|
1531
|
-
|
|
1532
|
-
|
|
1533
|
-
|
|
1534
|
-
|
|
1535
|
-
|
|
1536
|
-
|
|
1537
|
-
|
|
1538
|
-
|
|
1539
|
-
|
|
1540
|
-
|
|
1541
|
-
|
|
1769
|
+
// Observer hints retain foreground precedence. Handoff history is scanned
|
|
1770
|
+
// only after actual task Ready and protects only its affected sessions.
|
|
1771
|
+
void trace.track('daemon.observerHintsComplete', () => recoverStartupObserverHints({
|
|
1772
|
+
channelInstances,
|
|
1773
|
+
recoveryAids: triggerStartupAgents.map(agent => agent.aid),
|
|
1774
|
+
agentRegistry,
|
|
1775
|
+
queuePendingObserverHints: (aid, channelKey) => queuePendingObserverHints(aid, channelKey, startupWork.hintDirectories.get(aid)),
|
|
1776
|
+
startupObserverRecoveries, trace,
|
|
1777
|
+
setStartupRecoveryPending: value => { startupRecoveryPending = value; },
|
|
1778
|
+
onAgentHintsRecovered: aid => {
|
|
1779
|
+
startupWork.hintDirectories.delete(aid);
|
|
1780
|
+
startupHintsReady.add(aid);
|
|
1781
|
+
messageQueue.startRestored();
|
|
1782
|
+
checkStartupTaskReady();
|
|
1783
|
+
},
|
|
1784
|
+
beforeAgentRecovery: async (aid) => {
|
|
1785
|
+
if (!startupWork.priorityAids.has(aid))
|
|
1786
|
+
await priorityStartupGate.promise;
|
|
1787
|
+
},
|
|
1788
|
+
isCancelled: () => startupCancelled,
|
|
1789
|
+
}), undefined, { summary: true })
|
|
1790
|
+
.catch(error => logger.error('[startup] observer hint registration failed:', error));
|
|
1791
|
+
void trace.track('daemon.handoffRecoveryComplete', async (phase) => {
|
|
1792
|
+
phase('waiting', 'normal Ready');
|
|
1793
|
+
let admitted = false;
|
|
1794
|
+
await startupHandoffRecovery.run(async () => {
|
|
1795
|
+
admitted = await taskReadyGate.promise === 'ready' && !startupCancelled;
|
|
1796
|
+
if (admitted) {
|
|
1797
|
+
phase('running');
|
|
1798
|
+
trace.point('daemon.handoffRecovery');
|
|
1799
|
+
}
|
|
1800
|
+
return admitted;
|
|
1542
1801
|
});
|
|
1543
|
-
|
|
1544
|
-
|
|
1545
|
-
|
|
1802
|
+
if (!admitted || startupCancelled)
|
|
1803
|
+
return false;
|
|
1804
|
+
}, undefined, { summary: true, initialPhase: 'waiting' })
|
|
1805
|
+
.catch(error => logger.error('[Handoff] background recovery coordinator failed:', error));
|
|
1546
1806
|
trace.point('daemon.resumeSessions');
|
|
1547
|
-
|
|
1807
|
+
const settleSessionRecovery = trace.startTask('daemon.resumeSessionsComplete', `sessions=${startupWork.pendingSessions.length}`, { summary: true });
|
|
1808
|
+
if (!startupWork.pendingSessions.length)
|
|
1809
|
+
settleSessionRecovery('skipped');
|
|
1810
|
+
void (async () => {
|
|
1548
1811
|
// Scheduler dispatch registers its promises in the next I/O turn.
|
|
1549
1812
|
await new Promise(resolve => setImmediate(resolve));
|
|
1550
1813
|
await Promise.all(startupAgents.map(async (agent) => {
|
|
1551
1814
|
const pendingSessions = startupWork.pendingSessions.filter(session => (session.selfAID || agentRegistry.resolveByChannel(session.channel)?.aid) === agent.aid);
|
|
1552
|
-
|
|
1553
|
-
|
|
1554
|
-
|
|
1555
|
-
|
|
1815
|
+
if (!pendingSessions.length) {
|
|
1816
|
+
if (!startupCancelled)
|
|
1817
|
+
startupSessionsReady.add(agent.aid);
|
|
1818
|
+
checkStartupTaskReady();
|
|
1819
|
+
return;
|
|
1556
1820
|
}
|
|
1557
|
-
|
|
1821
|
+
await trace.track('daemon.resumeSessionsAgent', async (phase) => {
|
|
1822
|
+
// Restore only the backends these sessions actually bind to.
|
|
1823
|
+
phase('waiting', 'session Runner');
|
|
1558
1824
|
await startupRunnerReady.get(agent.aid);
|
|
1559
|
-
|
|
1560
|
-
|
|
1561
|
-
|
|
1562
|
-
|
|
1563
|
-
|
|
1564
|
-
|
|
1565
|
-
|
|
1566
|
-
|
|
1825
|
+
await Promise.all([...new Set(pendingSessions.map(session => session.baseagent).filter(Boolean))]
|
|
1826
|
+
.map(baseagent => runnerDemand.ensure(agent.aid, baseagent)));
|
|
1827
|
+
if (startupWork.triggerAids.has(agent.aid)) {
|
|
1828
|
+
phase('waiting', 'unfinished Trigger recovery');
|
|
1829
|
+
await startupTriggerPromises.get(agent.aid);
|
|
1830
|
+
}
|
|
1831
|
+
if (startupCancelled)
|
|
1832
|
+
return false;
|
|
1833
|
+
phase('running');
|
|
1834
|
+
resumePendingSessions({ sessionManager, messageQueue, droppedTriggerSessionIds, agentRegistry, agentMap,
|
|
1835
|
+
pendingSessions });
|
|
1836
|
+
startupSessionsReady.add(agent.aid);
|
|
1837
|
+
checkStartupTaskReady();
|
|
1838
|
+
}, `aid=${agent.aid}; sessions=${pendingSessions.length}`, { initialPhase: 'waiting' });
|
|
1567
1839
|
}));
|
|
1568
|
-
|
|
1569
|
-
|
|
1840
|
+
settleSessionRecovery(startupCancelled ? 'cancelled' : 'ok');
|
|
1841
|
+
})().catch(error => {
|
|
1842
|
+
settleSessionRecovery('failed');
|
|
1843
|
+
logger.error(`[Resume] startup runner gate failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
1844
|
+
});
|
|
1845
|
+
// Maintenance has its own lifecycle; its Ready wait is not session recovery.
|
|
1846
|
+
if (startupWork.staleSessions.length) {
|
|
1847
|
+
void trace.track('daemon.staleSessionCleanup', async (phase) => {
|
|
1848
|
+
phase('waiting', 'normal Ready');
|
|
1849
|
+
if (!await waitForBackgroundStartup())
|
|
1850
|
+
return false;
|
|
1851
|
+
phase('running');
|
|
1570
1852
|
for (const session of startupWork.staleSessions) {
|
|
1853
|
+
if (startupCancelled)
|
|
1854
|
+
return false;
|
|
1571
1855
|
const current = await sessionManager.getSessionById(session.id);
|
|
1572
1856
|
if (current?.processingState === session.processingState)
|
|
1573
1857
|
sessionManager.clearProcessing(session.id);
|
|
1574
1858
|
}
|
|
1575
|
-
}
|
|
1576
|
-
|
|
1577
|
-
|
|
1578
|
-
//
|
|
1859
|
+
}, `sessions=${startupWork.staleSessions.length}`, { initialPhase: 'waiting' })
|
|
1860
|
+
.catch(error => logger.warn(`[Resume] stale session cleanup failed: ${error instanceof Error ? error.message : String(error)}`));
|
|
1861
|
+
}
|
|
1862
|
+
// Normal ready observes the same gates as task consumption. Unused backends
|
|
1863
|
+
// stay unloaded; service publication continues on its own lifecycle.
|
|
1579
1864
|
let taskReadinessSettled = false;
|
|
1580
|
-
const finishPriorityStartup = trace.startTask('daemon.priorityTaskReady');
|
|
1865
|
+
const finishPriorityStartup = trace.startTask('daemon.priorityTaskReady', undefined, { summary: true });
|
|
1581
1866
|
priorityStartupGate.releaseAfter(9_000, () => {
|
|
1582
1867
|
logger.warn('[startup] Priority recovery still pending after 9s; admitting idle Agents and ECWeb without reporting Ready');
|
|
1583
1868
|
});
|
|
@@ -1592,7 +1877,8 @@ async function main() {
|
|
|
1592
1877
|
if (startupCancelled || taskReadinessSettled)
|
|
1593
1878
|
return;
|
|
1594
1879
|
const agentStates = startupAgents.filter(agent => agent.status !== 'disabled').map(agent => {
|
|
1595
|
-
const runnerReady = agentMap.has(`${agent.aid}::${agent.baseagent}`)
|
|
1880
|
+
const runnerReady = agentMap.has(`${agent.aid}::${agent.baseagent}`)
|
|
1881
|
+
|| (deferredStartupRunners.has(agent.aid) && agent.status === 'running');
|
|
1596
1882
|
const aun = channelInstancesByAgent.get(agent.aid)?.find(instance => instance.channelType === 'aun');
|
|
1597
1883
|
return { aid: agent.aid,
|
|
1598
1884
|
runnerReady,
|
|
@@ -1695,8 +1981,10 @@ async function main() {
|
|
|
1695
1981
|
channelLoader,
|
|
1696
1982
|
channelInstances,
|
|
1697
1983
|
startupRunners: Promise.allSettled([startupRunnersPromise, startupAgentRuntimePromise]),
|
|
1984
|
+
waitForRunnerLoads: runnerDemand.waitForIdle,
|
|
1698
1985
|
cancelStartup: () => {
|
|
1699
1986
|
startupCancelled = true;
|
|
1987
|
+
cancelStartupClassification();
|
|
1700
1988
|
priorityStartupGate.settle('cancelled');
|
|
1701
1989
|
normalStartupGate.settle('cancelled');
|
|
1702
1990
|
taskReadyGate.settle('cancelled');
|
|
@@ -1707,6 +1995,7 @@ async function main() {
|
|
|
1707
1995
|
schedulerQueue.stop();
|
|
1708
1996
|
channelConnectionRuntime?.stop();
|
|
1709
1997
|
for (const aid of startupRunnerReady.keys()) {
|
|
1998
|
+
startupRunnerTraces.get(aid)?.('cancelled');
|
|
1710
1999
|
startupRunnerReadyResolvers.get(aid)?.([]);
|
|
1711
2000
|
startupOperationReadyResolvers.get(aid)?.([]);
|
|
1712
2001
|
}
|