evolcore 0.0.48 → 0.0.50
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 +97 -0
- package/bin/ecmsg.js +9 -4
- package/dist/ability/caller/authorization.js +21 -0
- package/dist/ability/caller/command.js +164 -0
- package/dist/ability/caller/contract.js +102 -0
- package/dist/ability/caller/daemon.js +158 -0
- package/dist/ability/caller/service.js +380 -0
- package/dist/ability/command-contract.js +5 -0
- package/dist/ability/daemon.js +5 -1
- package/dist/ability/interop-v1.js +10 -3
- package/dist/ability/management.js +1 -0
- package/dist/agent-template/jobs.js +173 -1
- package/dist/agent-template/runtime.js +285 -8
- package/dist/agent-template/service.js +1159 -40
- package/dist/agent-template/types.js +2 -1
- package/dist/agents/baseagent-availability.js +27 -3
- package/dist/agents/baseagent-capability-adapter.js +102 -0
- package/dist/agents/baseagent-plugin-descriptor.js +274 -0
- package/dist/agents/baseagent-plugin-loader.js +145 -0
- package/dist/agents/baseagent.js +68 -2
- package/dist/agents/claude-gateway/agent-registration.js +389 -0
- package/dist/agents/claude-gateway/binding.js +96 -0
- package/dist/agents/claude-gateway/inbox.js +138 -0
- package/dist/agents/claude-gateway/index.js +125 -0
- package/dist/agents/claude-gateway/listing.js +330 -0
- package/dist/agents/claude-gateway/router.js +328 -0
- package/dist/agents/claude-gateway/sessions.js +128 -0
- package/dist/agents/claude-gateway/terminal.js +250 -0
- package/dist/agents/claude-gateway/transcript.js +272 -0
- package/dist/agents/claude-gateway/types.js +14 -0
- package/dist/agents/claude-runner.js +6 -10
- package/dist/agents/codex-runner.js +9 -2
- package/dist/agents/{gemini-runner.js → gemini/gemini-runner.js} +17 -17
- package/dist/{core/session/adapters → agents/gemini}/gemini-session-file-adapter.js +2 -2
- package/dist/agents/gemini/index.js +51 -0
- package/dist/aun/aid/control-aid.js +52 -32
- package/dist/aun/group/invite-service.js +6 -36
- package/dist/aun/group/operations.js +6 -0
- package/dist/aun/msg/mention-schema.js +1 -1
- package/dist/aun/msg/p2p.js +31 -2
- package/dist/aun/msg/upload.js +126 -3
- package/dist/build-identity.json +1 -1
- package/dist/channels/aun.js +1175 -457
- package/dist/cli/ability-command.js +42 -0
- package/dist/cli/agent-command.js +20 -1
- package/dist/cli/agent-create.js +78 -18
- package/dist/cli/agent-template.js +5 -3
- package/dist/cli/agent.js +91 -0
- package/dist/cli/aun-commands.js +92 -34
- package/dist/cli/bench.js +5 -2
- package/dist/cli/config.js +22 -6
- package/dist/cli/daemon-commands.js +245 -101
- package/dist/cli/directory.js +6 -1
- package/dist/cli/ecmsg-gateway.js +11 -9
- package/dist/cli/index.js +30 -5
- package/dist/cli/init.js +39 -63
- package/dist/cli/managed-command-guard.js +3 -0
- package/dist/cli/menu-client.js +32 -7
- package/dist/cli/model.js +20 -5
- package/dist/cli/pay-command.js +30 -0
- package/dist/cli/provider-command.js +6 -2
- package/dist/cli/quota.js +89 -0
- package/dist/cli/restart-monitor.js +2 -2
- package/dist/cli/role.js +1 -0
- package/dist/cli/services-command.js +12 -9
- package/dist/cli/team-workspace-command.js +56 -2
- package/dist/cli/thread-command.js +78 -12
- package/dist/config/access-policy.js +16 -3
- package/dist/config/config-field-policy.js +88 -9
- package/dist/config/config-manager.js +97 -47
- package/dist/config/config-operation-service.js +22 -1
- package/dist/config/gateway-config.js +9 -8
- package/dist/config/owner-config.js +0 -16
- package/dist/config/peer-role-resolver.js +1 -7
- package/dist/config/providers-config.js +107 -20
- package/dist/config/providers-management.js +45 -21
- package/dist/config/resolved-config-op.js +4 -44
- package/dist/config/schema-migration.js +78 -5
- package/dist/config/schema-registry.js +52 -7
- package/dist/config-store.js +1309 -17
- package/dist/core/agent-application-service.js +220 -1
- package/dist/core/agent-ipc-registration.js +19 -2
- package/dist/core/agent-reload-coordinator.js +5 -0
- package/dist/core/agent-runtime.js +198 -54
- package/dist/core/auth/agent-delegation.js +14 -0
- package/dist/core/auth/delegation-authorization.js +33 -26
- package/dist/core/auth/operation-authorizer.js +16 -1
- package/dist/core/auth/operation-catalog.js +59 -7
- package/dist/core/baseagent-loader.js +30 -3
- package/dist/core/capability/capability-manager.js +16 -7
- package/dist/core/channel-runtime.js +4 -2
- package/dist/core/command/agent-control.js +20 -2
- package/dist/core/command/agent-template-menu.js +4 -3
- package/dist/core/command/cli-intent-parser.js +28 -0
- package/dist/core/command/command-handler.js +45 -2
- package/dist/core/command/menu-catalog.js +20 -4
- package/dist/core/command/menu-file-path.js +70 -0
- package/dist/core/command/menu-handler.js +97 -73
- package/dist/core/command/menu-protocol.js +29 -0
- package/dist/core/command/menu-query-batch.js +2 -2
- package/dist/core/command/private-mention-menu.js +71 -0
- package/dist/core/command/remote-shell.js +565 -0
- package/dist/core/command/slash-handler.js +17 -26
- package/dist/core/command/team-workspace-bootstrap.js +2 -1
- package/dist/core/command/topic-slash.js +7 -1
- package/dist/core/daemon-bootstrap.js +0 -4
- package/dist/core/daemon-control.js +58 -1
- package/dist/core/daemon-lifecycle.js +29 -7
- package/dist/core/evolagent-registry.js +18 -9
- package/dist/core/handoff/runtime.js +1 -1
- package/dist/core/host-snapshot.js +8 -3
- package/dist/core/initialization/service.js +3 -0
- package/dist/core/interaction-router.js +130 -0
- package/dist/core/ipc-registration.js +5 -0
- package/dist/core/memory/consolidation-context.js +2 -1
- package/dist/core/memory/consolidation.js +35 -64
- package/dist/core/message/aun-ipc-sender.js +213 -74
- package/dist/core/message/aun-request-registry.js +31 -0
- package/dist/core/message/contact-admission.js +91 -6
- package/dist/core/message/contact-pending-inbound.js +113 -0
- package/dist/core/message/contact-thread-approval.js +212 -0
- package/dist/core/message/im-renderer.js +40 -1
- package/dist/core/message/message-admission.js +5 -39
- package/dist/core/message/message-bridge.js +197 -45
- package/dist/core/message/message-log.js +32 -0
- package/dist/core/message/message-queue.js +102 -18
- package/dist/core/message/peer-mode.js +15 -4
- package/dist/core/message/response-engine.js +174 -26
- package/dist/core/message/send-options.js +37 -3
- package/dist/core/message/send-routing.js +11 -7
- package/dist/core/model/config-scope.js +6 -14
- package/dist/core/model/model-catalog.js +5 -5
- package/dist/core/model/model-diagnostics.js +19 -0
- package/dist/core/model/model-fallback.js +13 -2
- package/dist/core/ownership/owner-resolver.js +12 -86
- package/dist/core/pack-auth.js +7 -0
- package/dist/core/pack-install.js +1 -1
- package/dist/core/permission/ec-command-parser.js +288 -77
- package/dist/core/permission/protected-paths.js +64 -9
- package/dist/core/permission/services-path-acl.js +458 -0
- package/dist/core/permission/tool-policy.js +26 -10
- package/dist/core/relation/peer-identity.js +13 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +6 -2
- package/dist/core/session/adapters/codex-session-file-adapter.js +4 -0
- package/dist/core/session/session-manager.js +47 -10
- package/dist/core/session/session-mapper.js +16 -0
- package/dist/core/skill/index-generator.js +2 -3
- package/dist/core/skill/switch-resolver.js +3 -0
- package/dist/core/task/task-recovery-service.js +1 -0
- package/dist/core/thread/command-parser.js +4 -1
- package/dist/core/thread/ipc-operation.js +4 -2
- package/dist/core/thread/thread-operation.js +25 -10
- package/dist/core/thread/thread-service.js +294 -55
- package/dist/core/thread/topic-id.js +67 -2
- package/dist/core/thread/types.js +15 -1
- package/dist/directory/owner-directory-admission.js +11 -8
- package/dist/directory/owner-directory-cache.js +19 -0
- package/dist/directory/owner-directory-markdown.js +1 -1
- package/dist/directory/owner-directory-policy.js +5 -30
- package/dist/directory/owner-directory-request-operation.js +5 -2
- package/dist/eck/kit-renderer.js +3 -2
- package/dist/eck/message-renderer.js +28 -5
- package/dist/ecweb/basic-settings-service.js +5 -9
- package/dist/ecweb/providers-service.js +4 -2
- package/dist/ecweb/runtime/supervisor.js +36 -8
- package/dist/event-center/center-config.js +9 -5
- package/dist/event-center/dispatcher.js +10 -1
- package/dist/event-center/ipc-operation.js +19 -0
- package/dist/event-center/registry.js +20 -5
- package/dist/event-center/runtime.js +10 -7
- package/dist/index.js +120 -41
- package/dist/ipc.js +83 -3
- package/dist/outputs/authorization.js +16 -0
- package/dist/outputs/cards.js +336 -0
- package/dist/outputs/events.js +3 -2
- package/dist/outputs/protocol.js +1 -0
- package/dist/outputs/service.js +2 -15
- package/dist/paths.js +48 -1
- package/dist/pay/command.js +38 -0
- package/dist/pay/protocol.js +136 -0
- package/dist/pay/runtime.js +188 -0
- package/dist/pay/service.js +384 -0
- package/dist/pay/store.js +81 -0
- package/dist/response-system/engines/v1/proactive-flow.js +29 -2
- package/dist/services/dispatcher.js +23 -5
- package/dist/services/host/main.js +388 -0
- package/dist/services/host/protocol.js +118 -0
- package/dist/services/host/resident.js +310 -0
- package/dist/services/host-client.js +386 -0
- package/dist/services/host-deploy.js +180 -0
- package/dist/services/host-launch.js +117 -0
- package/dist/services/host-recycle.js +203 -0
- package/dist/services/host-runtime.js +802 -0
- package/dist/services/idempotency.js +44 -86
- package/dist/services/index-generator.js +4 -3
- package/dist/services/index.js +204 -22
- package/dist/services/ipc-operation.js +288 -44
- package/dist/services/pack-manager.js +1 -0
- package/dist/services/script-runner.js +515 -83
- package/dist/services/service-payload.js +13 -7
- package/dist/services/validation.js +109 -4
- package/dist/stats/budget.js +1 -1
- package/dist/stats/model-resolver.js +2 -2
- package/dist/stats/quota-query.js +95 -0
- package/dist/trigger/application-service.js +6 -4
- package/dist/trigger/local-files.js +19 -9
- package/dist/trigger/scheduler.js +22 -12
- package/dist/trigger/script-sandbox.js +51 -8
- package/dist/utils/aid-bind.js +3 -0
- package/dist/utils/atomic-write.js +22 -8
- package/dist/utils/evolcore-version.js +2 -2
- package/dist/utils/host-info.js +173 -1
- package/dist/utils/logger.js +2 -2
- package/dist/utils/media-cache.js +190 -43
- package/dist/utils/npm-ops.js +43 -8
- package/dist/utils/restart-safety.js +14 -1
- package/dist/utils/system-memory.js +113 -25
- package/dist/utils/systemd-lifecycle.js +154 -0
- package/dist/utils/windows-shell-trust.js +7 -3
- package/dist/workbench/service.js +1 -1
- package/kits/docs/INDEX.md +3 -2
- 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 +1 -0
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/evolcore/INDEX.md +9 -6
- package/kits/docs/evolcore/agent.md +36 -1
- package/kits/docs/evolcore/aid.md +45 -3
- package/kits/docs/evolcore/config.md +5 -2
- package/kits/docs/evolcore/directory.md +8 -9
- package/kits/docs/evolcore/group.md +2 -1
- package/kits/docs/evolcore/memory-tags.md +2 -0
- package/kits/docs/evolcore/menu-client.md +3 -3
- package/kits/docs/evolcore/menu-protocol.md +7 -0
- package/kits/docs/evolcore/model.md +3 -0
- package/kits/docs/evolcore/msg.md +77 -10
- package/kits/docs/evolcore/pay.md +34 -0
- package/kits/docs/evolcore/provider.md +22 -1
- package/kits/docs/evolcore/quota.md +54 -0
- package/kits/docs/evolcore/role.md +3 -0
- package/kits/docs/evolcore/services.md +46 -18
- package/kits/docs/evolcore/stats.md +2 -0
- package/kits/docs/evolcore/thread-chain.md +2 -0
- package/kits/docs/evolcore/tool-authorization.md +10 -0
- package/kits/docs/evolcore/trigger.md +2 -0
- package/kits/rules/01-overview.md +11 -32
- package/kits/rules/02-navigation.md +7 -0
- package/kits/rules/06-channel.md +3 -3
- package/kits/schemas/_meta.json +38 -5
- package/kits/schemas/agent-config.schema.20.json +24 -0
- package/kits/schemas/agent-config.schema.21.json +974 -0
- package/kits/schemas/agent-config.schema.22.json +977 -0
- package/kits/schemas/agent-config.schema.23.json +958 -0
- package/kits/schemas/daemon.schema.10.json +373 -0
- package/kits/schemas/daemon.schema.9.json +12 -0
- package/kits/schemas/defaults.schema.7.json +472 -0
- package/kits/schemas/providers.schema.3.json +18 -2
- package/kits/schemas/relation-config.schema.13.json +289 -0
- package/kits/skills/.switches.json +17 -1
- package/kits/skills/ability/SKILL.md +229 -34
- package/kits/skills/ability/STRUCTURE.md +333 -0
- package/kits/skills/ability/references/cli.md +208 -0
- package/kits/skills/ability/references/development.md +107 -37
- package/kits/skills/ability/references/management.md +106 -46
- package/kits/skills/ability/references/runtime-protocol.md +65 -63
- package/kits/skills/agent-output-cards/SKILL.md +64 -0
- package/kits/skills/ec-group/SKILL.md +8 -6
- package/kits/skills/ec-group/TASK.md +186 -0
- package/kits/skills/ec-group/WORKLOG.md +180 -0
- package/kits/skills/ec-group-collaboration/SKILL.md +3 -3
- package/kits/skills/ec-pay/SKILL.md +101 -0
- package/kits/skills/ec-pay/references/pay-cli.md +110 -0
- package/kits/skills/ec-provider/SKILL.md +58 -9
- package/kits/skills/{ec-service-proxy → ec-proxy}/SKILL.md +8 -5
- package/kits/skills/ec-service-call/SKILL.md +135 -0
- package/kits/skills/ec-service-pack/SKILL.md +277 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/templates/memory-consolidation/notes.md +2 -2
- package/kits/templates/memory-consolidation/workflow.md +46 -0
- package/kits/templates/roles/visitor.json +1 -0
- package/kits/templates/system-fragments/channel.md +13 -4
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/directory-contacts.md +3 -4
- package/kits/templates/system-fragments/reply.md +1 -0
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +27 -128
- package/kits/templates/system-fragments/venue.md +27 -0
- package/package.json +4 -5
- package/scripts/agent-template/inspect.mjs +79 -29
- package/scripts/agent-template/overlay.mjs +20 -2
- package/scripts/agent-template/shared/common.mjs +24 -6
- package/scripts/agent-template/shared/team-schema.json +23 -5
- package/scripts/agent-template/shared/template-contract.mjs +107 -17
- package/scripts/agent-template/shared/template-package.mjs +254 -29
- package/scripts/agent-template/shared/template-runtime.mjs +145 -2
- package/scripts/agent-template/shared/template.mjs +67 -9
- package/scripts/agent-template/team-pack.mjs +132 -41
- package/scripts/agent-template/team-preview.mjs +249 -5
- package/kits/docs/aun/ABILITY_CALLING.md +0 -280
- package/kits/docs/evolcore/ability.md +0 -185
- package/kits/skills/ability/references/calling.md +0 -56
- package/kits/skills/ability/references/contract-checklist.md +0 -37
- package/kits/skills/ability/references/recovery.md +0 -27
- /package/dist/{core/capability/providers → agents/gemini}/gemini-capability-provider.js +0 -0
|
@@ -3,6 +3,7 @@ import path from 'path';
|
|
|
3
3
|
import { spawn, execFile } from 'child_process';
|
|
4
4
|
import { promisify } from 'util';
|
|
5
5
|
import readline from 'readline';
|
|
6
|
+
import crypto from 'crypto';
|
|
6
7
|
import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath, asModeOverridePath, daemonControlDir } from '../paths.js';
|
|
7
8
|
import { loadDefaults, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
|
|
8
9
|
import { resolveEffective } from '../config/config-manager.js';
|
|
@@ -27,7 +28,8 @@ import { getProcessStartTime, startTimeMatches } from '../utils/process-introspe
|
|
|
27
28
|
import { matchesEcwebInstanceHealth, parseEcwebInstanceRecord } from '../contracts/ecweb-instance.js';
|
|
28
29
|
import { AGENT_DELEGATION_TOKEN_ENV, hashCurrentDelegatedCommand, readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
29
30
|
import { CHANNEL_LOGS_ENV, MAIN_CLI_BIN, RESTART_REQUEST_ID_ENV, RUNTIME_HOME_ENV, TARGET_PACKAGE_ROOT_ENV, WEB_CLI_BIN, WEB_PACKAGE_NAME, } from '../product.js';
|
|
30
|
-
import { readRestartRequest, updateRestartRequest } from '../utils/restart-safety.js';
|
|
31
|
+
import { createRestartRequest, readRestartRequest, shouldSuppressRealRestart, updateRestartRequest } from '../utils/restart-safety.js';
|
|
32
|
+
import { discoverSystemdService, resumeSystemdRestart, submitSystemdRestart } from '../utils/systemd-lifecycle.js';
|
|
31
33
|
import { rotateStdoutLog } from '../utils/log-writer.js';
|
|
32
34
|
import { logLevelRank } from '../utils/logger.js';
|
|
33
35
|
import { inspectDataMigrationRequirement } from '../core/data-migration.js';
|
|
@@ -39,6 +41,36 @@ import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode, setEcwebEnabled }
|
|
|
39
41
|
import { checkCodexProjectPath, inspectCodexManagedHook, ensureCodexManagedHook, runCodexHookLaunchDiagnostic, } from '../agents/codex/diagnostics.js';
|
|
40
42
|
import { formatClaudeSandboxDependencies, formatCodexSandboxAvailability, inspectClaudeSandboxDependencies, inspectCodexSandboxAvailability, probeClaudeSandboxDependencies, probeCodexSandboxAvailability, } from '../core/permission/sandbox-runtime.js';
|
|
41
43
|
const execFileAsync = promisify(execFile);
|
|
44
|
+
/**
|
|
45
|
+
* 等待 daemon 写 ready signal 的上限。AUN 连接准入与 channel 实例创建都在 ready 之前,
|
|
46
|
+
* agent 数量多时(50+ 通道)冷启动会明显超过 30 秒,超时判定过紧会把已成功的启动报成失败。
|
|
47
|
+
* 到点后仍会先探一次 IPC,只有控制面也不可达才判失败。
|
|
48
|
+
*/
|
|
49
|
+
const READY_WAIT_TIMEOUT_MS = 36000;
|
|
50
|
+
/**
|
|
51
|
+
* 生命周期输出的颜色口语:状态词染色,次要信息降暗,其余不染色。
|
|
52
|
+
* 不使用背景色块和图标——terminal 里满幅反显最难读,图标在不同终端字体下宽度也不一致。
|
|
53
|
+
*/
|
|
54
|
+
const statusColorEnabled = () => !!process.stdout.isTTY && !process.env.NO_COLOR;
|
|
55
|
+
function makeStatusTheme() {
|
|
56
|
+
const on = statusColorEnabled();
|
|
57
|
+
const wrap = (code) => (text) => on ? `\x1b[${code}m${text}\x1b[0m` : text;
|
|
58
|
+
return {
|
|
59
|
+
bold: wrap('1'),
|
|
60
|
+
dim: wrap('2'),
|
|
61
|
+
green: wrap('32'),
|
|
62
|
+
yellow: wrap('33'),
|
|
63
|
+
red: wrap('31'),
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
/** `EvolCore v1.2.3 运行中` 这类标题行:产品名加粗,其余信息一律降暗,一个字都不染色。 */
|
|
67
|
+
function formatLifecycleHead(theme, version, state) {
|
|
68
|
+
return `${theme.bold('EvolCore')}${version ? ` ${theme.dim(`v${version}`)}` : ''}${state ? ` ${state}` : ''}`;
|
|
69
|
+
}
|
|
70
|
+
/** 状态词:正常绿、降级/进行中黄、失败或未运行红。 */
|
|
71
|
+
function formatStatusWord(theme, state, text) {
|
|
72
|
+
return state === 'ok' ? theme.green(text) : state === 'warn' ? theme.yellow(text) : theme.red(text);
|
|
73
|
+
}
|
|
42
74
|
export async function confirmCodexHookRebind(state, packageRoot) {
|
|
43
75
|
console.log('⚠️ Codex 受管 Hook 绑定的另一套 EvolCore/Node 路径仍存在,需确认是否切换:');
|
|
44
76
|
console.log(` 现有包: ${state.managedPackageRoot}`);
|
|
@@ -565,40 +597,34 @@ function printStartupInfo(opts = {}, asMode) {
|
|
|
565
597
|
}
|
|
566
598
|
catch { }
|
|
567
599
|
const ecwebVer = readEcwebPackageVersion();
|
|
568
|
-
const
|
|
569
|
-
const
|
|
600
|
+
const theme = makeStatusTheme();
|
|
601
|
+
const details = [
|
|
602
|
+
opts.pid ? `PID ${opts.pid}` : '',
|
|
570
603
|
ecwebVer ? `ec-web v${ecwebVer}` : '',
|
|
571
604
|
aunVer ? `fastaun v${aunVer}` : '',
|
|
572
605
|
].filter(Boolean);
|
|
573
|
-
const
|
|
574
|
-
const
|
|
575
|
-
const
|
|
576
|
-
|
|
577
|
-
console.log(useStatusColor ? `\x1b[42;97;1m ${versionLine} \x1b[0m` : versionLine);
|
|
578
|
-
console.log(` 包路径: ${pkgRoot}`);
|
|
579
|
-
console.log(` EVOLCORE_HOME: ${resolveRoot()}`);
|
|
606
|
+
const stateWord = opts.running ? formatStatusWord(theme, 'ok', '运行中') : '';
|
|
607
|
+
const head = formatLifecycleHead(theme, version, stateWord);
|
|
608
|
+
const detailLine = details.length > 0 ? ` ${theme.dim(details.join(' '))}` : '';
|
|
609
|
+
console.log(`${head}${detailLine}`);
|
|
580
610
|
const installType = isNpmInstall ? 'npm全局安装' : '开发仓(link)';
|
|
581
611
|
// asMode 只是"本次请求",是否生效要看 daemon 是否真的由这次启动拉起,标清楚别和实际模式混淆
|
|
582
612
|
const modeLine = describeRunMode(opts.runMode ?? asMode, !isNpmInstall);
|
|
583
613
|
const modeDetails = modeLine.replace(/^运行模式:\s*/, '');
|
|
584
|
-
if (opts.statusLayout) {
|
|
585
|
-
console.log(` 安装类型: ${installType} 运行模式: ${modeDetails}`);
|
|
586
|
-
}
|
|
587
|
-
else {
|
|
588
|
-
console.log(` 安装类型: ${installType}`);
|
|
589
|
-
console.log(` ${asMode && !opts.runMode ? `${modeLine}(--as-mode 请求)` : modeLine}`);
|
|
590
|
-
}
|
|
591
614
|
const cliExecution = cliRunsSource ? '源码(tsx)' : '编译产物(dist)';
|
|
592
615
|
const daemonExecution = daemonRunsDist ? '编译产物(dist)' : '未知';
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
616
|
+
// 两种调用口径共用同一套字段对齐,避免 ec status 与 ec start 的标签列宽各异
|
|
617
|
+
const fields = [
|
|
618
|
+
['包路径', pkgRoot],
|
|
619
|
+
['EVOLCORE_HOME', resolveRoot()],
|
|
620
|
+
['安装类型', installType],
|
|
621
|
+
['运行模式', asMode && !opts.runMode ? `${modeDetails}(--as-mode 请求)` : modeDetails],
|
|
622
|
+
['CLI 执行', cliExecution],
|
|
623
|
+
['Daemon 执行', daemonExecution],
|
|
624
|
+
];
|
|
600
625
|
if (!opts.statusLayout)
|
|
601
|
-
|
|
626
|
+
fields.push(['代码最新修改', latestMtime ? formatLocalTime(latestMtime) : '?']);
|
|
627
|
+
renderStatusFields(fields);
|
|
602
628
|
}
|
|
603
629
|
export async function cmdStart(opts = {}) {
|
|
604
630
|
// Measure from process start so the reported time includes CLI bootstrap
|
|
@@ -607,6 +633,7 @@ export async function cmdStart(opts = {}) {
|
|
|
607
633
|
// 启动甘特图埋点:第一个阶段到 mark 之前都算 CLI bootstrap(tsx 编译/模块加载)。
|
|
608
634
|
const trace = new StartupTracer('cli', { firstPhase: 'cli.bootstrap' });
|
|
609
635
|
const traceId = trace.id;
|
|
636
|
+
const theme = makeStatusTheme();
|
|
610
637
|
printStartupInfo(undefined, opts.asMode);
|
|
611
638
|
const p = resolvePaths();
|
|
612
639
|
trace.mark('cli.probeExistingDaemon');
|
|
@@ -641,7 +668,11 @@ export async function cmdStart(opts = {}) {
|
|
|
641
668
|
// A stopped container may miss the daily upgrade trigger. Check once on
|
|
642
669
|
// every real start so the service does not stay on an old installation.
|
|
643
670
|
trace.mark('cli.autoUpgradeCheck');
|
|
644
|
-
const
|
|
671
|
+
const pendingRestartFile = path.join(daemonControlDir(), 'restart-pending.json');
|
|
672
|
+
const systemdRestart = opts.foreground ? await resumeSystemdRestart(pendingRestartFile) : null;
|
|
673
|
+
// systemd reruns ExecStart. An explicit --skip-package-upgrades on the old
|
|
674
|
+
// CLI must also suppress cmdStart's automatic package work in this invocation.
|
|
675
|
+
const autoUpgrade = !systemdRestart && loadDaemonConfig().upgrade?.autoOnStart !== false;
|
|
645
676
|
const versionInfo = autoUpgrade ? await ensureFreshPackageVersionInfo(undefined, { source: 'start', log: console.log }) : [];
|
|
646
677
|
if (autoUpgrade && opts.upgradeChecks)
|
|
647
678
|
await opts.upgradeChecks();
|
|
@@ -683,7 +714,7 @@ export async function cmdStart(opts = {}) {
|
|
|
683
714
|
suppressSdkLogs();
|
|
684
715
|
const { generateControlAid, resolveControlAidDomain } = await import('../aun/aid/control-aid.js');
|
|
685
716
|
const cfg = loadDaemonConfig();
|
|
686
|
-
const result = await generateControlAid(resolveControlAidDomain(cfg.aun?.defaultAidDomain)
|
|
717
|
+
const result = await generateControlAid(resolveControlAidDomain(cfg.aun?.defaultAidDomain));
|
|
687
718
|
saveDaemonConfig({ ...cfg, aid: result.aid });
|
|
688
719
|
console.log(`✓ 新控制 AID: ${result.aid}`);
|
|
689
720
|
}
|
|
@@ -785,7 +816,7 @@ export async function cmdStart(opts = {}) {
|
|
|
785
816
|
}
|
|
786
817
|
trace.mark('cli.spawnDaemon');
|
|
787
818
|
trace.setMeta('traceId', traceId);
|
|
788
|
-
console.log('
|
|
819
|
+
console.log(formatLifecycleHead(theme, null, formatStatusWord(theme, 'ok', 'Starting')));
|
|
789
820
|
const stdoutRotation = rotateStdoutLog(p.logs);
|
|
790
821
|
if (stdoutRotation.rotatedPath) {
|
|
791
822
|
console.log(` Rotated: stdout.log -> ${path.basename(stdoutRotation.rotatedPath)}`);
|
|
@@ -821,10 +852,9 @@ export async function cmdStart(opts = {}) {
|
|
|
821
852
|
return;
|
|
822
853
|
readyHandled = true;
|
|
823
854
|
trace.mark('cli.postReady');
|
|
824
|
-
console.log(
|
|
825
|
-
|
|
826
|
-
console.log(`
|
|
827
|
-
console.log(`⏱ ready in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
|
|
855
|
+
console.log(`${formatLifecycleHead(theme, null, formatStatusWord(theme, 'ok', '前台运行中'))}${theme.dim(` PID ${childPid}`)}`);
|
|
856
|
+
renderStatusFields([['EVOLCORE_HOME', resolveRoot()], ['Logs', `${p.logs}/`]]);
|
|
857
|
+
console.log(` ${theme.dim(`就绪 ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`)}`);
|
|
828
858
|
if (opts.debug) {
|
|
829
859
|
console.log('');
|
|
830
860
|
console.log('🔧 调试模式已启用(EVOLCORE_DEBUG_MODE=1)');
|
|
@@ -903,12 +933,12 @@ export async function cmdStart(opts = {}) {
|
|
|
903
933
|
let childExited = false;
|
|
904
934
|
child.once('exit', () => { childExited = true; });
|
|
905
935
|
child.unref();
|
|
906
|
-
// 等待 ready signal(最多
|
|
936
|
+
// 等待 ready signal(最多 36 秒,AUN sidecar 超时 15s + 其他通道连接)
|
|
907
937
|
const startTime = Date.now();
|
|
908
938
|
const checkReady = async () => {
|
|
909
939
|
// ready signal 出现(优先检查,避免 Windows 上误判进程状态)
|
|
910
940
|
if (fs.existsSync(p.readySignal)) {
|
|
911
|
-
console.log(
|
|
941
|
+
console.log(`${formatLifecycleHead(theme, null, formatStatusWord(theme, 'ok', '已启动'))}${theme.dim(` PID ${childPid}`)}`);
|
|
912
942
|
const daemonRecord = scanInstances().mains.find(entry => entry.alive && entry.record.pid === childPid)?.record;
|
|
913
943
|
if (daemonRecord?.startedAtIso) {
|
|
914
944
|
console.log(` Daemon 启动时间: ${new Date(daemonRecord.startedAtIso).toLocaleString()}`);
|
|
@@ -933,7 +963,7 @@ export async function cmdStart(opts = {}) {
|
|
|
933
963
|
if (channelSummary) {
|
|
934
964
|
const match = channelSummary.match(/running with .+/);
|
|
935
965
|
if (match)
|
|
936
|
-
console.log(` ${match[0]}`);
|
|
966
|
+
console.log(` ${theme.dim(match[0])}`);
|
|
937
967
|
}
|
|
938
968
|
// 最近一次启动的失败信息
|
|
939
969
|
let lastReadyIdx = -1;
|
|
@@ -948,7 +978,7 @@ export async function cmdStart(opts = {}) {
|
|
|
948
978
|
const line = logLines[i];
|
|
949
979
|
if (line.includes('failed to connect') || line.includes('Failed to create channel')) {
|
|
950
980
|
const match = line.match(/\[WARN\]\s*(.+)/);
|
|
951
|
-
console.log(`
|
|
981
|
+
console.log(` ${formatStatusWord(theme, 'warn', '!')} ${match ? match[1] : line.trim()}`);
|
|
952
982
|
}
|
|
953
983
|
}
|
|
954
984
|
}
|
|
@@ -960,7 +990,7 @@ export async function cmdStart(opts = {}) {
|
|
|
960
990
|
if (packageIsDevMode()) {
|
|
961
991
|
printCodeStats(getPackageRoot(), p.logs);
|
|
962
992
|
}
|
|
963
|
-
console.log(
|
|
993
|
+
console.log(` ${theme.dim(`完成 ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`)}`);
|
|
964
994
|
printAsModeNotice(opts.asMode);
|
|
965
995
|
if (opts.debug) {
|
|
966
996
|
console.log('');
|
|
@@ -990,30 +1020,31 @@ export async function cmdStart(opts = {}) {
|
|
|
990
1020
|
// 超时。ready signal 只是"启动收尾"的标志,不是服务可用性的唯一判据:
|
|
991
1021
|
// 控制面(IPC)可能已经就绪,只是后面还有慢收尾(历史数据整理、通道认证退避)。
|
|
992
1022
|
// 这种情形报红叉 + exit 1 会让部署脚本以为失败并重复启动,所以先探一次 IPC。
|
|
993
|
-
if (Date.now() - startTime >
|
|
1023
|
+
if (Date.now() - startTime > READY_WAIT_TIMEOUT_MS) {
|
|
994
1024
|
// 探测本身最长要 5s(Windows)。单独开一段埋点,否则这段等待会被并进
|
|
995
1025
|
// cli.waitReady,甘特图上看起来像"daemon 就绪慢了 5 秒"。
|
|
996
1026
|
trace.mark('cli.readyProbe');
|
|
997
1027
|
const ping = await probeDaemon(p.socket, DAEMON_PROBE_TIMEOUT_MS);
|
|
998
1028
|
if (ping && ping.pid === childPid) {
|
|
999
1029
|
trace.finish(true);
|
|
1000
|
-
|
|
1001
|
-
console.log(
|
|
1002
|
-
console.log(`
|
|
1003
|
-
|
|
1004
|
-
console.log(
|
|
1030
|
+
const stateWord = formatStatusWord(theme, 'warn', '启动偏慢');
|
|
1031
|
+
console.log(`${formatLifecycleHead(theme, null, stateWord)}${theme.dim(` PID ${childPid} · 已等 ${((Date.now() - startTime) / 1000).toFixed(1)}s`)}`);
|
|
1032
|
+
console.log(` ${theme.dim('IPC 已可达,控制命令可用;启动收尾(历史 handoff 恢复等)仍在后台继续。')}`);
|
|
1033
|
+
renderStatusFields([['EVOLCORE_HOME', resolveRoot()], ['Logs', `${p.logs}/`]]);
|
|
1034
|
+
console.log(` ${theme.dim(`总耗时 ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`)}`);
|
|
1005
1035
|
trace.mark('cli.postReady');
|
|
1006
1036
|
return;
|
|
1007
1037
|
}
|
|
1008
1038
|
trace.finish(false);
|
|
1009
|
-
|
|
1039
|
+
const stateWord = formatStatusWord(theme, 'bad', '启动失败');
|
|
1040
|
+
console.log(`${formatLifecycleHead(theme, null, stateWord)}${theme.dim(' 就绪信号超时,IPC 不可达')}`);
|
|
1010
1041
|
console.log('');
|
|
1011
|
-
console.log('
|
|
1042
|
+
console.log(` ${theme.dim('stdout 末尾 10 行:')}`);
|
|
1012
1043
|
if (fs.existsSync(stdoutLog)) {
|
|
1013
1044
|
const content = fs.readFileSync(stdoutLog, 'utf-8').trim().split('\n');
|
|
1014
|
-
console.log(content.slice(-10).map(l => ` ${l}`).join('\n'));
|
|
1045
|
+
console.log(content.slice(-10).map(l => ` ${theme.dim(l)}`).join('\n'));
|
|
1015
1046
|
}
|
|
1016
|
-
console.log(
|
|
1047
|
+
console.log(` ${theme.dim(`耗时 ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`)}`);
|
|
1017
1048
|
process.exit(1);
|
|
1018
1049
|
return;
|
|
1019
1050
|
}
|
|
@@ -1022,14 +1053,15 @@ export async function cmdStart(opts = {}) {
|
|
|
1022
1053
|
// 给进程一点时间写 ready signal(可能刚好在写入中)
|
|
1023
1054
|
if (Date.now() - startTime > 3000) {
|
|
1024
1055
|
trace.finish(false);
|
|
1025
|
-
|
|
1056
|
+
const stateWord = formatStatusWord(theme, 'bad', '启动失败');
|
|
1057
|
+
console.log(`${formatLifecycleHead(theme, null, stateWord)}${theme.dim(' 进程在就绪前退出')}`);
|
|
1026
1058
|
console.log('');
|
|
1027
|
-
console.log('
|
|
1059
|
+
console.log(` ${theme.dim('stdout 末尾 10 行:')}`);
|
|
1028
1060
|
if (fs.existsSync(stdoutLog)) {
|
|
1029
1061
|
const content = fs.readFileSync(stdoutLog, 'utf-8').trim().split('\n');
|
|
1030
|
-
console.log(content.slice(-10).map(l => ` ${l}`).join('\n'));
|
|
1062
|
+
console.log(content.slice(-10).map(l => ` ${theme.dim(l)}`).join('\n'));
|
|
1031
1063
|
}
|
|
1032
|
-
console.log(
|
|
1064
|
+
console.log(` ${theme.dim(`耗时 ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`)}`);
|
|
1033
1065
|
process.exit(1);
|
|
1034
1066
|
return;
|
|
1035
1067
|
}
|
|
@@ -1039,10 +1071,11 @@ export async function cmdStart(opts = {}) {
|
|
|
1039
1071
|
setTimeout(checkReady, 200);
|
|
1040
1072
|
}
|
|
1041
1073
|
function reportPidReused(pid) {
|
|
1042
|
-
console.log(
|
|
1074
|
+
console.log(` ${makeStatusTheme().dim(`PID ${pid} 已不是登记的那个进程,按已停止处理`)}`);
|
|
1043
1075
|
}
|
|
1044
1076
|
async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace) {
|
|
1045
|
-
|
|
1077
|
+
const theme = makeStatusTheme();
|
|
1078
|
+
console.log(`${formatLifecycleHead(theme, null, formatStatusWord(theme, 'warn', 'Stopping'))}${theme.dim(` PID ${pid}`)}`);
|
|
1046
1079
|
const pidStartMs = Date.now();
|
|
1047
1080
|
// A graceful request was accepted by the daemon that answered for this exact
|
|
1048
1081
|
// PID over IPC, so its identity is already proven; the start-time probe (a
|
|
@@ -1061,12 +1094,12 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace)
|
|
|
1061
1094
|
if (pidStartMs !== waitStartMs) {
|
|
1062
1095
|
trace?.addSpan('cli.stopPidIdentity', pidStartMs, waitStartMs, `PID ${pid}`);
|
|
1063
1096
|
}
|
|
1064
|
-
|
|
1097
|
+
// 成功由 printStopSummary 统一收口(一行状态 + 甘特图),这里不重复播报。
|
|
1065
1098
|
return true;
|
|
1066
1099
|
}
|
|
1067
1100
|
const state = platform.getProcessState(pid);
|
|
1068
1101
|
const stateSuffix = state ? ` (state=${state})` : '';
|
|
1069
|
-
console.log(
|
|
1102
|
+
console.log(`${theme.dim(` PID ${pid}`)} ${formatStatusWord(theme, 'warn', `did not exit gracefully${stateSuffix}; forcing termination`)}`);
|
|
1070
1103
|
if (await isRecordedProcessGone(pid, expectedStartedAt)) {
|
|
1071
1104
|
reportPidReused(pid);
|
|
1072
1105
|
return true;
|
|
@@ -1076,7 +1109,7 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace)
|
|
|
1076
1109
|
if (await platform.waitForProcessExit(pid, 5_000)) {
|
|
1077
1110
|
trace?.addSpan('cli.killTimeout', waitStartMs, forceStartMs, `PID ${pid} 未在优雅超时内退出`);
|
|
1078
1111
|
trace?.addSpan('cli.waitForcedExit', forceStartMs, Date.now(), `PID ${pid}`);
|
|
1079
|
-
console.log('
|
|
1112
|
+
console.log(`${theme.dim(` PID ${pid}`)} ${formatStatusWord(theme, 'warn', 'EvolCore stopped (forced)')}`);
|
|
1080
1113
|
return true;
|
|
1081
1114
|
}
|
|
1082
1115
|
if (await isRecordedProcessGone(pid, expectedStartedAt)) {
|
|
@@ -1085,7 +1118,7 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace)
|
|
|
1085
1118
|
}
|
|
1086
1119
|
const finalState = platform.getProcessState(pid);
|
|
1087
1120
|
const finalStateSuffix = finalState ? ` (state=${finalState})` : '';
|
|
1088
|
-
console.error(
|
|
1121
|
+
console.error(`${theme.dim(` PID ${pid}`)} ${formatStatusWord(theme, 'bad', `EvolCore is still running${finalStateSuffix}; restart aborted`)}`);
|
|
1089
1122
|
return false;
|
|
1090
1123
|
}
|
|
1091
1124
|
function isRuntimeOrphan(orphan, currentHome = resolveRoot()) {
|
|
@@ -1131,7 +1164,8 @@ export async function cmdStop() {
|
|
|
1131
1164
|
return;
|
|
1132
1165
|
}
|
|
1133
1166
|
trace.discard();
|
|
1134
|
-
|
|
1167
|
+
const theme = makeStatusTheme();
|
|
1168
|
+
console.log(formatLifecycleHead(theme, null, formatStatusWord(theme, 'bad', '未运行')));
|
|
1135
1169
|
return;
|
|
1136
1170
|
}
|
|
1137
1171
|
const pids = new Set([...aliveMains.map(entry => entry.record.pid), ...runtimeOrphans.map(orphan => orphan.pid)]);
|
|
@@ -1176,25 +1210,31 @@ export async function cmdStop() {
|
|
|
1176
1210
|
/** 停止流程结束时打印总时长与最慢的几个阶段——慢在哪一眼能看见。 */
|
|
1177
1211
|
function printStopSummary(trace, startedAtMs, ok) {
|
|
1178
1212
|
const total = formatMs(Date.now() - startedAtMs);
|
|
1179
|
-
|
|
1213
|
+
const theme = makeStatusTheme();
|
|
1214
|
+
const stateWord = ok ? formatStatusWord(theme, 'ok', '已停止') : formatStatusWord(theme, 'bad', '停止失败');
|
|
1215
|
+
console.log(`${formatLifecycleHead(theme, null, stateWord)}${theme.dim(` ${total}`)}`);
|
|
1180
1216
|
// 慢的那一段通常在 daemon 侧(渠道断开等),CLI 只负责等。
|
|
1181
1217
|
// daemon 的退出埋点在 exit(0) 前同步落盘,此刻已经能读回来。
|
|
1218
|
+
const detail = (label, text) => {
|
|
1219
|
+
console.log(` ${theme.dim(padRight(label, 8))}${text}`);
|
|
1220
|
+
};
|
|
1182
1221
|
const cliSlowest = formatSlowestSpans(trace.recordedSpans, 3, /^cli\./);
|
|
1183
1222
|
if (cliSlowest)
|
|
1184
|
-
|
|
1223
|
+
detail('CLI', cliSlowest);
|
|
1185
1224
|
const daemonRecord = findTraceRecord(trace.id, 'daemon');
|
|
1186
1225
|
const daemonSlowest = daemonRecord ? formatSlowestSpans(daemonRecord.spans, 3, /^daemon\./) : '';
|
|
1187
1226
|
if (daemonSlowest) {
|
|
1188
|
-
|
|
1227
|
+
detail('daemon', daemonSlowest);
|
|
1189
1228
|
}
|
|
1190
1229
|
else if (ok) {
|
|
1191
1230
|
// 没有 daemon 记录说明它没走优雅退出(被强制结束或提前退出),这本身是信息。
|
|
1192
|
-
|
|
1231
|
+
detail('daemon', theme.dim('无退出埋点(未走优雅退出,或版本不同)'));
|
|
1193
1232
|
}
|
|
1194
1233
|
}
|
|
1195
1234
|
export async function cmdRestart(opts = {}) {
|
|
1196
1235
|
const cmdStartedAt = Date.now();
|
|
1197
|
-
|
|
1236
|
+
const theme = makeStatusTheme();
|
|
1237
|
+
console.log(formatLifecycleHead(theme, null, formatStatusWord(theme, 'warn', 'Restarting')));
|
|
1198
1238
|
// 重启不带 --as-mode,模式按包路径重新判定;清掉可能残留的覆盖文件,并显示出来
|
|
1199
1239
|
writeAsModeOverride(undefined);
|
|
1200
1240
|
console.log(` ${describeRunMode()}`);
|
|
@@ -1202,18 +1242,84 @@ export async function cmdRestart(opts = {}) {
|
|
|
1202
1242
|
return false;
|
|
1203
1243
|
const socketPath = resolvePaths().socket;
|
|
1204
1244
|
const ping = await probeDaemon(socketPath);
|
|
1245
|
+
const currentRestart = readRestartRequest(path.join(daemonControlDir(), 'restart-pending.json'));
|
|
1246
|
+
// During a systemd stop/start window IPC can disappear. Absence of a ping
|
|
1247
|
+
// must never turn an already-owned unit restart into an independent monitor.
|
|
1248
|
+
if (currentRestart?.backend === 'systemd'
|
|
1249
|
+
&& (['requested', 'accepted'].includes(currentRestart.status) || !ping)) {
|
|
1250
|
+
console.error(`❌ Systemd restart ${currentRestart.requestId} is ${currentRestart.status}; no monitor was started. Inspect the owning unit before retrying.`);
|
|
1251
|
+
process.exitCode = 1;
|
|
1252
|
+
return false;
|
|
1253
|
+
}
|
|
1254
|
+
if (!ping && process.platform === 'linux'
|
|
1255
|
+
&& scanInstances({ kind: 'main', includeAidActivity: false }).mains.some(entry => entry.alive)) {
|
|
1256
|
+
console.error('❌ A live daemon is registered but IPC is unavailable; ownership cannot be verified and no monitor was started.');
|
|
1257
|
+
process.exitCode = 1;
|
|
1258
|
+
return false;
|
|
1259
|
+
}
|
|
1205
1260
|
if (ping && !await hasLiveMain(ping.pid)) {
|
|
1206
|
-
// Keep the full PID-namespace fallback for unregistered/unobservable targets.
|
|
1207
|
-
// Normal restarts only inspect the responding PID, without AID activity logs.
|
|
1208
1261
|
const initialStatus = scanInstances({ includeAidActivity: false });
|
|
1209
1262
|
if (!hasVisibleDaemonPid(initialStatus, ping)) {
|
|
1210
|
-
const initialRuntimeOrphans = findOrphanProcesses(initialStatus).filter(orphan => isRuntimeOrphan(orphan));
|
|
1211
1263
|
if (await tryDelegatedDaemonRestart(socketPath))
|
|
1212
1264
|
return true;
|
|
1213
|
-
if (
|
|
1265
|
+
if (rejectPidIsolatedLifecycle('restart', initialStatus, ping))
|
|
1214
1266
|
return false;
|
|
1215
1267
|
}
|
|
1216
1268
|
}
|
|
1269
|
+
if (ping && process.platform === 'linux') {
|
|
1270
|
+
const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
|
|
1271
|
+
const inheritedRequestId = process.env[RESTART_REQUEST_ID_ENV];
|
|
1272
|
+
let systemdRequestId = inheritedRequestId;
|
|
1273
|
+
try {
|
|
1274
|
+
const startedAt = getProcessStartTime(ping.pid, { fresh: true });
|
|
1275
|
+
if (startedAt === null)
|
|
1276
|
+
throw new Error('Cannot verify target daemon start time');
|
|
1277
|
+
const record = scanInstances({ kind: 'main', includeAidActivity: false }).mains.find(item => item.record.pid === ping.pid)?.record;
|
|
1278
|
+
if (!record || !startTimeMatches(record.startedAt, startedAt))
|
|
1279
|
+
throw new Error('Cannot verify target daemon against its recorded identity');
|
|
1280
|
+
const service = await discoverSystemdService(ping.pid, startedAt);
|
|
1281
|
+
if (service) {
|
|
1282
|
+
const requestId = inheritedRequestId || crypto.randomUUID();
|
|
1283
|
+
systemdRequestId = requestId;
|
|
1284
|
+
const existing = inheritedRequestId ? readRestartRequest(pendingFile, inheritedRequestId) : null;
|
|
1285
|
+
if (inheritedRequestId && existing?.status !== 'requested')
|
|
1286
|
+
throw new Error('Restart request is missing, replaced or no longer pending');
|
|
1287
|
+
const applyPackageUpgrades = opts.applyPackageUpgrades ?? (loadDaemonConfig().upgrade?.autoOnStart !== false);
|
|
1288
|
+
if (existing?.upgradeJobId || applyPackageUpgrades) {
|
|
1289
|
+
throw new Error('Systemd package upgrades/rollback are not supported yet; use a pure restart (--skip-package-upgrades or upgrade.autoOnStart=false)');
|
|
1290
|
+
}
|
|
1291
|
+
if (opts.clear || opts.diagnose)
|
|
1292
|
+
throw new Error('Systemd restart does not support --clear/--diagnose; service was not stopped');
|
|
1293
|
+
if (sourceBuildNeedsRefresh())
|
|
1294
|
+
throw new Error('Build source changes before systemd restart (npm run build); service was not stopped');
|
|
1295
|
+
const { preflightDataMigration } = await import('./restart-monitor.js');
|
|
1296
|
+
const preflight = preflightDataMigration(resolvePaths().root, console.log);
|
|
1297
|
+
if (!preflight.ok || preflight.operations) {
|
|
1298
|
+
throw new Error(`Systemd restart requires completed data migration: ${preflight.reason ?? `${preflight.operations} pending operations`}`);
|
|
1299
|
+
}
|
|
1300
|
+
if ((await probeDaemon(socketPath))?.pid !== ping.pid)
|
|
1301
|
+
throw new Error('Target daemon changed during restart preflight');
|
|
1302
|
+
if (shouldSuppressRealRestart())
|
|
1303
|
+
throw new Error('Real systemd restart is disabled in the test runtime');
|
|
1304
|
+
if (!inheritedRequestId && !createRestartRequest(pendingFile, {
|
|
1305
|
+
requestId, requesterPid: process.pid, status: 'requested', timestamp: Date.now(),
|
|
1306
|
+
}, platform.isProcessRunning))
|
|
1307
|
+
throw new Error('Another restart request is pending');
|
|
1308
|
+
await submitSystemdRestart(pendingFile, requestId, service);
|
|
1309
|
+
console.log(`🔄 Systemd accepted restart: ${service.scope}/${service.unit} requestId=${requestId}; awaiting replacement ready`);
|
|
1310
|
+
return true;
|
|
1311
|
+
}
|
|
1312
|
+
}
|
|
1313
|
+
catch (error) {
|
|
1314
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
1315
|
+
if (systemdRequestId && readRestartRequest(pendingFile, systemdRequestId)?.backend !== 'systemd') {
|
|
1316
|
+
updateRestartRequest(pendingFile, systemdRequestId, { status: 'failed', reason });
|
|
1317
|
+
}
|
|
1318
|
+
console.error(`❌ Restart aborted before monitor launch: ${reason}`);
|
|
1319
|
+
process.exitCode = 1;
|
|
1320
|
+
return false;
|
|
1321
|
+
}
|
|
1322
|
+
}
|
|
1217
1323
|
// The shared launchPackageLifecycle path delegates to launchMonitorAndConfirm;
|
|
1218
1324
|
// the monitor retains shutdown, orphan checks, build and rollback ownership.
|
|
1219
1325
|
// restart-monitor performs the read-only preflight before stopping the
|
|
@@ -1235,7 +1341,7 @@ export async function cmdRestart(opts = {}) {
|
|
|
1235
1341
|
process.exitCode = 1;
|
|
1236
1342
|
return false;
|
|
1237
1343
|
}
|
|
1238
|
-
console.log(
|
|
1344
|
+
console.log(` ${theme.dim(`monitor 已启动 ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s · 服务正在重启`)}`);
|
|
1239
1345
|
return true;
|
|
1240
1346
|
}
|
|
1241
1347
|
function normalizeRuntimePath(value) {
|
|
@@ -1465,7 +1571,7 @@ function renderStatusOverview(snapshot) {
|
|
|
1465
1571
|
...(snapshot.overall.degraded ? [['降级状态', '已降级']] : []),
|
|
1466
1572
|
['IPC', `${snapshot.daemon.ipc.reachable ? '可达' : '不可达'} (${snapshot.daemon.ipc.latencyMs} ms)`],
|
|
1467
1573
|
['CPU', `${Number.isFinite(cpuCount) ? `${cpuCount} 核` : '主机信息不可用'}${processCpu}`],
|
|
1468
|
-
['Memory', `${Number.isFinite(totalMemory) ? `${formatBytes(totalMemory)}
|
|
1574
|
+
['Memory', `${Number.isFinite(totalMemory) ? `${formatBytes(totalMemory)} 可用总量` : '主机信息不可用'}${processMemory}`],
|
|
1469
1575
|
];
|
|
1470
1576
|
renderStatusFields(overviewFields);
|
|
1471
1577
|
const startup = snapshot.daemon.startup;
|
|
@@ -1529,7 +1635,7 @@ function renderStatusOverview(snapshot) {
|
|
|
1529
1635
|
if (Array.isArray(baseagents) && baseagents.length > 0) {
|
|
1530
1636
|
const ready = baseagents.filter((item) => item.state === 'ready').length;
|
|
1531
1637
|
const stateLabels = {
|
|
1532
|
-
ready: '
|
|
1638
|
+
ready: '就绪', available: '可用', unavailable: '不可用', unknown: '未知',
|
|
1533
1639
|
};
|
|
1534
1640
|
console.log(`\n基座(${ready}/${baseagents.length} 就绪)`);
|
|
1535
1641
|
renderStatusTable(baseagents.map((item) => item.label ?? item.id), [baseagents.map((item) => stateLabels[item.state] ?? item.state ?? '未知')]);
|
|
@@ -1594,7 +1700,9 @@ function renderStatusAgents(agents, aunAids, queue, controlAid, registered = age
|
|
|
1594
1700
|
const safeAgents = Array.isArray(agents) ? agents : [];
|
|
1595
1701
|
const queueLabel = queue
|
|
1596
1702
|
? `执行中 ${formatStatusCount(queue.processing)} / 等待 ${formatStatusCount(queue.pending)}` : '不可用';
|
|
1597
|
-
|
|
1703
|
+
const theme = makeStatusTheme();
|
|
1704
|
+
const summary = `${registered} Agent · ${safeAunAids.length} AUN AID · 全局队列 ${queueLabel}`;
|
|
1705
|
+
console.log(`\n${theme.bold('AGENTs')} ${theme.dim(summary)}`);
|
|
1598
1706
|
if (safeAgents.length === 0 && safeAunAids.length === 0 && !controlAid?.aid) {
|
|
1599
1707
|
console.log(' (没有已登记 Agent)');
|
|
1600
1708
|
return;
|
|
@@ -1779,6 +1887,15 @@ async function collectStatusSnapshot() {
|
|
|
1779
1887
|
queue: statusResponse?.queue ?? { pending: null, processing: null },
|
|
1780
1888
|
startup: statusResponse?.startup,
|
|
1781
1889
|
restartMonitorPids: restartMonitors.map(item => item.record.pid),
|
|
1890
|
+
restartRequest: (() => {
|
|
1891
|
+
const request = readRestartRequest(path.join(daemonControlDir(), 'restart-pending.json'));
|
|
1892
|
+
return request ? {
|
|
1893
|
+
requestId: request.requestId, status: request.status, backend: request.backend ?? 'monitor',
|
|
1894
|
+
...(request.systemd ? { unit: request.systemd.unit, scope: request.systemd.scope } : {}),
|
|
1895
|
+
...(request.reason ? { reason: request.reason } : {}),
|
|
1896
|
+
...(request.deadline ? { deadline: request.deadline } : {}),
|
|
1897
|
+
} : null;
|
|
1898
|
+
})(),
|
|
1782
1899
|
},
|
|
1783
1900
|
baseagents: statusResponse?.baseagents ?? { source: 'unavailable', items: [] },
|
|
1784
1901
|
activity,
|
|
@@ -1818,36 +1935,59 @@ async function collectStatusSnapshot() {
|
|
|
1818
1935
|
}
|
|
1819
1936
|
function renderStatusHeader(snapshot) {
|
|
1820
1937
|
const { runtime, versions, daemon } = snapshot;
|
|
1821
|
-
const
|
|
1822
|
-
|
|
1823
|
-
|
|
1824
|
-
|
|
1825
|
-
|
|
1826
|
-
|
|
1938
|
+
const theme = makeStatusTheme();
|
|
1939
|
+
const stateWord = snapshot.overall.degraded
|
|
1940
|
+
? formatStatusWord(theme, 'warn', '运行中(降级)')
|
|
1941
|
+
: formatStatusWord(theme, 'ok', '运行中');
|
|
1942
|
+
const uptime = formatStatusUptime(daemon.uptimeMs);
|
|
1943
|
+
const details = [
|
|
1944
|
+
daemon.pid !== null ? `PID ${daemon.pid}` : '',
|
|
1945
|
+
uptime ? `已运行 ${uptime}` : '',
|
|
1946
|
+
`ec-web v${versions.ecweb ?? '?'}`,
|
|
1947
|
+
`fastaun v${versions.fastaun ?? '?'}`,
|
|
1948
|
+
].filter(Boolean);
|
|
1949
|
+
console.log(`${formatLifecycleHead(theme, versions.evolcore ?? '?', stateWord)}${theme.dim(` ${details.join(' ')}`)}`);
|
|
1827
1950
|
const installType = runtime.installationType === 'npm-global' ? 'npm全局安装' : '开发仓(link)';
|
|
1828
1951
|
const runMode = runtime.runMode === null ? '未知' : runtime.runMode === 'install' ? '安装模式' : '开发模式';
|
|
1829
|
-
console.log(` 安装类型: ${installType} 运行模式: ${runMode}`);
|
|
1830
1952
|
const cliExecution = runtime.cliExecution === 'dist' ? '编译产物(dist)' : '源码(tsx)';
|
|
1831
1953
|
const daemonExecution = runtime.daemonExecution === 'dist' ? '编译产物(dist)'
|
|
1832
1954
|
: runtime.daemonExecution === 'source' ? '源码' : '未知';
|
|
1833
|
-
|
|
1955
|
+
renderStatusFields([
|
|
1956
|
+
['包路径', runtime.packagePath],
|
|
1957
|
+
['EVOLCORE_HOME', runtime.evolcoreHome],
|
|
1958
|
+
['安装类型', installType],
|
|
1959
|
+
['运行模式', runMode],
|
|
1960
|
+
['CLI 执行', cliExecution],
|
|
1961
|
+
['Daemon 执行', daemonExecution],
|
|
1962
|
+
]);
|
|
1834
1963
|
}
|
|
1835
1964
|
function renderStatusSnapshot(snapshot) {
|
|
1965
|
+
const theme = makeStatusTheme();
|
|
1836
1966
|
const hasStatus = snapshot.overall.status === 'running' || snapshot.daemon.pid !== null;
|
|
1837
1967
|
if (snapshot.overall.status === 'running') {
|
|
1838
1968
|
renderStatusHeader(snapshot);
|
|
1839
1969
|
}
|
|
1840
1970
|
else if (snapshot.overall.status === 'restarting') {
|
|
1841
|
-
|
|
1971
|
+
const stateWord = formatStatusWord(theme, 'warn', '正在重启');
|
|
1972
|
+
console.log(`${formatLifecycleHead(theme, null, stateWord)}${theme.dim(` daemon 尚未就绪 · monitor PID ${snapshot.daemon.restartMonitorPids.join(', ')}`)}`);
|
|
1842
1973
|
}
|
|
1843
1974
|
else {
|
|
1844
|
-
const
|
|
1845
|
-
|
|
1846
|
-
|
|
1847
|
-
|
|
1975
|
+
const stopped = snapshot.overall.status === 'stopped';
|
|
1976
|
+
const stateWord = stopped
|
|
1977
|
+
? formatStatusWord(theme, 'bad', '未运行')
|
|
1978
|
+
: formatStatusWord(theme, 'warn', '状态未知');
|
|
1979
|
+
const hint = stopped
|
|
1980
|
+
? 'daemon 未运行,或 IPC 端点不存在;执行 ec start 启动。'
|
|
1981
|
+
: '无法确认运行状态:IPC 不可用。';
|
|
1982
|
+
console.log(`${formatLifecycleHead(theme, null, stateWord)}${theme.dim(` ${hint}`)}`);
|
|
1983
|
+
}
|
|
1984
|
+
for (const diagnostic of snapshot.diagnostics) {
|
|
1985
|
+
console.log(` ${formatStatusWord(theme, 'warn', '!')} ${diagnostic.message}`);
|
|
1986
|
+
}
|
|
1987
|
+
if (snapshot.daemon.restartRequest) {
|
|
1988
|
+
const request = snapshot.daemon.restartRequest;
|
|
1989
|
+
console.log(` Restart: ${request.status} requestId=${request.requestId} backend=${request.backend}${request.reason ? ` (${request.reason})` : ''}`);
|
|
1848
1990
|
}
|
|
1849
|
-
for (const diagnostic of snapshot.diagnostics)
|
|
1850
|
-
console.log(` ⚠ ${diagnostic.message}`);
|
|
1851
1991
|
if (hasStatus) {
|
|
1852
1992
|
renderStatusOverview(snapshot);
|
|
1853
1993
|
renderStatusAgents(snapshot.agents.items, snapshot.aun.items, snapshot.daemon.queue, snapshot.controlAid, snapshot.agents.registered);
|
|
@@ -3302,46 +3442,50 @@ async function collectEcwebStatus(p) {
|
|
|
3302
3442
|
};
|
|
3303
3443
|
}
|
|
3304
3444
|
function renderEcwebStatus(status) {
|
|
3445
|
+
const theme = makeStatusTheme();
|
|
3446
|
+
const label = 'ECWeb';
|
|
3447
|
+
// 第一段是状态词(唯一染色处),其后跟细节;细节降暗,与上方字段表同一节奏。
|
|
3448
|
+
const line = (state, tone, detail = '') => {
|
|
3449
|
+
console.log(` ${theme.dim(padRight(label, 8))}${formatStatusWord(theme, tone, state)}${detail ? theme.dim(` ${detail}`) : ''}`);
|
|
3450
|
+
};
|
|
3305
3451
|
console.log('');
|
|
3306
3452
|
if (status.status === 'disabled') {
|
|
3307
|
-
|
|
3453
|
+
line('已禁用', 'bad', 'daemon.json → services[name=ecweb].enabled: false');
|
|
3308
3454
|
}
|
|
3309
3455
|
else if (status.status === 'running') {
|
|
3310
|
-
const pidText = status.pidVisible
|
|
3311
|
-
|
|
3312
|
-
: `PID: ${status.pid}(当前 namespace 不可见)`;
|
|
3313
|
-
console.log(`🔭 ECWeb: 运行中 (${pidText}) http://localhost:${status.port}`);
|
|
3456
|
+
const pidText = status.pidVisible ? `PID ${status.pid}` : `PID ${status.pid}(当前 namespace 不可见)`;
|
|
3457
|
+
line('运行中', 'ok', `${pidText} http://localhost:${status.port}`);
|
|
3314
3458
|
if (status.externalUrl) {
|
|
3315
|
-
|
|
3316
|
-
console.log(`
|
|
3459
|
+
const indent = ' '.repeat(10);
|
|
3460
|
+
console.log(` ${theme.dim(`${indent}${status.externalUrl} · 配对码 ${MAIN_CLI_BIN} watch web/${WEB_CLI_BIN}`)}`);
|
|
3317
3461
|
}
|
|
3318
3462
|
}
|
|
3319
3463
|
else if (status.startupState === 'waiting') {
|
|
3320
|
-
|
|
3464
|
+
line('等待启动', 'warn');
|
|
3321
3465
|
}
|
|
3322
3466
|
else if (status.startupState === 'starting' && status.status !== 'process-not-ready') {
|
|
3323
|
-
|
|
3467
|
+
line('正在启动', 'warn', '等待健康检查');
|
|
3324
3468
|
}
|
|
3325
3469
|
else if (status.status === 'process-not-ready') {
|
|
3326
3470
|
if (status.reason === 'daemon-not-ready') {
|
|
3327
3471
|
const detail = status.readinessError ? `:${status.readinessError}` : '';
|
|
3328
|
-
|
|
3472
|
+
line('进程存活', 'warn', `PID ${status.pid} · daemon 未就绪(端口 ${status.port})${detail}`);
|
|
3329
3473
|
}
|
|
3330
3474
|
else {
|
|
3331
|
-
|
|
3475
|
+
line('进程存活', 'warn', `PID ${status.pid} · HTTP 未响应(端口 ${status.port}),见 logs/ecweb-daemon.log`);
|
|
3332
3476
|
}
|
|
3333
3477
|
}
|
|
3334
3478
|
else if (status.status === 'port-occupied') {
|
|
3335
|
-
|
|
3479
|
+
line('端口被占用', 'bad', `端口 ${status.port} 被未确认实例占用(PID ${status.pids.join(', ')});请先核实进程归属,未自动终止`);
|
|
3336
3480
|
}
|
|
3337
3481
|
else if (status.status === 'recorded-unavailable') {
|
|
3338
|
-
|
|
3482
|
+
line('状态不可确认', 'warn', 'instance 记录存在,但宿主 PID 不可见且 HTTP 未就绪');
|
|
3339
3483
|
}
|
|
3340
3484
|
else if (status.status === 'enabled-not-running') {
|
|
3341
|
-
|
|
3485
|
+
line('已启用未运行', 'bad', `端口 ${status.port},见 logs/ecweb-daemon.log`);
|
|
3342
3486
|
}
|
|
3343
3487
|
else {
|
|
3344
|
-
|
|
3488
|
+
line('未运行', 'bad');
|
|
3345
3489
|
}
|
|
3346
3490
|
}
|
|
3347
3491
|
function removeEcwebInstanceFiles(p, pid, expectedStartedAt) {
|