evolcore 0.0.43-test.6 → 0.0.43-test.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +95 -0
- package/bin/ecmsg.js +188 -58
- package/dist/agent-template/jobs.js +62 -0
- package/dist/agent-template/runtime.js +214 -0
- package/dist/agent-template/service.js +465 -0
- package/dist/agent-template/tool-runner.js +45 -0
- package/dist/agent-template/types.js +5 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/claude-runner.js +1 -1
- package/dist/agents/codex/app-server-client.js +22 -0
- package/dist/agents/codex-runner.js +69 -2
- package/dist/aun/aid/agentmd.js +56 -1
- package/dist/aun/aid/client.js +3 -1
- package/dist/aun/menu/client.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/channels/aun.js +277 -49
- package/dist/cli/agent-command.js +5 -0
- package/dist/cli/agent-create.js +7 -3
- package/dist/cli/agent-template.js +124 -0
- package/dist/cli/aun-commands.js +2 -2
- package/dist/cli/ctl-command.js +2 -1
- package/dist/cli/daemon-commands.js +11 -66
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +35 -2
- package/dist/cli/events-command.js +109 -0
- package/dist/cli/index.js +60 -14
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/net-check.js +1 -1
- package/dist/cli/restart-monitor.js +160 -83
- package/dist/cli/services-command.js +137 -0
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +103 -13
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +8 -8
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +0 -7
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/schema-migration.js +45 -15
- package/dist/config-store.js +2 -1
- package/dist/core/agent-ipc-registration.js +25 -4
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +106 -10
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-authorizer.js +2 -0
- package/dist/core/auth/operation-catalog.js +29 -0
- package/dist/core/baseagent-loader.js +60 -130
- package/dist/core/channel-loader.js +10 -1
- package/dist/core/channel-runtime.js +20 -12
- package/dist/core/command/agent-control.js +12 -2
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/agent-template-menu.js +147 -0
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +80 -17
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +468 -0
- package/dist/core/command/menu-catalog.js +15 -0
- package/dist/core/command/menu-handler.js +216 -90
- package/dist/core/command/menu-protocol.js +71 -13
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +22 -5
- package/dist/core/daemon-lifecycle.js +323 -191
- package/dist/core/handoff/runtime.js +45 -13
- package/dist/core/invoke/executors/index.js +13 -0
- package/dist/core/invoke/executors/media.js +283 -0
- package/dist/core/invoke/executors/text.js +198 -0
- package/dist/core/invoke/invoke-service.js +157 -0
- package/dist/core/invoke/style-router.js +48 -0
- package/dist/core/invoke/types.js +19 -0
- package/dist/core/ipc-registration.js +50 -7
- package/dist/core/legacy-rename.js +41 -0
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +252 -17
- package/dist/core/message/im-renderer.js +116 -85
- package/dist/core/message/message-bridge.js +4 -0
- package/dist/core/message/message-queue.js +66 -15
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/pending-hints.js +29 -5
- package/dist/core/message/response-engine.js +194 -61
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +50 -5
- package/dist/core/ownership/owner-resolver.js +7 -0
- package/dist/core/pack-auth.js +94 -0
- package/dist/core/pack-install.js +194 -0
- package/dist/core/permission/ec-command-parser.js +51 -17
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/rate-window.js +48 -0
- package/dist/core/relation/peer-identity.js +28 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +67 -28
- package/dist/core/session/session-idle-monitor.js +59 -19
- package/dist/core/session/session-manager.js +13 -4
- package/dist/core/task/task-recovery-service.js +13 -2
- package/dist/core/thread/command-parser.js +9 -2
- package/dist/core/thread/thread-operation.js +21 -2
- package/dist/core/thread/thread-route.js +13 -2
- package/dist/core/thread/thread-service.js +52 -3
- package/dist/directory/owner-directory-admission.js +40 -53
- package/dist/directory/owner-directory-cache.js +89 -113
- package/dist/directory/owner-directory-query-operation.js +8 -10
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/eck/message-renderer.js +2 -0
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +6 -2
- package/dist/ecweb/runtime/supervisor.js +19 -4
- package/dist/event-center/admission-materializer.js +124 -0
- package/dist/event-center/bus-gate.js +154 -0
- package/dist/event-center/bus-host.js +307 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +127 -0
- package/dist/event-center/daemon.js +44 -0
- package/dist/event-center/directory-source.js +55 -0
- package/dist/event-center/dispatcher.js +157 -0
- package/dist/event-center/event-log.js +110 -0
- package/dist/event-center/index-generator.js +73 -0
- package/dist/event-center/ipc-operation.js +423 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +207 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +463 -0
- package/dist/event-center/runtime.js +837 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +51 -0
- package/dist/event-center/validation.js +435 -0
- package/dist/index.js +424 -135
- package/dist/ipc.js +106 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +5 -1
- package/dist/proxy/service-supervisor.js +13 -4
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/engines/v1/proactive-flow.js +4 -2
- package/dist/response-system/modes/single-session/index.js +1 -1
- package/dist/services/dispatcher.js +100 -0
- package/dist/services/idempotency.js +90 -0
- package/dist/services/identity.js +52 -0
- package/dist/services/index-generator.js +70 -0
- package/dist/services/index.js +449 -0
- package/dist/services/ipc-operation.js +550 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +215 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +98 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +18 -0
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/scheduler.js +38 -0
- package/dist/trigger/script-sandbox.js +170 -24
- package/dist/utils/cross-platform.js +24 -10
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +2 -1
- package/dist/utils/package-version-info.js +6 -3
- package/dist/utils/process-introspect.js +45 -9
- package/dist/utils/startup-trace.js +74 -37
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +9 -15
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +3 -1
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/agent.md +22 -1
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/event-center.md +227 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +5 -3
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-protocol.md +28 -1
- package/kits/docs/evolcore/msg.md +21 -9
- package/kits/docs/evolcore/provider.md +3 -1
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +294 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/docs/evolcore/thread-chain.md +15 -3
- package/kits/eck_manifest.json +26 -0
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +1 -0
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-group/SKILL.md +5 -8
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/personal-assistant/SKILL.md +6 -6
- package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
- package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
- package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
- package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/reply.md +1 -5
- package/kits/templates/system-fragments/thread.md +13 -10
- package/package.json +5 -6
- package/scripts/agent-template/index.mjs +40 -0
- package/scripts/agent-template/inspect.mjs +240 -0
- package/scripts/agent-template/overlay.mjs +71 -0
- package/scripts/agent-template/pack.mjs +169 -0
- package/scripts/agent-template/shared/common.mjs +235 -0
- package/scripts/agent-template/shared/evolcore.mjs +75 -0
- package/scripts/agent-template/shared/plan.mjs +129 -0
- package/scripts/agent-template/shared/team-schema.json +70 -0
- package/scripts/agent-template/shared/template-contract.mjs +154 -0
- package/scripts/agent-template/shared/template-package.mjs +265 -0
- package/scripts/agent-template/shared/template-runtime.mjs +80 -0
- package/scripts/agent-template/shared/template.mjs +142 -0
- package/dist/cli/pa-workspace-command.js +0 -225
- package/dist/core/command/pa-workspace-store.js +0 -468
- package/dist/core/relation/pa-team.js +0 -132
- package/kits/docs/evolcore/pa-workspace.md +0 -51
- package/kits/skills/aid-ability/SKILL.md +0 -244
- package/kits/skills/ec-ability/SKILL.md +0 -67
- package/kits/skills/ec-ability/references/workflows.md +0 -15
|
@@ -9,15 +9,14 @@ import * as platform from '../utils/cross-platform.js';
|
|
|
9
9
|
import { EventBus } from '../core/event-bus.js';
|
|
10
10
|
import { applyCachedPackageUpgrades, recordPackageUpgrade } from '../utils/package-version-info.js';
|
|
11
11
|
import { acknowledgeUpgradeRestart, readUpgradeJob, updateUpgradeJob } from '../utils/upgrade-jobs.js';
|
|
12
|
-
import { isValidAid } from '../aun/aid/
|
|
13
|
-
import { msgSend } from '../aun/msg/index.js';
|
|
12
|
+
import { isValidAid } from '../aun/aid/validation.js';
|
|
14
13
|
import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner, findOrphanProcesses, killOrphans, updateRestartMonitorPhase } from '../utils/instance-registry.js';
|
|
15
|
-
import { CHANNEL_LOGS_ENV, MAIN_PACKAGE_NAME, RESTART_REQUEST_ID_ENV } from '../product.js';
|
|
14
|
+
import { CHANNEL_LOGS_ENV, MAIN_PACKAGE_NAME, RESTART_REQUEST_ID_ENV, TARGET_PACKAGE_ROOT_ENV } from '../product.js';
|
|
16
15
|
import { readRestartRequest, updateRestartRequest, removeRestartRequest, shouldSuppressRealRestart } from '../utils/restart-safety.js';
|
|
17
16
|
import { rotateStdoutLog } from '../utils/log-writer.js';
|
|
18
17
|
import { applyDataMigration, finalizeDataMigration, planDataMigration, verifyDataMigration, } from '../core/data-migration.js';
|
|
19
|
-
import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-
|
|
20
|
-
import {
|
|
18
|
+
import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-lifecycle-client.js';
|
|
19
|
+
import { getProcessStartTimeAsync, getProcessSnapshotAsync, invalidateProcessSnapshot, startTimeMatches } from '../utils/process-introspect.js';
|
|
21
20
|
import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode } from '../config/daemon-services.js';
|
|
22
21
|
import { stopEcwebForRestart } from '../ecweb/runtime/lifecycle.js';
|
|
23
22
|
import { StartupTracer, STARTUP_TRACE_ID_ENV } from '../utils/startup-trace.js';
|
|
@@ -89,7 +88,7 @@ async function finishSuccessfulRestart() {
|
|
|
89
88
|
* exactly `getPackageRoot()` and behaviour is unchanged.
|
|
90
89
|
*/
|
|
91
90
|
function targetPackageRoot() {
|
|
92
|
-
return process.env
|
|
91
|
+
return process.env[TARGET_PACKAGE_ROOT_ENV] || getPackageRoot();
|
|
93
92
|
}
|
|
94
93
|
// 清理 Claude Code 环境变量,防止 SDK 认为是嵌套会话
|
|
95
94
|
function cleanEnv() {
|
|
@@ -101,10 +100,10 @@ function cleanEnv() {
|
|
|
101
100
|
delete process.env[key];
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
|
-
function isPidReused(pid, expectedStartedAt) {
|
|
103
|
+
async function isPidReused(pid, expectedStartedAt) {
|
|
105
104
|
if (expectedStartedAt === undefined)
|
|
106
105
|
return false;
|
|
107
|
-
const actualStartedAt =
|
|
106
|
+
const actualStartedAt = await getProcessStartTimeAsync(pid);
|
|
108
107
|
return actualStartedAt !== null && !startTimeMatches(expectedStartedAt, actualStartedAt);
|
|
109
108
|
}
|
|
110
109
|
function reportPidReused(pid, log) {
|
|
@@ -159,7 +158,7 @@ export async function cmdRestartMonitor() {
|
|
|
159
158
|
}
|
|
160
159
|
// 单实例保护:pre-check + post-write 自检(同 main 进程)
|
|
161
160
|
{
|
|
162
|
-
const pre = scanInstances();
|
|
161
|
+
const pre = scanInstances({ kind: 'restart-monitor', includeAidActivity: false });
|
|
163
162
|
const aliveOthers = pre.restartMonitors.filter(m => m.alive && m.record.pid !== process.pid);
|
|
164
163
|
if (aliveOthers.length > 0) {
|
|
165
164
|
log(`Another restart-monitor already running (PID: ${aliveOthers.map(m => m.record.pid).join(', ')}), exiting`);
|
|
@@ -202,7 +201,7 @@ export async function cmdRestartMonitor() {
|
|
|
202
201
|
const isServiceAlive = async () => {
|
|
203
202
|
if (!fs.existsSync(p.readySignal))
|
|
204
203
|
return false;
|
|
205
|
-
const s = scanInstances();
|
|
204
|
+
const s = scanInstances({ kind: 'main', includeAidActivity: false });
|
|
206
205
|
if (!s.mains.some(m => m.alive))
|
|
207
206
|
return false;
|
|
208
207
|
return true;
|
|
@@ -211,7 +210,7 @@ export async function cmdRestartMonitor() {
|
|
|
211
210
|
if (!hasCorrelatedRequest)
|
|
212
211
|
return;
|
|
213
212
|
const requesterPid = readRestartRequest(pendingFile, requestId)?.requesterPid;
|
|
214
|
-
const daemonPid = scanInstances().mains.find(item => item.alive && item.record.pid !== requesterPid)?.record.pid;
|
|
213
|
+
const daemonPid = scanInstances({ kind: 'main', includeAidActivity: false }).mains.find(item => item.alive && item.record.pid !== requesterPid)?.record.pid;
|
|
215
214
|
if (daemonPid && updateRestartRequest(pendingFile, requestId, { status: 'ready', daemonPid })) {
|
|
216
215
|
if (upgradeJob && !readUpgradeJob(upgradeJob.jobId)?.lifecycle)
|
|
217
216
|
updateUpgradeJob(upgradeJob.jobId, { lifecycle: { status: 'ready', at: new Date().toISOString() } });
|
|
@@ -226,6 +225,7 @@ export async function cmdRestartMonitor() {
|
|
|
226
225
|
const trace = new StartupTracer('restart-monitor', {
|
|
227
226
|
traceId: process.env[STARTUP_TRACE_ID_ENV] || undefined,
|
|
228
227
|
firstPhase: 'monitor.bootstrap',
|
|
228
|
+
initialPhase: 'running',
|
|
229
229
|
});
|
|
230
230
|
delete process.env[STARTUP_TRACE_ID_ENV];
|
|
231
231
|
trace.setMeta('operation', 'restart');
|
|
@@ -277,23 +277,25 @@ export async function cmdRestartMonitor() {
|
|
|
277
277
|
}
|
|
278
278
|
}
|
|
279
279
|
updateRestartMonitorPhase(process.pid, 'accepted');
|
|
280
|
-
trace.mark('monitor.stopDaemon');
|
|
280
|
+
trace.mark('monitor.stopDaemon', undefined, { initialPhase: 'running' });
|
|
281
281
|
log('Restart monitor accepted after migration preflight and monitor election');
|
|
282
282
|
if (upgradeJob) {
|
|
283
283
|
updateUpgradeJob(upgradeJob.jobId, { status: 'restart-started', success: true, phase: 'restart' }, '预检通过,已进入重启执行;不代表新进程已就绪');
|
|
284
|
-
await acknowledgeUpgradeRestart(upgradeJob.jobId);
|
|
284
|
+
await trace.waitForDependency(acknowledgeUpgradeRestart(upgradeJob.jobId), 'upgrade restart acknowledgement');
|
|
285
285
|
}
|
|
286
286
|
// Test daemons live in one temporary HOME per test, so the current HOME's
|
|
287
287
|
// instance registry cannot see them. Their strict environment markers make
|
|
288
288
|
// them safe to reap globally on every real restart. Keep one process-table
|
|
289
289
|
// snapshot for both orphan categories; each Windows CIM scan is expensive.
|
|
290
|
-
const
|
|
290
|
+
const beforeStopSnapshot = await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection before shutdown');
|
|
291
|
+
let oldStatus = scanInstances({ includeAidActivity: false, processSnapshot: beforeStopSnapshot });
|
|
292
|
+
const orphanSnapshot = findOrphanProcesses(oldStatus, beforeStopSnapshot);
|
|
291
293
|
{
|
|
292
294
|
const leakedTestDaemons = orphanSnapshot.filter(o => o.confirmedTestDaemon);
|
|
293
295
|
if (leakedTestDaemons.length > 0) {
|
|
294
296
|
const killed = killOrphans(leakedTestDaemons);
|
|
295
297
|
log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
|
|
296
|
-
await sleep(500);
|
|
298
|
+
await trace.waitForDependency(sleep(500), 'test daemon exit');
|
|
297
299
|
}
|
|
298
300
|
}
|
|
299
301
|
// A stale instance record can disappear while the real Windows process is
|
|
@@ -312,17 +314,17 @@ export async function cmdRestartMonitor() {
|
|
|
312
314
|
const pids = runtimeOrphans.map(o => o.pid).join(', ');
|
|
313
315
|
log(`Stopping unregistered EvolCore process(es): ${pids}`);
|
|
314
316
|
const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
|
|
315
|
-
const ping = await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor orphan cleanup', orphanPids);
|
|
317
|
+
const ping = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor orphan cleanup', orphanPids), 'old daemon shutdown acknowledgement');
|
|
316
318
|
for (const orphan of runtimeOrphans) {
|
|
317
319
|
if (orphan.pid !== ping)
|
|
318
320
|
platform.killProcess(orphan.pid, false);
|
|
319
321
|
}
|
|
320
|
-
const exited = await Promise.all(runtimeOrphans.map(async (orphan) => {
|
|
322
|
+
const exited = await trace.waitForDependency(Promise.all(runtimeOrphans.map(async (orphan) => {
|
|
321
323
|
if (await platform.waitForProcessExit(orphan.pid, orphan.pid === ping ? 30_000 : 10_000))
|
|
322
324
|
return true;
|
|
323
325
|
platform.killProcess(orphan.pid, true);
|
|
324
326
|
return platform.waitForProcessExit(orphan.pid, 5_000);
|
|
325
|
-
}));
|
|
327
|
+
})), 'unregistered daemon exit');
|
|
326
328
|
if (exited.some(result => !result)) {
|
|
327
329
|
const message = `未登记的 EvolCore 进程仍未退出(PID: ${pids}),已停止重启以避免重复连接 AUN。`;
|
|
328
330
|
log(message);
|
|
@@ -330,15 +332,18 @@ export async function cmdRestartMonitor() {
|
|
|
330
332
|
process.exit(1);
|
|
331
333
|
}
|
|
332
334
|
cleanupInstances();
|
|
335
|
+
// Orphan shutdown can take seconds; do not reuse its pre-shutdown view of mains.
|
|
336
|
+
invalidateProcessSnapshot();
|
|
337
|
+
const snapshot = await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection after orphan cleanup');
|
|
338
|
+
oldStatus = scanInstances({ includeAidActivity: false, processSnapshot: snapshot });
|
|
333
339
|
}
|
|
334
340
|
// 等待所有活 main 进程退出(可能不止一个)
|
|
335
|
-
const oldStatus = scanInstances();
|
|
336
341
|
const aliveMains = oldStatus.mains.filter(m => m.alive);
|
|
337
342
|
if (aliveMains.length > 0) {
|
|
338
343
|
const oldPids = aliveMains.map(m => m.record.pid);
|
|
339
344
|
const expectedStarts = new Map(aliveMains.map(m => [m.record.pid, m.record.startedAt]));
|
|
340
345
|
log(`Monitoring ${oldPids.length} main process(es): ${oldPids.join(', ')}`);
|
|
341
|
-
const gracefulPid = await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor', new Set(oldPids));
|
|
346
|
+
const gracefulPid = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor', new Set(oldPids)), 'old daemon shutdown acknowledgement');
|
|
342
347
|
log(`Graceful shutdown request ${gracefulPid === null ? 'was not accepted' : `accepted by PID ${gracefulPid}`}`);
|
|
343
348
|
// 没有收到 IPC shutdown 确认的进程才走信号兜底
|
|
344
349
|
for (const pid of oldPids) {
|
|
@@ -352,27 +357,16 @@ export async function cmdRestartMonitor() {
|
|
|
352
357
|
}
|
|
353
358
|
}
|
|
354
359
|
}
|
|
355
|
-
const exited = await Promise.all(oldPids.map(async (oldPid) => {
|
|
360
|
+
const exited = await trace.waitForDependency(Promise.all(oldPids.map(async (oldPid) => {
|
|
356
361
|
const expectedStartedAt = expectedStarts.get(oldPid);
|
|
357
|
-
|
|
358
|
-
reportPidReused(oldPid, log);
|
|
359
|
-
return true;
|
|
360
|
-
}
|
|
362
|
+
// The phase snapshot verified the registered identity before requesting shutdown.
|
|
361
363
|
if (await platform.waitForProcessExit(oldPid, 30_000)) {
|
|
362
|
-
if (isPidReused(oldPid, expectedStartedAt)) {
|
|
363
|
-
reportPidReused(oldPid, log);
|
|
364
|
-
return true;
|
|
365
|
-
}
|
|
366
364
|
log(`Process ${oldPid} has exited`);
|
|
367
365
|
return true;
|
|
368
366
|
}
|
|
369
|
-
if (isPidReused(oldPid, expectedStartedAt)) {
|
|
370
|
-
reportPidReused(oldPid, log);
|
|
371
|
-
return true;
|
|
372
|
-
}
|
|
373
367
|
const state = platform.getProcessState(oldPid);
|
|
374
368
|
log(`ERROR: Process ${oldPid} still running after 30s${state ? ` (state=${state})` : ''}, force killing`);
|
|
375
|
-
if (isPidReused(oldPid, expectedStartedAt)) {
|
|
369
|
+
if (await isPidReused(oldPid, expectedStartedAt)) {
|
|
376
370
|
reportPidReused(oldPid, log);
|
|
377
371
|
return true;
|
|
378
372
|
}
|
|
@@ -380,7 +374,7 @@ export async function cmdRestartMonitor() {
|
|
|
380
374
|
log(`Forced termination for PID ${oldPid}: ${forcedKill ? 'accepted' : 'failed'}`);
|
|
381
375
|
const forced = await platform.waitForProcessExit(oldPid, 5_000);
|
|
382
376
|
log(`Forced termination wait for PID ${oldPid}: ${forced ? 'exited' : 'still running'}`);
|
|
383
|
-
if (isPidReused(oldPid, expectedStartedAt)) {
|
|
377
|
+
if (!forced && await isPidReused(oldPid, expectedStartedAt)) {
|
|
384
378
|
reportPidReused(oldPid, log);
|
|
385
379
|
return true;
|
|
386
380
|
}
|
|
@@ -389,7 +383,7 @@ export async function cmdRestartMonitor() {
|
|
|
389
383
|
log(`ERROR: Process ${oldPid} survived forced termination${finalState ? ` (state=${finalState})` : ''}`);
|
|
390
384
|
}
|
|
391
385
|
return forced;
|
|
392
|
-
}));
|
|
386
|
+
})), 'old daemon exit');
|
|
393
387
|
if (exited.some(result => !result)) {
|
|
394
388
|
log('❌ Existing daemon process could not be stopped; refusing to spawn a replacement');
|
|
395
389
|
await notifyDaemonOwners(p, '❌ 旧 EvolCore 进程未能退出,已停止重启,避免重复连接 AUN。', log);
|
|
@@ -407,8 +401,10 @@ export async function cmdRestartMonitor() {
|
|
|
407
401
|
// Shutdown changed the process table. A cached pre-shutdown snapshot can
|
|
408
402
|
// otherwise classify the exited daemon as an unregistered runtime process.
|
|
409
403
|
invalidateProcessSnapshot();
|
|
410
|
-
const
|
|
411
|
-
const
|
|
404
|
+
const afterStopSnapshot = await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection after shutdown');
|
|
405
|
+
const remainingStatus = scanInstances({ includeAidActivity: false, processSnapshot: afterStopSnapshot });
|
|
406
|
+
const remaining = findOrphanProcesses(remainingStatus, afterStopSnapshot);
|
|
407
|
+
const remainingMains = remainingStatus.mains.filter(item => item.alive);
|
|
412
408
|
const remainingRuntime = remaining.filter(belongsToRuntime);
|
|
413
409
|
if (remainingMains.length || remainingRuntime.length) {
|
|
414
410
|
const pids = [...new Set([
|
|
@@ -437,7 +433,7 @@ export async function cmdRestartMonitor() {
|
|
|
437
433
|
try {
|
|
438
434
|
const service = ecwebService(loadDaemonConfig().services);
|
|
439
435
|
if (service?.enabled && serviceRuntimeMode(service) === 'managed') {
|
|
440
|
-
await stopEcwebForRestart(p, service.port ?? DEFAULT_ECWEB_PORT, log);
|
|
436
|
+
await trace.waitForDependency(stopEcwebForRestart(p, service.port ?? DEFAULT_ECWEB_PORT, log), 'ECWeb shutdown confirmation');
|
|
441
437
|
}
|
|
442
438
|
}
|
|
443
439
|
catch (error) {
|
|
@@ -458,12 +454,18 @@ export async function cmdRestartMonitor() {
|
|
|
458
454
|
// Apply only the preflight cache. There is no registry VERSION query after
|
|
459
455
|
// shutdown (npm still downloads the exact cached package when needed).
|
|
460
456
|
log('Applying cached version information...');
|
|
461
|
-
// 升级会原地替换整包,先留一个可回退的产物副本。备份放 EVOLCORE_HOME 而非包目录:
|
|
462
|
-
// Linux/macOS 的全局目录常常不可写,而 HOME 一定可写。
|
|
463
|
-
upgradeBackup = await backupDistForUpgrade(p, log);
|
|
464
457
|
[upgrade] = await applyCachedPackageUpgrades(undefined, {
|
|
465
458
|
log,
|
|
466
459
|
...(upgradeJob ? { target: upgradeJob.target, distTag: upgradeJob.distTag, npmConfig: upgradeJob.npmConfig } : {}),
|
|
460
|
+
beforeInstall: async (name) => {
|
|
461
|
+
if (name !== MAIN_PACKAGE_NAME)
|
|
462
|
+
return;
|
|
463
|
+
// npm replaces package metadata, schemas and runtime files together.
|
|
464
|
+
upgradeBackup = await backupPackageForUpgrade(p, log);
|
|
465
|
+
if (!upgradeBackup && !fs.existsSync(path.join(targetPackageRoot(), 'src'))) {
|
|
466
|
+
throw new Error('Package backup unavailable; upgrade was not attempted');
|
|
467
|
+
}
|
|
468
|
+
},
|
|
467
469
|
});
|
|
468
470
|
}
|
|
469
471
|
else {
|
|
@@ -477,12 +479,15 @@ export async function cmdRestartMonitor() {
|
|
|
477
479
|
if (!distArtifactIsUsable(path.join(targetPackageRoot(), 'dist'))) {
|
|
478
480
|
// npm 报成功但产物不完整:当作升级失败处理。
|
|
479
481
|
log('❌ Upgrade left an incomplete dist/');
|
|
480
|
-
if (await
|
|
482
|
+
if (await restorePackageBackup(upgradeBackup, log)) {
|
|
481
483
|
upgradeRolledBack = `升级到 ${upgrade.to} 后产物不完整,已回滚到 ${upgrade.from}`;
|
|
482
484
|
await notifyDaemonOwners(p, `⚠️ ${upgradeRolledBack}`, log);
|
|
483
485
|
}
|
|
484
486
|
else {
|
|
485
487
|
await notifyDaemonOwners(p, `❌ 升级到 ${upgrade.to} 后产物不完整,且回滚失败,请人工检查`, log);
|
|
488
|
+
markRestartOutcome(pendingFile, 'rollback-failed', 'Upgraded package is incomplete and rollback failed', log, hasCorrelatedRequest ? requestId : undefined);
|
|
489
|
+
cleanupPendingFile(pendingFile, log, hasCorrelatedRequest ? requestId : undefined);
|
|
490
|
+
process.exit(1);
|
|
486
491
|
}
|
|
487
492
|
}
|
|
488
493
|
else {
|
|
@@ -502,11 +507,15 @@ export async function cmdRestartMonitor() {
|
|
|
502
507
|
break;
|
|
503
508
|
case 'failed':
|
|
504
509
|
log(`⚠ Upgrade failed (${upgrade.from} → ${upgrade.to}): ${upgrade.error}`);
|
|
505
|
-
//
|
|
506
|
-
if (
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
+
// Even when entry files exist, npm may have replaced schemas or only part of the dependency tree.
|
|
511
|
+
if (upgradeBackup) {
|
|
512
|
+
if (await restorePackageBackup(upgradeBackup, log)) {
|
|
513
|
+
upgradeRolledBack = `升级失败,已完整回滚到 ${upgrade.from}`;
|
|
514
|
+
}
|
|
515
|
+
else {
|
|
516
|
+
markRestartOutcome(pendingFile, 'rollback-failed', upgrade.error, log, hasCorrelatedRequest ? requestId : undefined);
|
|
517
|
+
cleanupPendingFile(pendingFile, log, hasCorrelatedRequest ? requestId : undefined);
|
|
518
|
+
process.exit(1);
|
|
510
519
|
}
|
|
511
520
|
}
|
|
512
521
|
await notifyDaemonOwners(p, `⚠️ evolcore 升级失败,使用当前版本继续\n${upgrade.error ?? ''}`.trim(), log);
|
|
@@ -576,7 +585,7 @@ export async function cmdRestartMonitor() {
|
|
|
576
585
|
await recordPackageUpgrade(MAIN_PACKAGE_NAME, {
|
|
577
586
|
...upgradeVersions, at: new Date().toISOString(), status: 'failed', error: 'Upgraded daemon failed its ready check',
|
|
578
587
|
}, log);
|
|
579
|
-
if (await
|
|
588
|
+
if (await restorePackageBackup(upgradeBackup, log)) {
|
|
580
589
|
await notifyDaemonOwners(p, `⚠️ 升级到 ${upgradeVersions.to} 后启动失败,正在回滚到 ${upgradeVersions.from} 重试...`, log);
|
|
581
590
|
started = await spawnAndWaitReady(p, log, READY_TIMEOUT, trace);
|
|
582
591
|
if (started) {
|
|
@@ -593,6 +602,14 @@ export async function cmdRestartMonitor() {
|
|
|
593
602
|
}
|
|
594
603
|
log('❌ Rolled-back version also failed to start');
|
|
595
604
|
}
|
|
605
|
+
else {
|
|
606
|
+
const reason = 'Upgraded package failed its ready check and package rollback failed';
|
|
607
|
+
log(`❌ ${reason}`);
|
|
608
|
+
await notifyDaemonOwners(p, `❌ ${reason}`, log);
|
|
609
|
+
markRestartOutcome(pendingFile, 'rollback-failed', reason, log, hasCorrelatedRequest ? requestId : undefined);
|
|
610
|
+
cleanupPendingFile(pendingFile, log, hasCorrelatedRequest ? requestId : undefined);
|
|
611
|
+
process.exit(1);
|
|
612
|
+
}
|
|
596
613
|
}
|
|
597
614
|
// 新产物起不来:回退到上一份可用产物再试一次,比直接进 self-heal 快且确定。
|
|
598
615
|
if (buildOutcome.status === 'built') {
|
|
@@ -1009,61 +1026,119 @@ async function revertToPreviousBuild(log) {
|
|
|
1009
1026
|
return restored;
|
|
1010
1027
|
}
|
|
1011
1028
|
/**
|
|
1012
|
-
* Copy the
|
|
1029
|
+
* Copy the installed package aside so a bad upgrade can be undone.
|
|
1013
1030
|
*
|
|
1014
|
-
*
|
|
1015
|
-
*
|
|
1016
|
-
* original must stay usable until npm succeeds. Hence a copy.
|
|
1031
|
+
* The restart monitor runs from a staging copy, allowing npm to replace the
|
|
1032
|
+
* installed package while a complete rollback copy stays available.
|
|
1017
1033
|
*
|
|
1018
1034
|
* The backup lives under EVOLCORE_HOME rather than in the package directory:
|
|
1019
1035
|
* on Linux/macOS the global prefix is frequently root-owned, and a rollback
|
|
1020
1036
|
* that cannot be written is worthless. Returns null when there is nothing to
|
|
1021
1037
|
* back up or the copy failed — the caller then knows rollback is unavailable.
|
|
1022
1038
|
*/
|
|
1023
|
-
async function
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
// tree even when no build was needed.
|
|
1027
|
-
if (fs.existsSync(path.join(targetPackageRoot(), 'src')))
|
|
1039
|
+
export async function backupPackageForUpgrade(p, log) {
|
|
1040
|
+
const packageRoot = targetPackageRoot();
|
|
1041
|
+
if (fs.existsSync(path.join(packageRoot, 'src')))
|
|
1028
1042
|
return null;
|
|
1029
|
-
const distDir = path.join(
|
|
1043
|
+
const distDir = path.join(packageRoot, 'dist');
|
|
1030
1044
|
if (!distArtifactIsUsable(distDir))
|
|
1031
1045
|
return null;
|
|
1032
|
-
const backupDir = path.join(p.root, 'data', 'package-backup', '
|
|
1046
|
+
const backupDir = path.join(p.root, 'data', 'package-backup', 'package.prev');
|
|
1047
|
+
const suffix = `${process.pid}-${Date.now()}`;
|
|
1048
|
+
const stagedBackup = `${backupDir}.tmp-${suffix}`;
|
|
1049
|
+
const previousBackup = `${backupDir}.old-${suffix}`;
|
|
1050
|
+
let previousMoved = false;
|
|
1033
1051
|
try {
|
|
1034
1052
|
fs.mkdirSync(path.dirname(backupDir), { recursive: true });
|
|
1035
|
-
fs.
|
|
1036
|
-
fs.
|
|
1037
|
-
|
|
1053
|
+
fs.cpSync(packageRoot, stagedBackup, { recursive: true, dereference: true });
|
|
1054
|
+
if (!fs.existsSync(path.join(stagedBackup, 'package.json'))
|
|
1055
|
+
|| !distArtifactIsUsable(path.join(stagedBackup, 'dist'))) {
|
|
1056
|
+
throw new Error('package backup is incomplete');
|
|
1057
|
+
}
|
|
1058
|
+
if (fs.existsSync(backupDir)) {
|
|
1059
|
+
fs.renameSync(backupDir, previousBackup);
|
|
1060
|
+
previousMoved = true;
|
|
1061
|
+
}
|
|
1062
|
+
fs.renameSync(stagedBackup, backupDir);
|
|
1063
|
+
if (previousMoved) {
|
|
1064
|
+
try {
|
|
1065
|
+
fs.rmSync(previousBackup, { recursive: true, force: true });
|
|
1066
|
+
}
|
|
1067
|
+
catch (error) {
|
|
1068
|
+
log(`WARN: could not remove previous package backup: ${error.message}`);
|
|
1069
|
+
}
|
|
1070
|
+
}
|
|
1071
|
+
log(`Backed up complete package -> ${backupDir}`);
|
|
1038
1072
|
return backupDir;
|
|
1039
1073
|
}
|
|
1040
1074
|
catch (error) {
|
|
1041
|
-
|
|
1075
|
+
try {
|
|
1076
|
+
fs.rmSync(stagedBackup, { recursive: true, force: true });
|
|
1077
|
+
}
|
|
1078
|
+
catch { }
|
|
1079
|
+
if (previousMoved && !fs.existsSync(backupDir) && fs.existsSync(previousBackup)) {
|
|
1080
|
+
try {
|
|
1081
|
+
fs.renameSync(previousBackup, backupDir);
|
|
1082
|
+
}
|
|
1083
|
+
catch { }
|
|
1084
|
+
}
|
|
1085
|
+
log(`WARN: could not back up package before upgrade: ${error.message}`);
|
|
1042
1086
|
return null;
|
|
1043
1087
|
}
|
|
1044
1088
|
}
|
|
1045
|
-
/** Restore a backup
|
|
1046
|
-
async function
|
|
1089
|
+
/** Restore a complete package backup without leaving a partial installation at the target path. */
|
|
1090
|
+
export async function restorePackageBackup(backupDir, log) {
|
|
1047
1091
|
if (!backupDir || !fs.existsSync(backupDir)) {
|
|
1048
|
-
log('❌ No usable
|
|
1092
|
+
log('❌ No usable package backup to restore from');
|
|
1093
|
+
return false;
|
|
1094
|
+
}
|
|
1095
|
+
if (!fs.existsSync(path.join(backupDir, 'package.json'))
|
|
1096
|
+
|| !distArtifactIsUsable(path.join(backupDir, 'dist'))) {
|
|
1097
|
+
log('❌ Package backup is incomplete');
|
|
1049
1098
|
return false;
|
|
1050
1099
|
}
|
|
1051
|
-
const
|
|
1100
|
+
const packageRoot = targetPackageRoot();
|
|
1052
1101
|
for (let attempt = 1; attempt <= 3; attempt++) {
|
|
1102
|
+
const suffix = `${process.pid}-${Date.now()}-${attempt}`;
|
|
1103
|
+
const stagedRestore = `${packageRoot}.restore-${suffix}`;
|
|
1104
|
+
const failedPackage = `${packageRoot}.failed-${suffix}`;
|
|
1053
1105
|
try {
|
|
1054
|
-
fs.
|
|
1055
|
-
|
|
1056
|
-
|
|
1106
|
+
fs.cpSync(backupDir, stagedRestore, { recursive: true, dereference: true });
|
|
1107
|
+
if (!distArtifactIsUsable(path.join(stagedRestore, 'dist'))) {
|
|
1108
|
+
throw new Error('restored package is incomplete');
|
|
1109
|
+
}
|
|
1110
|
+
if (fs.existsSync(packageRoot))
|
|
1111
|
+
fs.renameSync(packageRoot, failedPackage);
|
|
1112
|
+
try {
|
|
1113
|
+
fs.renameSync(stagedRestore, packageRoot);
|
|
1114
|
+
}
|
|
1115
|
+
catch (error) {
|
|
1116
|
+
if (!fs.existsSync(packageRoot) && fs.existsSync(failedPackage)) {
|
|
1117
|
+
fs.renameSync(failedPackage, packageRoot);
|
|
1118
|
+
}
|
|
1119
|
+
throw error;
|
|
1120
|
+
}
|
|
1121
|
+
try {
|
|
1122
|
+
fs.rmSync(failedPackage, { recursive: true, force: true });
|
|
1123
|
+
}
|
|
1124
|
+
catch (error) {
|
|
1125
|
+
log(`WARN: could not remove failed package: ${error.message}`);
|
|
1126
|
+
}
|
|
1127
|
+
log('↩ Restored complete package from backup');
|
|
1057
1128
|
return true;
|
|
1058
1129
|
}
|
|
1059
1130
|
catch (error) {
|
|
1131
|
+
try {
|
|
1132
|
+
fs.rmSync(stagedRestore, { recursive: true, force: true });
|
|
1133
|
+
}
|
|
1134
|
+
catch { }
|
|
1060
1135
|
const code = error.code;
|
|
1061
1136
|
if (attempt < 3 && (code === 'EPERM' || code === 'EBUSY' || code === 'EACCES')) {
|
|
1062
1137
|
log(`restore failed (${code}), retry ${attempt}/2`);
|
|
1063
1138
|
await sleep(attempt * 700);
|
|
1064
1139
|
continue;
|
|
1065
1140
|
}
|
|
1066
|
-
log(`❌ Could not restore
|
|
1141
|
+
log(`❌ Could not restore package: ${error.message}`);
|
|
1067
1142
|
return false;
|
|
1068
1143
|
}
|
|
1069
1144
|
}
|
|
@@ -1075,7 +1150,7 @@ function dropUpgradeBackup(backupDir, log) {
|
|
|
1075
1150
|
return;
|
|
1076
1151
|
try {
|
|
1077
1152
|
fs.rmSync(backupDir, { recursive: true, force: true });
|
|
1078
|
-
log('Removed upgrade backup (new version verified)');
|
|
1153
|
+
log('Removed package upgrade backup (new version verified)');
|
|
1079
1154
|
}
|
|
1080
1155
|
catch {
|
|
1081
1156
|
log('WARN: could not remove upgrade backup');
|
|
@@ -1152,7 +1227,7 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1152
1227
|
});
|
|
1153
1228
|
const childPid = child.pid;
|
|
1154
1229
|
trace.setMeta('daemonPid', String(childPid));
|
|
1155
|
-
trace.mark('monitor.waitReady');
|
|
1230
|
+
trace.mark('monitor.waitReady', undefined, { initialPhase: 'running' });
|
|
1156
1231
|
if (foreground) {
|
|
1157
1232
|
foregroundDaemonExit = new Promise(resolve => {
|
|
1158
1233
|
child.once('error', () => resolve(1));
|
|
@@ -1164,15 +1239,16 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1164
1239
|
fs.closeSync(out);
|
|
1165
1240
|
fs.closeSync(err);
|
|
1166
1241
|
log(`Spawned new process PID: ${childPid}, waiting for ready signal...`);
|
|
1242
|
+
const isChildRunning = () => trace.waitForDependency(platform.isProcessRunningAsync(childPid), 'daemon process liveness');
|
|
1167
1243
|
// 轮询等待 ready.signal 出现
|
|
1168
1244
|
const start = Date.now();
|
|
1169
1245
|
while (Date.now() - start < timeout) {
|
|
1170
|
-
await sleep(500);
|
|
1246
|
+
await trace.waitForDependency(sleep(500), 'daemon ready.signal');
|
|
1171
1247
|
// 进程已退出则提前失败
|
|
1172
|
-
if (!
|
|
1248
|
+
if (!await isChildRunning()) {
|
|
1173
1249
|
log('Process exited before ready signal');
|
|
1174
1250
|
if (requireEcweb)
|
|
1175
|
-
await stopEcwebForRestart(p, ecwebPort, log);
|
|
1251
|
+
await trace.waitForDependency(stopEcwebForRestart(p, ecwebPort, log), 'ECWeb shutdown confirmation');
|
|
1176
1252
|
return false;
|
|
1177
1253
|
}
|
|
1178
1254
|
if (fs.existsSync(p.readySignal)) {
|
|
@@ -1181,8 +1257,8 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1181
1257
|
return true;
|
|
1182
1258
|
}
|
|
1183
1259
|
}
|
|
1184
|
-
const ping = await ipcQuery(p.socket, { type: 'ping' }, platform.isWindows ? 5_000 : 1_000);
|
|
1185
|
-
if (ping?.pong === true && ping.pid === childPid &&
|
|
1260
|
+
const ping = await trace.waitForDependency(ipcQuery(p.socket, { type: 'ping' }, platform.isWindows ? 5_000 : 1_000), 'daemon IPC ping response');
|
|
1261
|
+
if (ping?.pong === true && ping.pid === childPid && await isChildRunning()) {
|
|
1186
1262
|
log(`Daemon IPC is ready (PID: ${childPid}); startup finalization and managed services continue in background`);
|
|
1187
1263
|
trace.finish(true);
|
|
1188
1264
|
return true;
|
|
@@ -1190,18 +1266,18 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1190
1266
|
log(`Daemon ready signal not received within ${timeout / 1000}s and identified IPC is unavailable`);
|
|
1191
1267
|
// A timeout is still a live-process race: do not let self-heal spawn a
|
|
1192
1268
|
// replacement while the timed-out daemon owns the IPC endpoint or a port.
|
|
1193
|
-
if (
|
|
1269
|
+
if (await isChildRunning()) {
|
|
1194
1270
|
platform.killProcessOnly(childPid, false);
|
|
1195
|
-
if (!await platform.waitForProcessExit(childPid, 5_000)) {
|
|
1271
|
+
if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'timed out daemon exit')) {
|
|
1196
1272
|
log(`Process ${childPid} survived graceful termination, forcing kill`);
|
|
1197
1273
|
platform.killProcessOnly(childPid, true);
|
|
1198
|
-
if (!await platform.waitForProcessExit(childPid, 5_000)) {
|
|
1274
|
+
if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'forced daemon exit')) {
|
|
1199
1275
|
throw new Error(`Process ${childPid} survived forced termination; refusing rollback or duplicate startup`);
|
|
1200
1276
|
}
|
|
1201
1277
|
}
|
|
1202
1278
|
}
|
|
1203
1279
|
if (requireEcweb)
|
|
1204
|
-
await stopEcwebForRestart(p, ecwebPort, log);
|
|
1280
|
+
await trace.waitForDependency(stopEcwebForRestart(p, ecwebPort, log), 'ECWeb shutdown confirmation');
|
|
1205
1281
|
cleanupInstances();
|
|
1206
1282
|
return false;
|
|
1207
1283
|
}
|
|
@@ -1325,6 +1401,7 @@ async function notifyDaemonOwners(p, message, log) {
|
|
|
1325
1401
|
});
|
|
1326
1402
|
if (validOwners.length === 0)
|
|
1327
1403
|
return;
|
|
1404
|
+
const { msgSend } = await import('../aun/msg/index.js');
|
|
1328
1405
|
const text = formatDaemonOwnerNotice(p, message);
|
|
1329
1406
|
for (const owner of validOwners) {
|
|
1330
1407
|
try {
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `ec services` CLI:服务路由运维与对端调用。
|
|
3
|
+
*
|
|
4
|
+
* 全部子命令都经 daemon IPC(`services.op`)执行,不在 CLI 侧建 AUN 连接:
|
|
5
|
+
* 请求登记与应答落盘都在 daemon 的 AunRequestRegistry 里,CLI 被杀也不丢结果。
|
|
6
|
+
*/
|
|
7
|
+
import fs from 'node:fs';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import { ipcQuery } from '../ipc.js';
|
|
10
|
+
import { readDelegationCredential, hashCurrentDelegatedCommand } from '../core/auth/agent-delegation.js';
|
|
11
|
+
import { resolvePaths } from '../paths.js';
|
|
12
|
+
const HELP = `ec services — 服务路由运维
|
|
13
|
+
|
|
14
|
+
本机:
|
|
15
|
+
ec services status [<包名>] [--aid <aid>] [--format json] 每包状态
|
|
16
|
+
ec services types [--aid <aid>] 本 AID 可接的全部 services.* type
|
|
17
|
+
ec services ledger <包名> [--tail N] [--aid <aid>] 台账
|
|
18
|
+
ec services tail <包名> [--tail N] [--aid <aid>] 服务消息日志
|
|
19
|
+
ec services doctor [<包名>] [--aid <aid>] 诊断
|
|
20
|
+
ec services reload [<包名>] [--aid <aid>] 重载
|
|
21
|
+
ec services enable / disable [--aid <aid>] 总闸
|
|
22
|
+
|
|
23
|
+
安装与卸载(L 类目录只能由 daemon 代写):
|
|
24
|
+
ec services pack add <包名> --from <源目录> [--aid <aid>]
|
|
25
|
+
ec services pack remove <包名> [--aid <aid>] [--purge]
|
|
26
|
+
|
|
27
|
+
add 遇到已安装的包直接报错,先 remove 再装。
|
|
28
|
+
remove 默认把日志与台账归档到 <包>/logs/archive-<时间戳>/;--purge 连归档一起删。
|
|
29
|
+
ec services pack list [--aid <aid>]
|
|
30
|
+
|
|
31
|
+
对端:
|
|
32
|
+
ec services describe <aid> [--service <type>] 查对端可用服务
|
|
33
|
+
ec services schema <aid> <type> 查某个服务的请求 schema
|
|
34
|
+
ec services call <aid> <type> --data '<json>' [--timeout 30] [--encrypted] [--no-wait]
|
|
35
|
+
ec services call --request-id <id> --wait 查已发出的调用(--aid 指定本端)
|
|
36
|
+
|
|
37
|
+
服务调用是点对点、要结果、不丢的消息:结果由 daemon 落盘,CLI 被杀也不丢。`;
|
|
38
|
+
/** 这三个子命令的回包是「对端应答」,CLI 只打印正文。 */
|
|
39
|
+
const RELAY_COMMANDS = new Set(['call', 'describe', 'schema']);
|
|
40
|
+
function readControlToken() {
|
|
41
|
+
try {
|
|
42
|
+
return fs.readFileSync(resolvePaths().controlToken, 'utf8').trim() || undefined;
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
async function queryServices(argv, timeoutMs = 20_000) {
|
|
49
|
+
// 托管会话优先带 delegation 身份:daemon 要靠它判定 owner/admin/member,
|
|
50
|
+
// 只带 control token 会被当成"主机终端",任何角色都能管理。
|
|
51
|
+
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
52
|
+
const delegationToken = sessionId ? readDelegationCredential() : undefined;
|
|
53
|
+
const controlToken = delegationToken ? undefined : readControlToken();
|
|
54
|
+
try {
|
|
55
|
+
const response = await ipcQuery(resolvePaths().socket, {
|
|
56
|
+
type: 'services.op', argv, controlToken,
|
|
57
|
+
...(sessionId && delegationToken ? { sessionId, delegationToken, delegationCommandHash: hashCurrentDelegatedCommand() } : {}),
|
|
58
|
+
}, timeoutMs, { throwOnError: false });
|
|
59
|
+
if (!response || typeof response !== 'object')
|
|
60
|
+
return { transportError: 'invalid daemon response' };
|
|
61
|
+
return { response };
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
return { transportError: error instanceof Error ? error.message : String(error) };
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
function printResult(result, json) {
|
|
68
|
+
if (json || (result && typeof result === 'object')) {
|
|
69
|
+
console.log(JSON.stringify(result, null, 2));
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
console.log(String(result));
|
|
73
|
+
}
|
|
74
|
+
/** `--from` 在 CLI 侧 resolve:daemon 的 cwd 与调用方工作区不同。 */
|
|
75
|
+
function resolveFromPath(args) {
|
|
76
|
+
const index = args.indexOf('--from');
|
|
77
|
+
if (index < 0 || index + 1 >= args.length)
|
|
78
|
+
return args;
|
|
79
|
+
const next = [...args];
|
|
80
|
+
next[index + 1] = path.resolve(next[index + 1]);
|
|
81
|
+
return next;
|
|
82
|
+
}
|
|
83
|
+
export async function runServicesCommand(argv) {
|
|
84
|
+
const args = resolveFromPath([...argv]);
|
|
85
|
+
const json = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
|
|
86
|
+
if (args.length === 0 || args[0] === 'help' || args[0] === '--help') {
|
|
87
|
+
console.log(HELP);
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
// `call` 要等结果:IPC 超时必须覆盖调用预算,否则 CLI 先断而 daemon 还在等。
|
|
91
|
+
const callTimeoutMs = args[0] === 'call' ? readCallBudget(args) : undefined;
|
|
92
|
+
const query = await queryServices(args, callTimeoutMs);
|
|
93
|
+
if ('transportError' in query) {
|
|
94
|
+
console.error(`daemon 不可达:${query.transportError}`);
|
|
95
|
+
process.exitCode = 1;
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const { response } = query;
|
|
99
|
+
if (!response.ok) {
|
|
100
|
+
const result = response.result && typeof response.result === 'object' ? response.result : undefined;
|
|
101
|
+
if (json)
|
|
102
|
+
console.log(JSON.stringify({ ok: false, code: response.code, error: response.error, ...(result ?? {}) }));
|
|
103
|
+
else
|
|
104
|
+
console.error(`${response.code ?? 'ERROR'}: ${response.error ?? 'unknown error'}`);
|
|
105
|
+
// 超时不重试:退出码 2 表示「可能已执行」。
|
|
106
|
+
process.exitCode = response.code === 'NO_RESULT' ? 2 : 1;
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
// 对端调用的成功输出是应答正文;--no-wait 时没有 response,回落到 request_id。
|
|
110
|
+
const result = response.result;
|
|
111
|
+
if (RELAY_COMMANDS.has(args[0] ?? '') && result && 'response' in result) {
|
|
112
|
+
printResult(result.response, json);
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
printResult(result, json);
|
|
116
|
+
}
|
|
117
|
+
/** `--timeout` 预算 + 5s 余量,作为 IPC 等待上限。 */
|
|
118
|
+
function readCallBudget(args) {
|
|
119
|
+
const index = args.indexOf('--timeout');
|
|
120
|
+
const raw = index >= 0 ? args[index + 1] : undefined;
|
|
121
|
+
const parsed = raw === undefined ? 30_000 : parseTimeoutMs(raw);
|
|
122
|
+
return (parsed ?? 30_000) + 5_000;
|
|
123
|
+
}
|
|
124
|
+
function parseTimeoutMs(value) {
|
|
125
|
+
const trimmed = value.trim().toLowerCase();
|
|
126
|
+
const plain = Number(trimmed);
|
|
127
|
+
if (Number.isFinite(plain) && plain > 0)
|
|
128
|
+
return Math.round(plain * 1000);
|
|
129
|
+
const match = /^(\d+(?:\.\d+)?)(ms|s|m)$/.exec(trimmed);
|
|
130
|
+
if (!match)
|
|
131
|
+
return undefined;
|
|
132
|
+
const amount = Number(match[1]);
|
|
133
|
+
if (!Number.isFinite(amount) || amount <= 0)
|
|
134
|
+
return undefined;
|
|
135
|
+
const unit = match[2];
|
|
136
|
+
return Math.round(unit === 'ms' ? amount : unit === 'm' ? amount * 60_000 : amount * 1000);
|
|
137
|
+
}
|