evolcore 0.0.41 → 0.0.42-test.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +36 -0
- package/bin/codex-managed-hook.mjs +9 -5
- package/dist/agents/baseagent.js +156 -16
- package/dist/agents/claude-runner.js +10 -3
- package/dist/agents/codex/catalog.js +8 -4
- package/dist/agents/codex-runner.js +236 -59
- package/dist/agents/ecagent-runner.js +82 -13
- package/dist/aun/aid/agentmd.js +106 -27
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +65 -13
- package/dist/aun/aid/identity.js +70 -4
- package/dist/aun/aid/index.js +2 -2
- package/dist/aun/service-proxy.js +25 -1
- package/dist/channels/aun.js +242 -209
- package/dist/channels/dingtalk.js +1 -1
- package/dist/channels/feishu.js +1 -1
- package/dist/channels/qqbot.js +1 -1
- package/dist/channels/wechat.js +1 -1
- package/dist/channels/wecom.js +1 -1
- package/dist/cli/agent-command.js +183 -3
- package/dist/cli/agent-create.js +92 -86
- package/dist/cli/agent.js +136 -1
- package/dist/cli/aun-commands.js +137 -35
- package/dist/cli/bench.js +8 -2
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +235 -51
- package/dist/cli/debug-mode.js +1 -1
- package/dist/cli/directory.js +170 -0
- package/dist/cli/index.js +40 -30
- package/dist/cli/init-channel.js +4 -4
- package/dist/cli/init.js +47 -32
- package/dist/cli/managed-command-guard.js +4 -1
- package/dist/cli/model.js +27 -18
- package/dist/cli/pa-workspace-command.js +191 -0
- package/dist/cli/{contact.js → peer.js} +19 -25
- package/dist/cli/restart-monitor.js +11 -4
- package/dist/cli/thread-command.js +47 -18
- package/dist/cli/version.js +18 -18
- package/dist/config/access-policy.js +29 -12
- package/dist/config/boot-log.js +65 -10
- package/dist/config/builtin-roles.js +2 -4
- package/dist/config/config-field-policy.js +3 -0
- package/dist/config/config-manager.js +28 -20
- package/dist/config/{contact-bind-code.js → peer-bind-code.js} +6 -6
- package/dist/config/{contact-book-store.js → peer-book-store.js} +75 -75
- package/dist/config/{contact-book-v2-startup.js → peer-book-v2-startup.js} +2 -2
- package/dist/config/{contact-book.js → peer-book.js} +47 -47
- package/dist/config/peer-operation-service.js +132 -0
- package/dist/config/{contact-request-service.js → peer-request-service.js} +90 -90
- package/dist/config/peer-role-resolver.js +3 -3
- package/dist/config/providers-config.js +17 -8
- package/dist/config/providers.js +1 -1
- package/dist/config/schema-migration.js +336 -39
- package/dist/core/agent-application-service.js +8 -2
- package/dist/core/agent-create-status.js +4 -5
- package/dist/core/agent-ipc-registration.js +5 -4
- package/dist/core/agent-runtime.js +30 -17
- package/dist/core/auth/operation-authorizer.js +0 -24
- package/dist/core/auth/operation-catalog.js +4 -20
- package/dist/core/baseagent-loader.js +27 -3
- package/dist/core/bootstrap-service.js +5 -22
- package/dist/core/capability/capability-manager.js +52 -35
- package/dist/core/channel-loader.js +43 -2
- package/dist/core/channel-runtime.js +2 -2
- package/dist/core/command/agent-control.js +54 -18
- package/dist/core/command/command-handler.js +92 -72
- package/dist/core/command/connect-menu.js +35 -42
- package/dist/core/command/daemon-diagnostics.js +41 -5
- package/dist/core/command/data-root-error.js +10 -0
- package/dist/core/command/data-root-resolver.js +53 -13
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +163 -65
- package/dist/core/command/menu-protocol.js +52 -0
- package/dist/core/command/pa-workspace-calendar.js +223 -0
- package/dist/core/command/pa-workspace-store.js +459 -0
- package/dist/core/command/role-menu.js +2 -2
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +57 -41
- package/dist/core/daemon-lifecycle.js +90 -31
- package/dist/core/evolagent.js +6 -10
- package/dist/core/handoff/runtime.js +11 -4
- package/dist/core/host-snapshot.js +208 -0
- package/dist/core/initialization/service.js +152 -20
- package/dist/core/ipc-registration.js +33 -4
- package/dist/core/memory/batch-meta.js +27 -0
- package/dist/core/memory/consolidation-ops-records.js +44 -1
- package/dist/core/memory/consolidation.js +169 -27
- package/dist/core/message/aun-ipc-sender.js +2 -8
- package/dist/core/message/im-renderer.js +56 -3
- package/dist/core/message/message-admission.js +121 -124
- package/dist/core/message/message-bridge.js +38 -54
- package/dist/core/message/message-queue.js +7 -0
- package/dist/core/message/outbound.js +34 -9
- package/dist/core/message/response-engine.js +154 -73
- package/dist/core/model/catalog-service.js +1 -1
- package/dist/core/model/config-scope.js +2 -2
- package/dist/core/model/model-catalog.js +5 -4
- package/dist/core/model/model-diagnostics.js +6 -5
- package/dist/core/model/model-fallback.js +3 -6
- package/dist/core/model/model-permission.js +1 -1
- package/dist/core/ownership/owner-resolver.js +9 -9
- package/dist/core/permission/approval-gateway.js +1 -1
- package/dist/core/permission/ec-command-parser.js +2 -2
- package/dist/core/permission/tool-canonical.js +96 -46
- package/dist/core/permission/tool-error-code.js +41 -0
- package/dist/core/permission/tool-policy.js +71 -47
- package/dist/core/role/runtime-policy.js +1 -1
- package/dist/core/session/session-idle-monitor.js +10 -0
- package/dist/core/session/session-manager.js +2 -4
- package/dist/core/session/session-title.js +36 -8
- package/dist/core/system-session/memory.js +2 -7
- package/dist/core/thread/command-parser.js +6 -2
- package/dist/core/thread/ipc-operation.js +51 -36
- package/dist/core/thread/thread-operation.js +29 -61
- package/dist/core/thread/thread-service.js +57 -13
- package/dist/directory/canonical-digest.js +54 -0
- package/dist/directory/owner-directory-admission.js +114 -43
- package/dist/directory/owner-directory-agentmd-sync.js +89 -0
- package/dist/directory/owner-directory-cache.js +847 -459
- package/dist/directory/owner-directory-markdown.js +272 -0
- package/dist/directory/owner-directory-query-operation.js +195 -0
- package/dist/directory/owner-directory-remark-operation.js +147 -0
- package/dist/directory/owner-directory-remarks.js +145 -0
- package/dist/directory/owner-directory-scope.js +55 -0
- package/dist/directory/owner-directory-search.js +148 -0
- package/dist/directory/owner-directory-store.js +227 -0
- package/dist/eck/kit-renderer.js +1 -0
- package/dist/ecweb/basic-settings-service.js +4 -1
- package/dist/ecweb/message-context-service.js +13 -9
- package/dist/index.js +195 -37
- package/dist/ipc.js +86 -22
- package/dist/paths.js +11 -8
- package/dist/product.js +2 -0
- package/dist/proxy/manager.js +13 -2
- package/dist/proxy/service-supervisor.js +8 -1
- package/dist/trigger/history.js +23 -0
- package/dist/trigger/scheduler.js +3 -0
- package/dist/utils/atomic-write.js +21 -0
- package/dist/utils/cross-platform.js +35 -0
- package/dist/utils/ecweb-supervisor.js +42 -0
- package/dist/utils/error-utils.js +2 -1
- package/dist/utils/evolcore-version.js +19 -0
- package/dist/utils/host-info.js +242 -5
- package/dist/utils/instance-registry.js +28 -6
- package/dist/utils/logger.js +59 -14
- package/dist/utils/machine-info.js +46 -0
- package/dist/utils/process-introspect.js +166 -2
- package/dist/utils/startup-trace.js +245 -0
- package/ecagent/dist/agent-loop.js +27 -13
- package/ecagent/dist/harness/agent-harness.js +3 -3
- package/ecagent/dist/harness/types.d.ts +1 -0
- package/ecagent/dist/types.d.ts +1 -0
- package/kits/docs/INDEX.md +1 -1
- package/kits/docs/aun/AUN/346/266/210/346/201/257/347/261/273/345/236/213/344/270/216/345/261/236/346/200/247.md +72 -0
- package/kits/docs/evolcore/INDEX.md +3 -2
- package/kits/docs/evolcore/agent-create.md +17 -27
- package/kits/docs/evolcore/agent.md +4 -1
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +16 -5
- package/kits/docs/evolcore/ctl.md +9 -0
- package/kits/docs/evolcore/ec-capabilities.md +19 -0
- package/kits/docs/evolcore/memory-consolidation-batches.md +79 -5
- package/kits/docs/evolcore/menu-exec-schema-commands.md +2 -1
- package/kits/docs/evolcore/menu-protocol.md +1 -0
- package/kits/docs/evolcore/model.md +13 -4
- package/kits/docs/evolcore/msg.md +1 -1
- package/kits/docs/evolcore/pa-workspace.md +51 -0
- package/kits/docs/evolcore/peer.md +73 -0
- package/kits/docs/evolcore/thread-chain.md +4 -1
- package/kits/eck_manifest.json +21 -0
- package/kits/rules/06-channel.md +1 -1
- package/kits/schemas/_meta.json +12 -1
- package/kits/schemas/agent-config.schema.16.json +6 -0
- package/kits/schemas/agent-config.schema.17.json +897 -0
- package/kits/schemas/daemon.schema.9.json +8 -1
- package/kits/skills/ec-agent-create/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +45 -27
- package/kits/skills/ec-service-proxy/SKILL.md +7 -2
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +4 -5
- package/kits/skills/thread-ops/SKILL.md +11 -11
- package/kits/templates/bootstrap-welcome.md +3 -15
- package/kits/templates/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/bootstrap.md +24 -23
- package/kits/templates/system-fragments/commands.md +12 -5
- package/kits/templates/system-fragments/thread.md +18 -3
- package/package.json +6 -4
- package/dist/config/contact-operation-service.js +0 -235
- package/dist/directory/owner-directory-authorization.js +0 -309
- package/kits/docs/evolcore/contact.md +0 -78
- /package/dist/config/{contact-alias.js → peer-alias.js} +0 -0
|
@@ -10,7 +10,9 @@ import { resolveAnthropicConfig } from '../agents/baseagent.js';
|
|
|
10
10
|
import { migrateProject } from '../config-store.js';
|
|
11
11
|
import { ipcQuery, IpcTransportError } from '../ipc.js';
|
|
12
12
|
import { isHelpFlag } from './help.js';
|
|
13
|
-
|
|
13
|
+
// 注意:这里不要静态导入 ./init.js。init 带着 AUN 引导、控制 AID 生成等一整棵依赖,
|
|
14
|
+
// 而 `ec start` 在已初始化的机器上根本不会用到它(只有缺配置/缺控制 AID 时才走)。
|
|
15
|
+
// 需要时在分支里按需加载。
|
|
14
16
|
import * as platform from '../utils/cross-platform.js';
|
|
15
17
|
import { EventBus } from '../core/event-bus.js';
|
|
16
18
|
import { resolveGlobalPkg } from '../utils/npm-ops.js';
|
|
@@ -20,15 +22,16 @@ import { isHostChinese } from '../utils/locale.js';
|
|
|
20
22
|
import { scanInstances, cleanupInstances, findOrphanProcesses } from '../utils/instance-registry.js';
|
|
21
23
|
import { filterLogFiles, deriveLogTypes, computePreChecked, validateLogTypes, shortLogName as shortLogNameLocal, isWatchLogFile } from './watch-logs.js';
|
|
22
24
|
import { printCodeStats } from './code-stats.js';
|
|
25
|
+
import { StartupTracer, STARTUP_TRACE_ID_ENV, formatMs, formatSlowestSpans, findTraceRecord } from '../utils/startup-trace.js';
|
|
23
26
|
import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
|
|
24
27
|
import { matchesEcwebInstanceHealth, parseEcwebInstanceRecord } from '../contracts/ecweb-instance.js';
|
|
25
|
-
import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
26
|
-
import { MAIN_CLI_BIN, RESTART_REQUEST_ID_ENV, RUNTIME_HOME_ENV, TARGET_PACKAGE_ROOT_ENV, WEB_CLI_BIN, WEB_PACKAGE_NAME, } from '../product.js';
|
|
28
|
+
import { AGENT_DELEGATION_TOKEN_ENV, hashCurrentDelegatedCommand, readDelegationCredential } from '../core/auth/agent-delegation.js';
|
|
29
|
+
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';
|
|
27
30
|
import { readRestartRequest, updateRestartRequest } from '../utils/restart-safety.js';
|
|
28
31
|
import { rotateStdoutLog } from '../utils/log-writer.js';
|
|
32
|
+
import { logLevelRank } from '../utils/logger.js';
|
|
29
33
|
import { inspectDataMigrationRequirement } from '../core/data-migration.js';
|
|
30
34
|
import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
|
|
31
|
-
import { readFastaunVersion } from '../utils/evolcore-version.js';
|
|
32
35
|
import { readHostInfo } from '../utils/host-info.js';
|
|
33
36
|
import { queryStatusActivity, queryStatusActivityByAgent } from '../stats/query.js';
|
|
34
37
|
import { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../agents/codex/app-server-registry.js';
|
|
@@ -159,7 +162,7 @@ async function probeDaemon(socketPath, timeoutMs = DAEMON_PROBE_TIMEOUT_MS, thro
|
|
|
159
162
|
return response;
|
|
160
163
|
}
|
|
161
164
|
/** Ask the daemon to run its own graceful shutdown lifecycle. */
|
|
162
|
-
export async function requestDaemonShutdown(socketPath, timeoutMs = DAEMON_SHUTDOWN_TIMEOUT_MS, reason = 'cli', expectedPids) {
|
|
165
|
+
export async function requestDaemonShutdown(socketPath, timeoutMs = DAEMON_SHUTDOWN_TIMEOUT_MS, reason = 'cli', expectedPids, traceId) {
|
|
163
166
|
const daemon = await probeDaemon(socketPath, Math.min(timeoutMs, DAEMON_PROBE_TIMEOUT_MS));
|
|
164
167
|
if (!daemon || (expectedPids && !expectedPids.has(daemon.pid)))
|
|
165
168
|
return null;
|
|
@@ -167,6 +170,8 @@ export async function requestDaemonShutdown(socketPath, timeoutMs = DAEMON_SHUTD
|
|
|
167
170
|
type: 'shutdown',
|
|
168
171
|
reason,
|
|
169
172
|
expectedPid: daemon.pid,
|
|
173
|
+
// 让 daemon 侧退出阶段落进同一条停止甘特图(时间轴按同一次停止对齐)。
|
|
174
|
+
...(traceId ? { traceId } : {}),
|
|
170
175
|
}, timeoutMs);
|
|
171
176
|
if (response?.ok !== true || response.accepted !== true
|
|
172
177
|
|| !Number.isInteger(response.pid) || response.pid <= 0
|
|
@@ -222,14 +227,17 @@ export function cleanEnv() {
|
|
|
222
227
|
delete process.env[key];
|
|
223
228
|
}
|
|
224
229
|
}
|
|
225
|
-
function buildDaemonEnv(p, opts) {
|
|
230
|
+
function buildDaemonEnv(p, opts, traceId) {
|
|
226
231
|
return {
|
|
227
232
|
...process.env,
|
|
228
233
|
EVOLCORE_HOME: p.root,
|
|
229
234
|
EVOLCORE_LAUNCHED_BY: 'start',
|
|
230
235
|
LOG_LEVEL: process.env.LOG_LEVEL || 'INFO',
|
|
236
|
+
[CHANNEL_LOGS_ENV]: process.env[CHANNEL_LOGS_ENV] || 'false',
|
|
231
237
|
MESSAGE_LOG: process.env.MESSAGE_LOG || 'true',
|
|
232
238
|
EVENT_LOG: process.env.EVENT_LOG || 'true',
|
|
239
|
+
// 让 daemon 侧埋点落进同一次启动(甘特图把两侧合成一条时间轴)
|
|
240
|
+
...(traceId ? { [STARTUP_TRACE_ID_ENV]: traceId } : {}),
|
|
233
241
|
...(opts.diagnose ? { EVOLCORE_DIAGNOSE: '1' } : {}),
|
|
234
242
|
...(opts.bindBootstrap ? { EVOLCORE_BIND_BOOTSTRAP: '1' } : {}),
|
|
235
243
|
...(opts.webInit ? { EVOLCORE_WEB_INIT: '1' } : {}),
|
|
@@ -608,7 +616,7 @@ function printStartupInfo(opts = {}, asMode) {
|
|
|
608
616
|
const prefix = opts.running ? '✓ EvolCore is running , v' : ' EvolCore v';
|
|
609
617
|
const versionLine = `${prefix}${version}${pidPart}${componentPart}`;
|
|
610
618
|
const useStatusColor = opts.statusLayout && !!process.stdout.isTTY && !process.env.NO_COLOR;
|
|
611
|
-
console.log(useStatusColor ? `\x1b[42;
|
|
619
|
+
console.log(useStatusColor ? `\x1b[42;97;1m ${versionLine} \x1b[0m` : versionLine);
|
|
612
620
|
console.log(` 包路径: ${pkgRoot}`);
|
|
613
621
|
console.log(` EVOLCORE_HOME: ${resolveRoot()}`);
|
|
614
622
|
const installType = isNpmInstall ? 'npm全局安装' : '开发仓(link)';
|
|
@@ -638,18 +646,27 @@ export async function cmdStart(opts = {}) {
|
|
|
638
646
|
// Measure from process start so the reported time includes CLI bootstrap
|
|
639
647
|
// (tsx compilation in a dev checkout), which is what the operator waits for.
|
|
640
648
|
const cmdStartedAt = Math.min(Date.now(), Math.round(performance.timeOrigin));
|
|
649
|
+
// 启动甘特图埋点:第一个阶段到 mark 之前都算 CLI bootstrap(tsx 编译/模块加载)。
|
|
650
|
+
const trace = new StartupTracer('cli', { firstPhase: 'cli.bootstrap' });
|
|
651
|
+
const traceId = trace.id;
|
|
641
652
|
printStartupInfo(undefined, opts.asMode);
|
|
642
653
|
const p = resolvePaths();
|
|
654
|
+
trace.mark('cli.probeExistingDaemon');
|
|
643
655
|
const existingDaemon = await probeDaemon(p.socket);
|
|
644
656
|
if (existingDaemon) {
|
|
645
657
|
let hookRepaired = false;
|
|
646
|
-
|
|
658
|
+
trace.mark('cli.codexHookCheck');
|
|
659
|
+
if (!await ensureCodexHookBeforeLifecycle(() => { hookRepaired = true; })) {
|
|
660
|
+
trace.discard();
|
|
647
661
|
return;
|
|
662
|
+
}
|
|
648
663
|
if (hookRepaired) {
|
|
664
|
+
trace.discard();
|
|
649
665
|
console.log('🔄 Codex 运行组件已修复,正在自动重启服务以加载策略...');
|
|
650
666
|
await cmdRestart({ diagnose: opts.diagnose });
|
|
651
667
|
return;
|
|
652
668
|
}
|
|
669
|
+
trace.finish(true);
|
|
653
670
|
console.log(` EvolCore is already running (PID: ${existingDaemon.pid}, IPC reachable)`);
|
|
654
671
|
const runningRecord = scanInstances().mains.find(m => m.alive && m.record.pid === existingDaemon.pid)?.record;
|
|
655
672
|
console.log(` 当前 daemon ${describeRunMode(runningRecord?.runMode)}`);
|
|
@@ -658,18 +675,24 @@ export async function cmdStart(opts = {}) {
|
|
|
658
675
|
return;
|
|
659
676
|
}
|
|
660
677
|
ensureDataDirs();
|
|
661
|
-
|
|
678
|
+
trace.mark('cli.sourceBuildCheck');
|
|
679
|
+
if (!await requireFreshSourceBuild()) {
|
|
680
|
+
trace.finish(false);
|
|
662
681
|
return;
|
|
682
|
+
}
|
|
663
683
|
// A stopped container may miss the daily upgrade trigger. Check once on
|
|
664
684
|
// every real start so the service does not stay on an old installation.
|
|
685
|
+
trace.mark('cli.autoUpgradeCheck');
|
|
665
686
|
const autoUpgrade = loadDaemonConfig().upgrade?.autoOnStart !== false;
|
|
666
687
|
const versionInfo = autoUpgrade ? await ensureFreshPackageVersionInfo(undefined, { source: 'start', log: console.log }) : [];
|
|
667
688
|
if (autoUpgrade && opts.upgradeChecks)
|
|
668
689
|
await opts.upgradeChecks();
|
|
669
690
|
// 旧配置自动迁移(daemon.json → 新结构)
|
|
691
|
+
trace.mark('cli.configMigrate');
|
|
670
692
|
const { autoMigrateIfNeeded } = await import('../config-store.js');
|
|
671
693
|
autoMigrateIfNeeded();
|
|
672
694
|
// 未初始化时自动引导:无 defaults 文件且无任何 agent → 视为未初始化
|
|
695
|
+
trace.mark('cli.autoInit');
|
|
673
696
|
const defaults = loadDefaults();
|
|
674
697
|
const hasAnyAgent = loadAllAgents().agents.length > 0;
|
|
675
698
|
if (!defaults && !hasAnyAgent) {
|
|
@@ -682,12 +705,15 @@ export async function cmdStart(opts = {}) {
|
|
|
682
705
|
// 这里需显式抑制 AUN SDK 的常规 keystore 日志。
|
|
683
706
|
const { suppressSdkLogs } = await import('../aun/aid/index.js');
|
|
684
707
|
suppressSdkLogs();
|
|
708
|
+
const { cmdInit } = await import('./init.js');
|
|
685
709
|
if (!await runAutomaticInit(() => cmdInit({ invokedByStart: true }))) {
|
|
710
|
+
trace.finish(false);
|
|
686
711
|
if (process.exitCode == null)
|
|
687
712
|
console.log('⚠ 初始化未完成,未启动 EvolCore。');
|
|
688
713
|
return;
|
|
689
714
|
}
|
|
690
715
|
if (!loadDefaults()) {
|
|
716
|
+
trace.finish(false);
|
|
691
717
|
console.log('⚠ 初始化未完成,未启动 EvolCore。');
|
|
692
718
|
return;
|
|
693
719
|
}
|
|
@@ -697,16 +723,23 @@ export async function cmdStart(opts = {}) {
|
|
|
697
723
|
// The initialization path can create the first Codex agent, so perform the
|
|
698
724
|
// machine-hook check after config migration/auto-init and before any daemon
|
|
699
725
|
// process is launched.
|
|
700
|
-
|
|
726
|
+
trace.mark('cli.codexHookCheck');
|
|
727
|
+
if (!await ensureCodexHookBeforeLifecycle()) {
|
|
728
|
+
trace.finish(false);
|
|
701
729
|
return;
|
|
730
|
+
}
|
|
702
731
|
// 控制 AID 门禁:缺 aid 且交互式 → 只补全控制 AID + owner(不重走 baseagent 向导)。
|
|
703
732
|
// 非 TTY(restart-monitor/systemd/管道)不补全(无法交互),只提示后继续启动,daemon 侧 warn 兜底。
|
|
733
|
+
trace.mark('cli.controlAidCheck');
|
|
704
734
|
const daemonCfgStart = loadDaemonConfig();
|
|
705
|
-
|
|
735
|
+
// 内联了 init.ts 的 needsControlAidInit(等价于 `!aid && isTty`),
|
|
736
|
+
// 免得为一个纯函数判断把整个 init 模块拉进启动路径。
|
|
737
|
+
if (!daemonCfgStart.aid && process.stdin.isTTY) {
|
|
706
738
|
console.log('⚡ 控制 AID 未配置,自动补全...\n');
|
|
707
739
|
const { suppressSdkLogs } = await import('../aun/aid/index.js');
|
|
708
740
|
suppressSdkLogs();
|
|
709
741
|
printInitCancelHint();
|
|
742
|
+
const { initTail } = await import('./init.js');
|
|
710
743
|
if (!await runAutomaticInit(() => initTail()))
|
|
711
744
|
return;
|
|
712
745
|
return;
|
|
@@ -730,13 +763,14 @@ export async function cmdStart(opts = {}) {
|
|
|
730
763
|
suppressSdkLogs();
|
|
731
764
|
const { generateControlAid, resolveControlAidDomain } = await import('../aun/aid/control-aid.js');
|
|
732
765
|
const cfg = loadDaemonConfig();
|
|
733
|
-
const result = await generateControlAid(resolveControlAidDomain(cfg.aun?.defaultAidDomain));
|
|
766
|
+
const result = await generateControlAid(resolveControlAidDomain(cfg.aun?.defaultAidDomain), { owner: cfg.owner });
|
|
734
767
|
saveDaemonConfig({ ...cfg, aid: result.aid });
|
|
735
768
|
console.log(`✓ 新控制 AID: ${result.aid}`);
|
|
736
769
|
}
|
|
737
770
|
}
|
|
738
771
|
}
|
|
739
772
|
// 检查至少有一个 self-agent
|
|
773
|
+
trace.mark('cli.loadAgents');
|
|
740
774
|
const { agents, skipped } = loadAllAgents();
|
|
741
775
|
const isControlAidBootstrap = opts.bindBootstrap && !!daemonCfgStart.aid;
|
|
742
776
|
const shouldPrintNoSelfAgentHints = agents.length === 0 && !isControlAidBootstrap;
|
|
@@ -745,12 +779,17 @@ export async function cmdStart(opts = {}) {
|
|
|
745
779
|
console.log('ℹ 未配置任何 self-agent,绑定 bootstrap 将仅启动控制 AID');
|
|
746
780
|
}
|
|
747
781
|
}
|
|
748
|
-
|
|
782
|
+
trace.mark('cli.dataMigrationCheck');
|
|
783
|
+
if (!requireCompletedDataMigration(p.root)) {
|
|
784
|
+
trace.finish(false);
|
|
749
785
|
return;
|
|
786
|
+
}
|
|
750
787
|
// 检查 instance 目录中的进程状态
|
|
788
|
+
trace.mark('cli.scanInstances');
|
|
751
789
|
const status = scanInstances();
|
|
752
790
|
const aliveMains = status.mains.filter(m => m.alive);
|
|
753
791
|
if (aliveMains.length > 0) {
|
|
792
|
+
trace.discard();
|
|
754
793
|
const first = aliveMains[0];
|
|
755
794
|
console.log(` EvolCore is already running (PID: ${aliveMains.map(m => m.record.pid).join(', ')})`);
|
|
756
795
|
console.log(` 启动于: ${new Date(first.record.startedAtIso).toLocaleString()}`);
|
|
@@ -772,6 +811,7 @@ export async function cmdStart(opts = {}) {
|
|
|
772
811
|
return;
|
|
773
812
|
}
|
|
774
813
|
// 清理残留进程和文件
|
|
814
|
+
trace.mark('cli.cleanupStale');
|
|
775
815
|
if (status.mains.length > 0 || status.restartMonitors.length > 0) {
|
|
776
816
|
const killed = cleanupInstances();
|
|
777
817
|
if (killed.length > 0) {
|
|
@@ -785,9 +825,11 @@ export async function cmdStart(opts = {}) {
|
|
|
785
825
|
// blocker when its HOME cannot be identified.
|
|
786
826
|
// No live main reached this point, so the registry snapshot above is still
|
|
787
827
|
// the authoritative "known PID" set; avoid a second scan.
|
|
828
|
+
trace.mark('cli.orphanScan');
|
|
788
829
|
const orphans = findOrphanProcesses(status);
|
|
789
830
|
const blockingOrphans = orphans.filter(o => isRuntimeOrphan(o));
|
|
790
831
|
if (blockingOrphans.length > 0) {
|
|
832
|
+
trace.finish(false);
|
|
791
833
|
console.error(`❌ 检测到未登记的 EvolCore 进程(PID: ${blockingOrphans.map(o => o.pid).join(', ')}),已停止启动以避免重复连接 AUN。`);
|
|
792
834
|
console.error(' 请先停止这些进程,再重新执行 ec start。');
|
|
793
835
|
process.exitCode = 1;
|
|
@@ -795,11 +837,12 @@ export async function cmdStart(opts = {}) {
|
|
|
795
837
|
}
|
|
796
838
|
reportOrphans(orphans);
|
|
797
839
|
if (versionInfo.some(result => result.hasUpdate)) {
|
|
840
|
+
trace.mark('cli.launchViaMonitor');
|
|
798
841
|
cleanEnv();
|
|
799
842
|
// 这条路由 restart-monitor 拉起 daemon,同样靠覆盖文件把 --as-mode 带过去
|
|
800
843
|
const overrideFile = writeAsModeOverride(opts.asMode);
|
|
801
844
|
const launched = await launchPackageLifecycle('start', console.log, {
|
|
802
|
-
prepared: true, foreground: opts.foreground, env: buildDaemonEnv(p, opts), applyPackageUpgrades: true,
|
|
845
|
+
prepared: true, foreground: opts.foreground, env: buildDaemonEnv(p, opts, traceId), applyPackageUpgrades: true,
|
|
803
846
|
});
|
|
804
847
|
if (!launched.ok) {
|
|
805
848
|
if (!launched.pending)
|
|
@@ -812,8 +855,11 @@ export async function cmdStart(opts = {}) {
|
|
|
812
855
|
else if (!opts.foreground) {
|
|
813
856
|
console.log('📦 已交由 restart-monitor 应用缓存版本并启动服务');
|
|
814
857
|
}
|
|
858
|
+
trace.finish(launched.ok);
|
|
815
859
|
return;
|
|
816
860
|
}
|
|
861
|
+
trace.mark('cli.spawnDaemon');
|
|
862
|
+
trace.setMeta('traceId', traceId);
|
|
817
863
|
console.log('🚀 Starting EvolCore...');
|
|
818
864
|
const stdoutRotation = rotateStdoutLog(p.logs);
|
|
819
865
|
if (stdoutRotation.rotatedPath) {
|
|
@@ -826,7 +872,7 @@ export async function cmdStart(opts = {}) {
|
|
|
826
872
|
}
|
|
827
873
|
catch { }
|
|
828
874
|
const appMain = path.join(getPackageRoot(), 'dist', 'index.js');
|
|
829
|
-
const daemonEnv = buildDaemonEnv(p, opts);
|
|
875
|
+
const daemonEnv = buildDaemonEnv(p, opts, traceId);
|
|
830
876
|
if (opts.foreground) {
|
|
831
877
|
const overrideFile = writeAsModeOverride(opts.asMode);
|
|
832
878
|
const child = spawn('node', ['--no-warnings=ExperimentalWarning', appMain], {
|
|
@@ -838,15 +884,18 @@ export async function cmdStart(opts = {}) {
|
|
|
838
884
|
const childPid = child.pid;
|
|
839
885
|
if (!childPid) {
|
|
840
886
|
clearAsModeOverride(overrideFile);
|
|
887
|
+
trace.finish(false);
|
|
841
888
|
console.error('❌ Failed to start EvolCore (process creation failed)');
|
|
842
889
|
process.exit(1);
|
|
843
890
|
return;
|
|
844
891
|
}
|
|
892
|
+
trace.mark('cli.waitReady');
|
|
845
893
|
let readyHandled = false;
|
|
846
894
|
const readyTimer = setInterval(() => {
|
|
847
895
|
if (readyHandled || !fs.existsSync(p.readySignal))
|
|
848
896
|
return;
|
|
849
897
|
readyHandled = true;
|
|
898
|
+
trace.mark('cli.postReady');
|
|
850
899
|
console.log(`✓ EvolCore running in foreground (PID: ${childPid})`);
|
|
851
900
|
console.log(` EVOLCORE_HOME: ${resolveRoot()}`);
|
|
852
901
|
console.log(` Logs: ${p.logs}/`);
|
|
@@ -920,6 +969,7 @@ export async function cmdStart(opts = {}) {
|
|
|
920
969
|
windowsHide: true,
|
|
921
970
|
env: daemonEnv,
|
|
922
971
|
});
|
|
972
|
+
trace.mark('cli.waitReady');
|
|
923
973
|
const childPid = child.pid;
|
|
924
974
|
// daemon 已在启动时读走该文件;若未能起来(pid 丢失/提前退出),清掉避免影响下次启动
|
|
925
975
|
child.once('error', () => clearAsModeOverride(overrideFile));
|
|
@@ -936,6 +986,9 @@ export async function cmdStart(opts = {}) {
|
|
|
936
986
|
console.log(`✓ EvolCore started successfully (PID: ${childPid})`);
|
|
937
987
|
console.log(` EVOLCORE_HOME: ${resolveRoot()}`);
|
|
938
988
|
console.log(` Logs: ${p.logs}/`);
|
|
989
|
+
// ready 已到,先闭合 waitReady —— 后面的日志解析/代码统计是启动成功之后的开销,
|
|
990
|
+
// 单独记成 cli.postReady,不要混进"等到就绪"的时间里。
|
|
991
|
+
trace.mark('cli.postReady');
|
|
939
992
|
// 从主日志提取渠道连接摘要
|
|
940
993
|
const mainLog = findLatestLog(p.logs, 'daemon');
|
|
941
994
|
if (mainLog) {
|
|
@@ -1000,11 +1053,29 @@ export async function cmdStart(opts = {}) {
|
|
|
1000
1053
|
const ecwebStarted = await waitForExistingEcweb(p) !== null;
|
|
1001
1054
|
printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted, skipped });
|
|
1002
1055
|
}
|
|
1056
|
+
trace.finish(true);
|
|
1003
1057
|
return;
|
|
1004
1058
|
}
|
|
1005
|
-
//
|
|
1059
|
+
// 超时。ready signal 只是"启动收尾"的标志,不是服务可用性的唯一判据:
|
|
1060
|
+
// 控制面(IPC)可能已经就绪,只是后面还有慢收尾(历史数据整理、通道认证退避)。
|
|
1061
|
+
// 这种情形报红叉 + exit 1 会让部署脚本以为失败并重复启动,所以先探一次 IPC。
|
|
1006
1062
|
if (Date.now() - startTime > 30000) {
|
|
1007
|
-
|
|
1063
|
+
// 探测本身最长要 5s(Windows)。单独开一段埋点,否则这段等待会被并进
|
|
1064
|
+
// cli.waitReady,甘特图上看起来像"daemon 就绪慢了 5 秒"。
|
|
1065
|
+
trace.mark('cli.readyProbe');
|
|
1066
|
+
const ping = await probeDaemon(p.socket, DAEMON_PROBE_TIMEOUT_MS);
|
|
1067
|
+
if (ping && ping.pid === childPid) {
|
|
1068
|
+
trace.finish(true);
|
|
1069
|
+
console.log(`⚠ EvolCore started but readiness is taking long (PID: ${childPid}, ${((Date.now() - startTime) / 1000).toFixed(1)}s)`);
|
|
1070
|
+
console.log(' IPC 已可达,控制命令可用;启动收尾(历史 handoff 恢复等)仍在后台继续。');
|
|
1071
|
+
console.log(` EVOLCORE_HOME: ${resolveRoot()}`);
|
|
1072
|
+
console.log(` Logs: ${p.logs}/`);
|
|
1073
|
+
console.log(`⏱ slow-ready after ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
|
|
1074
|
+
trace.mark('cli.postReady');
|
|
1075
|
+
return;
|
|
1076
|
+
}
|
|
1077
|
+
trace.finish(false);
|
|
1078
|
+
console.log('❌ Failed to start EvolCore (ready signal timeout, IPC unreachable)');
|
|
1008
1079
|
console.log('');
|
|
1009
1080
|
console.log('📝 Error details (last 10 lines of stdout):');
|
|
1010
1081
|
if (fs.existsSync(stdoutLog)) {
|
|
@@ -1019,6 +1090,7 @@ export async function cmdStart(opts = {}) {
|
|
|
1019
1090
|
if (childExited) {
|
|
1020
1091
|
// 给进程一点时间写 ready signal(可能刚好在写入中)
|
|
1021
1092
|
if (Date.now() - startTime > 3000) {
|
|
1093
|
+
trace.finish(false);
|
|
1022
1094
|
console.log('❌ Failed to start EvolCore');
|
|
1023
1095
|
console.log('');
|
|
1024
1096
|
console.log('📝 Error details (last 10 lines of stdout):');
|
|
@@ -1044,8 +1116,9 @@ function isPidReused(pid, expectedStartedAt) {
|
|
|
1044
1116
|
function reportPidReused(pid) {
|
|
1045
1117
|
console.log(`ℹ EvolCore PID ${pid} no longer refers to the recorded process; treating it as stopped`);
|
|
1046
1118
|
}
|
|
1047
|
-
async function stopPid(pid, gracefulRequested = false, expectedStartedAt) {
|
|
1119
|
+
async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace) {
|
|
1048
1120
|
console.log(`🛑 Stopping EvolCore (PID: ${pid})...`);
|
|
1121
|
+
const pidStartMs = Date.now();
|
|
1049
1122
|
// A graceful request was accepted by the daemon that answered for this exact
|
|
1050
1123
|
// PID over IPC, so its identity is already proven; the start-time probe (a
|
|
1051
1124
|
// PowerShell launch on Windows) only guards the kill path.
|
|
@@ -1055,7 +1128,14 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt) {
|
|
|
1055
1128
|
}
|
|
1056
1129
|
if (!gracefulRequested)
|
|
1057
1130
|
platform.killProcess(pid);
|
|
1131
|
+
const waitStartMs = Date.now();
|
|
1058
1132
|
if (await platform.waitForProcessExit(pid, gracefulRequested ? 30_000 : 10_000)) {
|
|
1133
|
+
// 停止甘特图上应看到的是"进程真正退出"这一段;前面的身份校验单列,
|
|
1134
|
+
// 否则一个 PowerShell 探测会被并进等待里,看上去像退出慢。
|
|
1135
|
+
trace?.addSpan(gracefulRequested ? 'cli.waitDaemonExit' : 'cli.waitKillExit', waitStartMs, Date.now(), `PID ${pid}`);
|
|
1136
|
+
if (pidStartMs !== waitStartMs) {
|
|
1137
|
+
trace?.addSpan('cli.stopPidIdentity', pidStartMs, waitStartMs, `PID ${pid}`);
|
|
1138
|
+
}
|
|
1059
1139
|
console.log('✓ EvolCore stopped');
|
|
1060
1140
|
return true;
|
|
1061
1141
|
}
|
|
@@ -1070,8 +1150,11 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt) {
|
|
|
1070
1150
|
reportPidReused(pid);
|
|
1071
1151
|
return true;
|
|
1072
1152
|
}
|
|
1153
|
+
const forceStartMs = Date.now();
|
|
1073
1154
|
platform.killProcess(pid, true);
|
|
1074
1155
|
if (await platform.waitForProcessExit(pid, 5_000)) {
|
|
1156
|
+
trace?.addSpan('cli.killTimeout', waitStartMs, forceStartMs, `PID ${pid} 未在优雅超时内退出`);
|
|
1157
|
+
trace?.addSpan('cli.waitForcedExit', forceStartMs, Date.now(), `PID ${pid}`);
|
|
1075
1158
|
console.log('✓ EvolCore stopped (forced)');
|
|
1076
1159
|
return true;
|
|
1077
1160
|
}
|
|
@@ -1096,17 +1179,31 @@ function isRuntimeOrphan(orphan, currentHome = resolveRoot()) {
|
|
|
1096
1179
|
return Boolean(homeMatches || packageMatches);
|
|
1097
1180
|
}
|
|
1098
1181
|
export async function cmdStop() {
|
|
1182
|
+
// 停止甘特图埋点:起点取 CLI 进程启动时刻(含 tsx 编译/模块加载),
|
|
1183
|
+
// 和启动侧同一套口径——用户等的是从敲下命令到进程真的消失。
|
|
1184
|
+
const trace = new StartupTracer('cli', {
|
|
1185
|
+
kind: 'stop',
|
|
1186
|
+
processStartMs: Math.min(Date.now(), Math.round(performance.timeOrigin)),
|
|
1187
|
+
firstPhase: 'cli.bootstrap',
|
|
1188
|
+
});
|
|
1189
|
+
const cmdStartedAt = trace.startedAtMs;
|
|
1190
|
+
trace.mark('cli.scanInstances');
|
|
1099
1191
|
const status = scanInstances();
|
|
1100
1192
|
const p = resolvePaths();
|
|
1193
|
+
trace.mark('cli.orphanScan');
|
|
1101
1194
|
const initialOrphans = findOrphanProcesses(status);
|
|
1102
1195
|
const runtimeOrphans = initialOrphans.filter(orphan => isRuntimeOrphan(orphan, p.root));
|
|
1196
|
+
trace.mark('cli.probeDaemon');
|
|
1103
1197
|
const ping = await probeDaemon(p.socket);
|
|
1104
1198
|
if (ping && !hasVisibleDaemonPid(status, ping) && runtimeOrphans.length === 0) {
|
|
1105
|
-
if (rejectPidIsolatedLifecycle('stop', status, ping))
|
|
1199
|
+
if (rejectPidIsolatedLifecycle('stop', status, ping)) {
|
|
1200
|
+
trace.discard();
|
|
1106
1201
|
return;
|
|
1202
|
+
}
|
|
1107
1203
|
}
|
|
1108
1204
|
const aliveMains = status.mains.filter(m => m.alive);
|
|
1109
1205
|
if (aliveMains.length === 0 && runtimeOrphans.length === 0) {
|
|
1206
|
+
trace.discard();
|
|
1110
1207
|
console.log('⚠ EvolCore is not running');
|
|
1111
1208
|
return;
|
|
1112
1209
|
}
|
|
@@ -1115,20 +1212,46 @@ export async function cmdStop() {
|
|
|
1115
1212
|
if (runtimeOrphans.length > 0) {
|
|
1116
1213
|
console.log(`⚠ 检测到未登记的 EvolCore 进程,将一并停止: ${runtimeOrphans.map(orphan => orphan.pid).join(', ')}`);
|
|
1117
1214
|
}
|
|
1215
|
+
trace.mark('cli.requestShutdown');
|
|
1118
1216
|
const gracefulPid = ping && pids.has(ping.pid)
|
|
1119
|
-
? await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec stop', pids)
|
|
1217
|
+
? await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec stop', pids, trace.id)
|
|
1120
1218
|
: null;
|
|
1121
|
-
|
|
1219
|
+
trace.mark('cli.waitExit');
|
|
1220
|
+
const stopped = await Promise.all([...pids].map(pid => stopPid(pid, pid === gracefulPid, expectedStarts.get(pid), trace)));
|
|
1122
1221
|
if (stopped.some(result => !result)) {
|
|
1222
|
+
trace.finish(false);
|
|
1223
|
+
printStopSummary(trace, cmdStartedAt, false);
|
|
1123
1224
|
process.exitCode = 1;
|
|
1124
1225
|
return;
|
|
1125
1226
|
}
|
|
1126
1227
|
// stopPid already observed every process leave the process table, so the
|
|
1127
1228
|
// records can be cleaned immediately (same reasoning as restart-monitor).
|
|
1229
|
+
trace.mark('cli.cleanupInstances');
|
|
1128
1230
|
cleanupInstances();
|
|
1129
1231
|
if (aliveMains.length > 1) {
|
|
1130
1232
|
console.log(`⚠ 停止了 ${aliveMains.length} 个 main 实例: ${aliveMains.map(m => m.record.pid).join(', ')}`);
|
|
1131
1233
|
}
|
|
1234
|
+
trace.finish(true);
|
|
1235
|
+
printStopSummary(trace, cmdStartedAt, true);
|
|
1236
|
+
}
|
|
1237
|
+
/** 停止流程结束时打印总时长与最慢的几个阶段——慢在哪一眼能看见。 */
|
|
1238
|
+
function printStopSummary(trace, startedAtMs, ok) {
|
|
1239
|
+
const total = formatMs(Date.now() - startedAtMs);
|
|
1240
|
+
console.log(`⏱ ${ok ? 'stopped' : 'stop failed'} in ${total}`);
|
|
1241
|
+
// 慢的那一段通常在 daemon 侧(渠道断开等),CLI 只负责等。
|
|
1242
|
+
// daemon 的退出埋点在 exit(0) 前同步落盘,此刻已经能读回来。
|
|
1243
|
+
const cliSlowest = formatSlowestSpans(trace.recordedSpans, 3, /^cli\./);
|
|
1244
|
+
if (cliSlowest)
|
|
1245
|
+
console.log(` CLI ${cliSlowest}`);
|
|
1246
|
+
const daemonRecord = findTraceRecord(trace.id, 'daemon');
|
|
1247
|
+
const daemonSlowest = daemonRecord ? formatSlowestSpans(daemonRecord.spans, 3, /^daemon\./) : '';
|
|
1248
|
+
if (daemonSlowest) {
|
|
1249
|
+
console.log(` daemon ${daemonSlowest}`);
|
|
1250
|
+
}
|
|
1251
|
+
else if (ok) {
|
|
1252
|
+
// 没有 daemon 记录说明它没走优雅退出(被强制结束或提前退出),这本身是信息。
|
|
1253
|
+
console.log(' daemon 无退出埋点(未走优雅退出,或版本不同)');
|
|
1254
|
+
}
|
|
1132
1255
|
}
|
|
1133
1256
|
export async function cmdRestart(opts = {}) {
|
|
1134
1257
|
const cmdStartedAt = Date.now();
|
|
@@ -1649,7 +1772,7 @@ async function collectStatusSnapshot() {
|
|
|
1649
1772
|
diagnostics.push({
|
|
1650
1773
|
code: 'AGENT_STATUS_UNAVAILABLE', message: 'Agent 列表状态不可用',
|
|
1651
1774
|
});
|
|
1652
|
-
const host = statusResponse?.host ?? readHostInfo(readLocalPackageVersion());
|
|
1775
|
+
const host = statusResponse?.host ?? readHostInfo(readLocalPackageVersion(), resolvePaths().root);
|
|
1653
1776
|
const packageRoot = getPackageRoot();
|
|
1654
1777
|
const runMode = statusResponse?.runMode ?? mainRecord?.runMode ?? null;
|
|
1655
1778
|
return {
|
|
@@ -1666,10 +1789,10 @@ async function collectStatusSnapshot() {
|
|
|
1666
1789
|
daemonExecution: statusResponse?.build?.runtimeMode ?? null,
|
|
1667
1790
|
processMetrics: readProcessMetrics(pid, processVisible),
|
|
1668
1791
|
},
|
|
1669
|
-
versions: {
|
|
1670
|
-
|
|
1671
|
-
|
|
1672
|
-
},
|
|
1792
|
+
versions: await (async () => {
|
|
1793
|
+
const { readVersionInfo } = await import('../utils/machine-info.js');
|
|
1794
|
+
return readVersionInfo();
|
|
1795
|
+
})(),
|
|
1673
1796
|
daemon: {
|
|
1674
1797
|
pid, uptimeMs: statusResponse?.uptime ?? ping?.uptime ?? null,
|
|
1675
1798
|
ipc: { reachable: statusAvailable, latencyMs },
|
|
@@ -1718,7 +1841,7 @@ function renderStatusHeader(snapshot) {
|
|
|
1718
1841
|
const versionLine = `✓ EvolCore is running , v${versions.evolcore ?? '?'} (PID: ${daemon.pid})`
|
|
1719
1842
|
+ ` ec-web v${versions.ecweb ?? '?'} fastaun v${versions.fastaun ?? '?'}`;
|
|
1720
1843
|
const useColor = !!process.stdout.isTTY && !process.env.NO_COLOR;
|
|
1721
|
-
console.log(useColor ? `\x1b[42;
|
|
1844
|
+
console.log(useColor ? `\x1b[42;97;1m ${versionLine} \x1b[0m` : versionLine);
|
|
1722
1845
|
console.log(` 包路径: ${runtime.packagePath}`);
|
|
1723
1846
|
console.log(` EVOLCORE_HOME: ${runtime.evolcoreHome}`);
|
|
1724
1847
|
const installType = runtime.installationType === 'npm-global' ? 'npm全局安装' : '开发仓(link)';
|
|
@@ -1738,8 +1861,10 @@ function renderStatusSnapshot(snapshot) {
|
|
|
1738
1861
|
console.log(`🔄 EvolCore 正在重启,daemon 尚未就绪(monitor PID: ${snapshot.daemon.restartMonitorPids.join(', ')})`);
|
|
1739
1862
|
}
|
|
1740
1863
|
else {
|
|
1741
|
-
|
|
1742
|
-
: '⚠ 无法确认 EvolCore 运行状态:IPC 不可用。'
|
|
1864
|
+
const statusLine = snapshot.overall.status === 'stopped' ? '⚠ EvolCore is not running'
|
|
1865
|
+
: '⚠ 无法确认 EvolCore 运行状态:IPC 不可用。';
|
|
1866
|
+
const useColor = snapshot.overall.status === 'stopped' && !!process.stdout.isTTY && !process.env.NO_COLOR;
|
|
1867
|
+
console.log(useColor ? `\x1b[48;2;255;165;0;97;1m ${statusLine} \x1b[0m` : statusLine);
|
|
1743
1868
|
}
|
|
1744
1869
|
for (const diagnostic of snapshot.diagnostics)
|
|
1745
1870
|
console.log(` ⚠ ${diagnostic.message}`);
|
|
@@ -1758,7 +1883,7 @@ export async function cmdStatus(options = {}) {
|
|
|
1758
1883
|
renderStatusSnapshot(snapshot);
|
|
1759
1884
|
}
|
|
1760
1885
|
// Log line pattern: [timestamp] [LEVEL] [Module?] message
|
|
1761
|
-
const LOG_RE = /^(\[[^\]]+\]) (\[(?:INFO|WARN|ERROR|
|
|
1886
|
+
const LOG_RE = /^(\[[^\]]+\]) (\[(?:TRACE|DEBUG|INFO|WARN|ERROR|FATAL)\]) ((?:\[[^\]]+\] )*)(.*)$/;
|
|
1762
1887
|
const MAX_MSG = 200; // truncate long messages
|
|
1763
1888
|
function makeColors(enabled) {
|
|
1764
1889
|
const e = (code) => enabled ? code : '';
|
|
@@ -1768,31 +1893,20 @@ function makeColors(enabled) {
|
|
|
1768
1893
|
magenta: e('\x1b[35m'), gray: e('\x1b[90m'),
|
|
1769
1894
|
};
|
|
1770
1895
|
}
|
|
1771
|
-
function renderLogLine(line, opts) {
|
|
1896
|
+
export function renderLogLine(line, opts) {
|
|
1772
1897
|
const m = line.match(LOG_RE);
|
|
1773
1898
|
if (!m)
|
|
1774
1899
|
return line; // passthrough non-standard lines (stack traces etc.)
|
|
1775
1900
|
const [, ts, levelTag, modulePart, msg] = m;
|
|
1776
1901
|
const level = levelTag.slice(1, -1); // strip brackets
|
|
1777
|
-
|
|
1778
|
-
|
|
1779
|
-
const want = opts.level.toUpperCase();
|
|
1780
|
-
if (want === 'ERROR' && level !== 'ERROR')
|
|
1781
|
-
return null;
|
|
1782
|
-
if (want === 'WARN' && level !== 'WARN' && level !== 'ERROR')
|
|
1783
|
-
return null;
|
|
1784
|
-
}
|
|
1785
|
-
// Module filter (case-insensitive substring match)
|
|
1786
|
-
if (opts.module) {
|
|
1787
|
-
const mod = modulePart.toLowerCase();
|
|
1788
|
-
if (!mod.includes(opts.module.toLowerCase()))
|
|
1789
|
-
return null;
|
|
1790
|
-
}
|
|
1902
|
+
if (!matchesLogFilters(line, opts))
|
|
1903
|
+
return null;
|
|
1791
1904
|
// Truncate long messages (always, regardless of color)
|
|
1792
1905
|
const truncated = msg.length > MAX_MSG ? msg.slice(0, MAX_MSG) + '…' : msg;
|
|
1793
1906
|
const C = makeColors(opts.color);
|
|
1794
1907
|
// Color by level
|
|
1795
|
-
const levelColor = level === 'ERROR'
|
|
1908
|
+
const levelColor = level === 'ERROR' || level === 'FATAL' ? C.red
|
|
1909
|
+
: level === 'WARN' ? C.yellow : level === 'DEBUG' || level === 'TRACE' ? C.gray : '';
|
|
1796
1910
|
// Highlight user messages: [channel] channelId: text
|
|
1797
1911
|
const isUserMsg = modulePart && /^\S+: .+$/.test(truncated);
|
|
1798
1912
|
const renderedMsg = isUserMsg
|
|
@@ -1804,6 +1918,18 @@ function renderLogLine(line, opts) {
|
|
|
1804
1918
|
(modulePart ? ' ' : '') +
|
|
1805
1919
|
renderedMsg);
|
|
1806
1920
|
}
|
|
1921
|
+
export function matchesLogFilters(line, opts) {
|
|
1922
|
+
const match = line.match(LOG_RE);
|
|
1923
|
+
if (!match)
|
|
1924
|
+
return !opts.level && !opts.module;
|
|
1925
|
+
const [, , levelTag, modulePart] = match;
|
|
1926
|
+
const level = levelTag.slice(1, -1);
|
|
1927
|
+
if (opts.level && (logLevelRank(level) ?? 2) < (logLevelRank(opts.level.toUpperCase()) ?? 2))
|
|
1928
|
+
return false;
|
|
1929
|
+
if (opts.module && !modulePart.toLowerCase().includes(opts.module.toLowerCase()))
|
|
1930
|
+
return false;
|
|
1931
|
+
return true;
|
|
1932
|
+
}
|
|
1807
1933
|
function findLatestLog(logDir, baseName) {
|
|
1808
1934
|
if (!fs.existsSync(logDir))
|
|
1809
1935
|
return null;
|
|
@@ -1819,13 +1945,62 @@ function findLatestLog(logDir, baseName) {
|
|
|
1819
1945
|
return null;
|
|
1820
1946
|
return path.join(logDir, files[files.length - 1]);
|
|
1821
1947
|
}
|
|
1822
|
-
export function cmdLogs(args) {
|
|
1948
|
+
export async function cmdLogs(args) {
|
|
1823
1949
|
const raw = args.includes('--raw');
|
|
1824
1950
|
const noColor = args.includes('--no-color');
|
|
1825
1951
|
const levelIdx = args.indexOf('--level');
|
|
1826
1952
|
const moduleIdx = args.indexOf('--module');
|
|
1827
1953
|
const level = levelIdx !== -1 ? args[levelIdx + 1] : undefined;
|
|
1828
1954
|
const module = moduleIdx !== -1 ? args[moduleIdx + 1] : undefined;
|
|
1955
|
+
if (process.env.EVOLCORE_SESSION_ID) {
|
|
1956
|
+
if (raw) {
|
|
1957
|
+
const reason = '--raw is unavailable in managed tasks; use it from the host terminal';
|
|
1958
|
+
console.error(`EVOLCORE_TOOL_ERROR_V1 ${JSON.stringify({
|
|
1959
|
+
errorCode: 'POLICY_DENIED', decisionSource: 'policy', policyCode: 'managed_logs_raw', reason,
|
|
1960
|
+
})}`);
|
|
1961
|
+
console.error(`❌ [NOT_ALLOWED] ${reason}`);
|
|
1962
|
+
process.exitCode = 1;
|
|
1963
|
+
return;
|
|
1964
|
+
}
|
|
1965
|
+
try {
|
|
1966
|
+
const statusArgs = ['logs', ...args];
|
|
1967
|
+
const result = await ipcQuery(resolvePaths().socket, {
|
|
1968
|
+
type: 'logs.query',
|
|
1969
|
+
argv: statusArgs,
|
|
1970
|
+
sessionId: process.env.EVOLCORE_SESSION_ID,
|
|
1971
|
+
delegationToken: readDelegationCredential(),
|
|
1972
|
+
delegationCommandHash: hashCurrentDelegatedCommand(),
|
|
1973
|
+
}, 10_000, { throwOnError: true });
|
|
1974
|
+
if (!result?.ok) {
|
|
1975
|
+
const reason = result?.error || 'logs 权限校验失败';
|
|
1976
|
+
const errorCode = result?.code === 'NOT_ALLOWED' ? 'ROLE_DENIED' : 'EXECUTION_FAILED';
|
|
1977
|
+
console.error(`EVOLCORE_TOOL_ERROR_V1 ${JSON.stringify({
|
|
1978
|
+
errorCode, decisionSource: result?.code === 'NOT_ALLOWED' ? 'policy' : 'infrastructure',
|
|
1979
|
+
policyCode: result?.code || 'managed_logs_query', reason,
|
|
1980
|
+
})}`);
|
|
1981
|
+
console.error(`❌ [${result?.code || 'LOGS_QUERY_FAILED'}] ${reason}`);
|
|
1982
|
+
process.exitCode = 1;
|
|
1983
|
+
return;
|
|
1984
|
+
}
|
|
1985
|
+
const rows = Array.isArray(result.data?.lines) ? result.data.lines : [];
|
|
1986
|
+
const managedOpts = { level, module, color: false };
|
|
1987
|
+
for (const row of rows) {
|
|
1988
|
+
const line = typeof row?.raw === 'string' ? row.raw : JSON.stringify(row);
|
|
1989
|
+
const rendered = renderLogLine(line, { color: managedOpts.color });
|
|
1990
|
+
if (rendered !== null)
|
|
1991
|
+
process.stdout.write(rendered + '\n');
|
|
1992
|
+
}
|
|
1993
|
+
}
|
|
1994
|
+
catch (error) {
|
|
1995
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
1996
|
+
console.error(`EVOLCORE_TOOL_ERROR_V1 ${JSON.stringify({
|
|
1997
|
+
errorCode: 'EXECUTION_FAILED', decisionSource: 'infrastructure', policyCode: 'managed_logs_ipc', reason,
|
|
1998
|
+
})}`);
|
|
1999
|
+
console.error(`❌ logs 查询失败:${reason}`);
|
|
2000
|
+
process.exitCode = 1;
|
|
2001
|
+
}
|
|
2002
|
+
return;
|
|
2003
|
+
}
|
|
1829
2004
|
const p = resolvePaths();
|
|
1830
2005
|
const mainLog = findLatestLog(p.logs, 'daemon');
|
|
1831
2006
|
if (!mainLog) {
|
|
@@ -1844,7 +2019,14 @@ export function cmdLogs(args) {
|
|
|
1844
2019
|
const existing = fs.readFileSync(mainLog, 'utf-8').split('\n').slice(-51);
|
|
1845
2020
|
if (existing.length && existing[existing.length - 1] === '')
|
|
1846
2021
|
existing.pop();
|
|
1847
|
-
|
|
2022
|
+
if (raw) {
|
|
2023
|
+
for (const line of existing) {
|
|
2024
|
+
if (matchesLogFilters(line, { level, module }))
|
|
2025
|
+
process.stdout.write(line + '\n');
|
|
2026
|
+
}
|
|
2027
|
+
}
|
|
2028
|
+
else
|
|
2029
|
+
existing.forEach(processLine);
|
|
1848
2030
|
if (raw) {
|
|
1849
2031
|
// Raw mode: poll without rendering
|
|
1850
2032
|
let currentFile = mainLog;
|
|
@@ -1883,7 +2065,7 @@ export function cmdLogs(args) {
|
|
|
1883
2065
|
const parts = (pending + buf.toString('utf-8')).split('\n');
|
|
1884
2066
|
pending = parts.pop() || '';
|
|
1885
2067
|
for (const line of parts) {
|
|
1886
|
-
if (line)
|
|
2068
|
+
if (line && matchesLogFilters(line, { level, module }))
|
|
1887
2069
|
process.stdout.write(line + '\n');
|
|
1888
2070
|
}
|
|
1889
2071
|
}, 200);
|
|
@@ -1996,7 +2178,7 @@ function compactAunLog(line, color) {
|
|
|
1996
2178
|
return `${lc}[${level}]${RST_CONST}${mc}[${mod}]${RST_CONST}${aidPart} ${rest}`;
|
|
1997
2179
|
}
|
|
1998
2180
|
// Pattern 2: [AiBotSDK] [LEVEL] msg (WeCom SDK logs)
|
|
1999
|
-
const m2 = line.match(/^\[([^\]]+)\] \[(DEBUG|INFO|WARN|ERROR)\] (.*)/s);
|
|
2181
|
+
const m2 = line.match(/^\[([^\]]+)\] \[(TRACE|DEBUG|INFO|WARN|ERROR|FATAL)\] (.*)/s);
|
|
2000
2182
|
if (m2) {
|
|
2001
2183
|
const [, sdk, level, rest] = m2;
|
|
2002
2184
|
const lc = LEVEL_COLORS[level] || '';
|
|
@@ -2004,7 +2186,7 @@ function compactAunLog(line, color) {
|
|
|
2004
2186
|
return `${lc}[${level}]${RST_CONST}${mc}[${sdk}]${RST_CONST} ${rest}`;
|
|
2005
2187
|
}
|
|
2006
2188
|
// Pattern 3: [LEVEL] [Module] msg or [LEVEL] msg (evolcore main log after stripTimestamp)
|
|
2007
|
-
const m3 = line.match(/^\[(DEBUG|INFO|WARN|ERROR)\] (?:\[([^\]]+)\] )?(.*)/s);
|
|
2189
|
+
const m3 = line.match(/^\[(TRACE|DEBUG|INFO|WARN|ERROR|FATAL)\] (?:\[([^\]]+)\] )?(.*)/s);
|
|
2008
2190
|
if (m3) {
|
|
2009
2191
|
const [, level, mod, rest] = m3;
|
|
2010
2192
|
const lc = LEVEL_COLORS[level] || '';
|
|
@@ -2018,10 +2200,12 @@ function compactAunLog(line, color) {
|
|
|
2018
2200
|
}
|
|
2019
2201
|
const RST_CONST = '\x1b[0m';
|
|
2020
2202
|
const LEVEL_COLORS = {
|
|
2203
|
+
TRACE: '\x1b[2m',
|
|
2021
2204
|
DEBUG: '\x1b[2m', // dim
|
|
2022
2205
|
INFO: '\x1b[36m', // cyan
|
|
2023
2206
|
WARN: '\x1b[33m', // yellow
|
|
2024
2207
|
ERROR: '\x1b[31m', // red
|
|
2208
|
+
FATAL: '\x1b[31m', // red
|
|
2025
2209
|
};
|
|
2026
2210
|
const moduleColorPool = [
|
|
2027
2211
|
'\x1b[35m', // magenta
|