evolcore 0.0.45 → 0.0.47
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 +113 -0
- package/bin/ecmsg.js +33 -23
- package/dist/ability/application-service.js +1 -2
- package/dist/ability/package.js +28 -0
- package/dist/agent-template/jobs.js +158 -36
- package/dist/agent-template/runtime.js +401 -34
- package/dist/agent-template/service.js +764 -369
- package/dist/agent-template/tool-runner.js +35 -17
- package/dist/agent-template/types.js +7 -4
- package/dist/agents/baseagent.js +10 -9
- package/dist/agents/claude-runner.js +22 -6
- package/dist/agents/codex/app-server-client.js +34 -27
- package/dist/agents/codex/diagnostics.js +18 -1
- package/dist/agents/codex-runner.js +3 -1
- package/dist/agents/ecagent-runner.js +3 -1
- package/dist/agents/gemini-runner.js +2 -1
- package/dist/aun/group/fs-download.js +1 -1
- package/dist/aun/menu/client.js +142 -182
- package/dist/aun/rpc/client.js +33 -17
- package/dist/aun/service-proxy.js +6 -23
- package/dist/channels/aun.js +675 -120
- package/dist/channels/daemon.js +1 -1
- package/dist/cli/agent-create.js +37 -10
- package/dist/cli/agent-template.js +105 -84
- package/dist/cli/agent.js +31 -18
- package/dist/cli/daemon-commands.js +42 -56
- package/dist/cli/daemon-lifecycle-client.js +55 -19
- package/dist/cli/directory.js +12 -4
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/events-command.js +2 -1
- package/dist/cli/init-channel.js +2 -2
- package/dist/cli/init.js +57 -21
- package/dist/cli/integrity-command.js +2 -0
- package/dist/cli/managed-command-guard.js +20 -1
- package/dist/cli/menu-client.js +7 -5
- package/dist/cli/restart-monitor.js +135 -46
- package/dist/cli/services-command.js +28 -5
- package/dist/cli/task-context.js +83 -15
- package/dist/cli/upgrade-command.js +4 -2
- package/dist/config/config-field-policy.js +24 -0
- package/dist/config/config-manager.js +49 -19
- package/dist/config/peer-book-store.js +167 -127
- package/dist/config/peer-role-resolver.js +24 -4
- package/dist/config/provider-identity-migration.js +158 -6
- package/dist/config/provider-identity.js +10 -4
- package/dist/config/provider-ipc-service.js +10 -2
- package/dist/config/provider-local-sync.js +2 -2
- package/dist/config/providers-config.js +95 -10
- package/dist/config/providers-import.js +4 -6
- package/dist/config/providers.js +14 -3
- package/dist/config/role-store.js +1 -1
- package/dist/config/schema-migration.js +123 -16
- package/dist/config/schema-registry.js +6 -2
- package/dist/config-store.js +9 -1
- package/dist/core/agent-application-service.js +56 -29
- package/dist/core/agent-create-status.js +3 -1
- package/dist/core/agent-creation-claim.js +1 -0
- package/dist/core/agent-ipc-registration.js +2 -2
- package/dist/core/agent-reload-coordinator.js +38 -1
- package/dist/core/agent-runtime.js +91 -43
- package/dist/core/auth/agent-delegation.js +13 -3
- package/dist/core/auth/delegation-diagnostics.js +56 -15
- package/dist/core/auth/operation-authorizer.js +2 -2
- package/dist/core/auth/operation-catalog.js +3 -3
- package/dist/core/bootstrap-service.js +3 -0
- package/dist/core/capability/capability-manager.js +3 -1
- package/dist/core/channel-loader.js +29 -3
- package/dist/core/channel-runtime.js +1 -1
- package/dist/core/command/agent-control.js +6 -5
- package/dist/core/command/agent-template-menu.js +32 -97
- package/dist/core/command/eventcenter-menu.js +61 -13
- package/dist/core/command/menu-catalog.js +11 -4
- package/dist/core/command/menu-handler.js +39 -12
- package/dist/core/command/menu-protocol.js +8 -16
- package/dist/core/command/skill-slash.js +6 -2
- package/dist/core/command/slash-handler.js +4 -6
- package/dist/core/command/team-workspace-bootstrap.js +1 -2
- package/dist/core/command/team-workspace-management-store.js +83 -0
- package/dist/core/command/team-workspace-management.js +1 -2
- package/dist/core/command/team-workspace-team.js +26 -3
- package/dist/core/daemon-bootstrap.js +11 -9
- package/dist/core/daemon-control.js +4 -7
- package/dist/core/daemon-lifecycle.js +189 -143
- package/dist/core/evolagent-registry.js +50 -2
- package/dist/core/evolagent.js +2 -1
- package/dist/core/file-integrity/read.js +9 -16
- package/dist/core/file-integrity/store.js +94 -34
- package/dist/core/handoff/dispatcher.js +33 -7
- package/dist/core/handoff/runtime.js +8 -0
- package/dist/core/host-snapshot.js +9 -4
- package/dist/core/inference/text-inference.js +12 -2
- package/dist/core/initialization/service.js +22 -4
- package/dist/core/invoke/invoke-service.js +24 -3
- package/dist/core/ipc-registration.js +7 -3
- package/dist/core/memory/consolidation.js +6 -6
- package/dist/core/message/aun-ipc-sender.js +109 -7
- package/dist/core/message/contact-admission.js +6 -2
- package/dist/core/message/message-bridge.js +13 -0
- package/dist/core/message/message-queue.js +131 -30
- package/dist/core/message/pending-hints.js +8 -0
- package/dist/core/message/response-engine.js +48 -2
- package/dist/core/message/send-routing.js +3 -12
- package/dist/core/model/catalog-service.js +13 -0
- package/dist/core/model/model-catalog.js +57 -18
- package/dist/core/ownership/owner-resolver.js +27 -10
- package/dist/core/pack-auth.js +163 -31
- package/dist/core/pack-install.js +42 -1
- package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
- package/dist/core/permission/ec-command-parser.js +3 -1
- package/dist/core/permission/shell-environment.js +23 -0
- package/dist/core/rate-window.js +6 -1
- package/dist/core/relation/peer-identity.js +5 -1
- package/dist/core/relation/same-owner-proof.js +2 -1
- package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
- package/dist/core/session/session-file-health.js +36 -7
- package/dist/core/session/session-idle-monitor.js +0 -1
- package/dist/core/session/session-manager.js +14 -0
- package/dist/core/session/session-title.js +26 -6
- package/dist/core/skill/index-generator.js +3 -4
- package/dist/core/task/task-image-resources.js +1 -1
- package/dist/core/thread/thread-service.js +0 -1
- package/dist/core/thread/topic-id.js +8 -0
- package/dist/directory/owner-directory-admission.js +17 -0
- package/dist/directory/owner-directory-cache.js +3 -1
- package/dist/directory/owner-directory-markdown.js +145 -23
- package/dist/directory/owner-directory-policy.js +23 -0
- package/dist/directory/owner-directory-query-operation.js +20 -6
- package/dist/directory/owner-directory-search.js +47 -0
- package/dist/eck/message-renderer.js +171 -32
- package/dist/ecweb/basic-settings-service.js +7 -3
- package/dist/ecweb/providers-service.js +17 -10
- package/dist/ecweb/runtime/lifecycle.js +65 -16
- package/dist/ecweb/runtime/supervisor.js +79 -50
- package/dist/event-center/admission-materializer.js +1 -1
- package/dist/event-center/bus-gate.js +48 -4
- package/dist/event-center/bus-host.js +3 -3
- package/dist/event-center/center-config.js +57 -28
- package/dist/event-center/dispatcher.js +8 -0
- package/dist/event-center/event-log.js +69 -27
- package/dist/event-center/index-generator.js +6 -1
- package/dist/event-center/ipc-operation.js +66 -25
- package/dist/event-center/pack-loader.js +12 -55
- package/dist/event-center/pack-manager.js +5 -3
- package/dist/event-center/registry.js +48 -52
- package/dist/event-center/runtime.js +219 -81
- package/dist/event-center/script-runner.js +18 -7
- package/dist/event-center/types.js +9 -1
- package/dist/event-center/validation.js +33 -4
- package/dist/index.js +132 -75
- package/dist/ipc.js +35 -8
- package/dist/product.js +1 -0
- package/dist/proxy/manager.js +52 -11
- package/dist/proxy/service-supervisor.js +265 -67
- package/dist/services/dispatcher.js +26 -3
- package/dist/services/idempotency.js +128 -0
- package/dist/services/identity.js +3 -27
- package/dist/services/index-generator.js +5 -1
- package/dist/services/index.js +244 -45
- package/dist/services/ipc-operation.js +164 -20
- package/dist/services/pack-manager.js +37 -9
- package/dist/services/router.js +100 -31
- package/dist/services/script-runner.js +15 -4
- package/dist/services/service-payload.js +50 -2
- package/dist/services/validation.js +107 -3
- package/dist/trigger/scheduler.js +18 -4
- package/dist/trigger/script-sandbox.js +39 -2
- package/dist/trigger/state.js +7 -0
- package/dist/utils/aid-bind.js +155 -18
- package/dist/utils/atomic-write.js +3 -3
- package/dist/utils/cross-platform.js +59 -16
- package/dist/utils/error-utils.js +26 -1
- package/dist/utils/instance-registry.js +94 -35
- package/dist/utils/process-introspect.js +187 -27
- package/dist/utils/project-path.js +47 -3
- package/dist/utils/upgrade-jobs.js +4 -4
- package/dist/utils/windows-shell-trust.js +174 -68
- package/kits/docs/context-assembly.md +3 -3
- package/kits/docs/evolcore/agent.md +28 -10
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +22 -0
- package/kits/docs/evolcore/directory.md +46 -12
- package/kits/docs/evolcore/event-center.md +6 -6
- package/kits/docs/evolcore/group-collaboration.md +1 -1
- package/kits/docs/evolcore/menu-client.md +7 -5
- package/kits/docs/evolcore/menu-protocol.md +5 -3
- package/kits/docs/evolcore/msg.md +10 -3
- package/kits/docs/evolcore/provider.md +17 -5
- package/kits/docs/evolcore/services.md +145 -12
- package/kits/docs/evolcore/thread-chain.md +17 -9
- package/kits/docs/prompt-loading-architecture.md +4 -4
- package/kits/eck_message_manifest.json +46 -3
- package/kits/rules/04-relation.md +10 -2
- package/kits/rules/06-channel.md +2 -1
- package/kits/schemas/providers.schema.2.json +1 -0
- package/kits/skills/ec-group/SKILL.md +4 -0
- package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
- package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
- package/kits/skills/thread-ops/SKILL.md +8 -5
- package/kits/templates/message-fragments/group-batch-item.md +3 -0
- package/kits/templates/message-fragments/group-batch.md +1 -0
- package/kits/templates/message-fragments/item-group.md +4 -0
- package/kits/templates/message-fragments/item-private.md +4 -0
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/system-fragments/commands.md +5 -5
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +11 -7
- package/package.json +3 -2
- package/scripts/agent-template/index.mjs +9 -4
- package/scripts/agent-template/inspect.mjs +16 -9
- package/scripts/agent-template/shared/plan.mjs +3 -33
- package/scripts/agent-template/shared/template-contract.mjs +186 -3
- package/scripts/agent-template/shared/template-package.mjs +119 -10
- package/scripts/agent-template/shared/template-runtime.mjs +49 -6
- package/scripts/agent-template/shared/template.mjs +5 -5
- package/scripts/agent-template/team-pack.mjs +245 -0
- package/scripts/agent-template/team-preview.mjs +111 -0
- package/scripts/aid-batch/identity-batch.mjs +143 -0
- package/dist/ability/versions.js +0 -32
- package/dist/aun/model-headers.js +0 -17
- package/dist/channels/builtin-plugins.js +0 -19
- package/dist/core/command/team-workspace-initializer.js +0 -2
- package/dist/core/command/team-workspace-job-store.js +0 -88
- package/dist/core/command/team-workspace-management-service.js +0 -2
- package/dist/core/contact-bind-registry.js +0 -27
- package/dist/event-center/ledger.js +0 -52
- package/dist/services/reply.js +0 -55
- package/kits/templates/message-fragments/item.md +0 -3
- package/scripts/agent-template/pack.mjs +0 -169
package/dist/cli/menu-client.js
CHANGED
|
@@ -36,7 +36,7 @@ function readRequest(args, readFile = (file) => fs.readFileSync(file, 'utf8')) {
|
|
|
36
36
|
}
|
|
37
37
|
function validateOptions(args) {
|
|
38
38
|
const valueOptions = new Set(['--request-file', '--request-json', '--timeout', '--remote-token', '--ecweb-token', '--app', '--aun-path', '--format']);
|
|
39
|
-
const booleanOptions = new Set(['--encrypt', '--no-encrypt']);
|
|
39
|
+
const booleanOptions = new Set(['--encrypt', '--no-encrypt', '--wait']);
|
|
40
40
|
const seen = new Set();
|
|
41
41
|
for (let index = 0; index < args.length; index += 1) {
|
|
42
42
|
const option = args[index];
|
|
@@ -71,7 +71,8 @@ export function parseMenuClientArgs(args, readFile) {
|
|
|
71
71
|
return {
|
|
72
72
|
fromAid, targetAid, request: readRequest(options, readFile),
|
|
73
73
|
timeoutMs: parseDurationMs(getArgValue(options, '--timeout')),
|
|
74
|
-
encrypt:
|
|
74
|
+
encrypt: options.includes('--encrypt') ? true : options.includes('--no-encrypt') ? false : undefined,
|
|
75
|
+
waitForCompletion: options.includes('--wait'),
|
|
75
76
|
remoteAccessToken: getArgValue(options, '--remote-token') ?? getArgValue(options, '--ecweb-token'),
|
|
76
77
|
slotId: getArgValue(options, '--app'), aunPath: getArgValue(options, '--aun-path'),
|
|
77
78
|
};
|
|
@@ -83,8 +84,9 @@ export async function cmdMenuClient(args) {
|
|
|
83
84
|
--request-file <path> 从 JSON 文件读取一个 menu.* 请求
|
|
84
85
|
--request-json <json> 直接传入一个 menu.* JSON 请求
|
|
85
86
|
--timeout <时长> 默认 15s,最大 120s
|
|
86
|
-
--encrypt 使用 E2EE
|
|
87
|
-
--no-encrypt
|
|
87
|
+
--encrypt 使用 E2EE;省略时沿用本机 daemon 默认配置
|
|
88
|
+
--no-encrypt 使用明文;携带授权 token 时不可用
|
|
89
|
+
--wait 等待升级或模板作业终态;超时后可按 jobId 查询
|
|
88
90
|
--remote-token <token> 使用 daemon 远程访问 token 临时授权
|
|
89
91
|
--ecweb-token <token> --remote-token 的兼容别名
|
|
90
92
|
--app <slot> 覆盖默认 evolcore-menu-client 消费槽位
|
|
@@ -113,6 +115,6 @@ export async function cmdMenuClient(args) {
|
|
|
113
115
|
console.log(JSON.stringify(response, null, 2));
|
|
114
116
|
// Transport success does not imply the requested operation succeeded.
|
|
115
117
|
// Preserve the complete wire response for callers while failing the CLI.
|
|
116
|
-
if (response?.error)
|
|
118
|
+
if (response?.error || args.includes('--wait') && ['failed', 'cancelled'].includes(response?.data?.status))
|
|
117
119
|
process.exitCode = 1;
|
|
118
120
|
}
|
|
@@ -15,8 +15,8 @@ import { CHANNEL_LOGS_ENV, MAIN_PACKAGE_NAME, RESTART_REQUEST_ID_ENV, TARGET_PAC
|
|
|
15
15
|
import { readRestartRequest, updateRestartRequest, removeRestartRequest, shouldSuppressRealRestart } from '../utils/restart-safety.js';
|
|
16
16
|
import { rotateStdoutLog } from '../utils/log-writer.js';
|
|
17
17
|
import { applyDataMigration, finalizeDataMigration, planDataMigration, verifyDataMigration, } from '../core/data-migration.js';
|
|
18
|
-
import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-lifecycle-client.js';
|
|
19
|
-
import {
|
|
18
|
+
import { DAEMON_SHUTDOWN_TIMEOUT_MS, isRecordedProcessGone, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-lifecycle-client.js';
|
|
19
|
+
import { getProcessSnapshotAsync, invalidateProcessSnapshot } from '../utils/process-introspect.js';
|
|
20
20
|
import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode } from '../config/daemon-services.js';
|
|
21
21
|
import { stopEcwebForRestart } from '../ecweb/runtime/lifecycle.js';
|
|
22
22
|
import { StartupTracer, STARTUP_TRACE_ID_ENV } from '../utils/startup-trace.js';
|
|
@@ -100,15 +100,44 @@ function cleanEnv() {
|
|
|
100
100
|
delete process.env[key];
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
async function isPidReused(pid, expectedStartedAt) {
|
|
104
|
-
if (expectedStartedAt === undefined)
|
|
105
|
-
return false;
|
|
106
|
-
const actualStartedAt = await getProcessStartTimeAsync(pid);
|
|
107
|
-
return actualStartedAt !== null && !startTimeMatches(expectedStartedAt, actualStartedAt);
|
|
108
|
-
}
|
|
109
103
|
function reportPidReused(pid, log) {
|
|
110
104
|
log(`Process ${pid} no longer refers to the recorded daemon; treating the original process as exited`);
|
|
111
105
|
}
|
|
106
|
+
async function giveWindowsDaemonTimeToExit(pid, deadline) {
|
|
107
|
+
// WMI can capture the old daemon early in enumeration, even if it exits
|
|
108
|
+
// before the result arrives. Observe the acknowledged daemon first, within
|
|
109
|
+
// the existing shutdown budget, then inspect the complete process table.
|
|
110
|
+
// This is only a scheduling hint: every exit still needs full inspection or
|
|
111
|
+
// the authoritative liveness check, and signals still need fresh identity.
|
|
112
|
+
while (performance.now() < deadline) {
|
|
113
|
+
try {
|
|
114
|
+
process.kill(pid, 0);
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
return;
|
|
118
|
+
} // Either gone or not observable: let the full scan decide.
|
|
119
|
+
await new Promise(resolve => setTimeout(resolve, Math.min(20, Math.max(0, deadline - performance.now()))));
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
/** Observe the captured child while the ready file is still absent. */
|
|
123
|
+
export async function waitForRestartReadySignal(readySignal, childExited, timeoutMs, confirmLiveness) {
|
|
124
|
+
const deadline = performance.now() + timeoutMs;
|
|
125
|
+
while (true) {
|
|
126
|
+
if (childExited())
|
|
127
|
+
return 'exited';
|
|
128
|
+
if (fs.existsSync(readySignal)) {
|
|
129
|
+
if (!await confirmLiveness() || childExited())
|
|
130
|
+
return 'exited';
|
|
131
|
+
if (fs.existsSync(readySignal))
|
|
132
|
+
return 'ready';
|
|
133
|
+
// A disappearing candidate does not shorten the normal wait budget.
|
|
134
|
+
}
|
|
135
|
+
const remaining = deadline - performance.now();
|
|
136
|
+
if (remaining <= 0)
|
|
137
|
+
return 'timeout';
|
|
138
|
+
await sleep(Math.min(100, remaining));
|
|
139
|
+
}
|
|
140
|
+
}
|
|
112
141
|
export async function cmdRestartMonitor() {
|
|
113
142
|
// Defense in depth: a unit test that accidentally executes the real restart
|
|
114
143
|
// path must not detach a persistent daemon from the test worker.
|
|
@@ -287,15 +316,38 @@ export async function cmdRestartMonitor() {
|
|
|
287
316
|
// instance registry cannot see them. Their strict environment markers make
|
|
288
317
|
// them safe to reap globally on every real restart. Keep one process-table
|
|
289
318
|
// snapshot for both orphan categories; each Windows CIM scan is expensive.
|
|
290
|
-
|
|
319
|
+
// The HOME-scoped IPC request authenticates with control.token and binds its
|
|
320
|
+
// acknowledgement to the probed daemon PID. It asks that daemon to stop
|
|
321
|
+
// itself; it does not authorize an OS signal. A complete scan that already
|
|
322
|
+
// excludes this PID also confirms its exit, avoiding a second scan. Signals
|
|
323
|
+
// still require fresh identity checks, and any further cleanup invalidates
|
|
324
|
+
// the snapshot used by the final residual-process guard below.
|
|
325
|
+
const earlyGracefulPid = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor')
|
|
326
|
+
.catch(error => {
|
|
327
|
+
log(`Early graceful shutdown request failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
328
|
+
return null;
|
|
329
|
+
}), 'old daemon shutdown acknowledgement');
|
|
330
|
+
const windowsExitDeadline = platform.isWindows && earlyGracefulPid !== null
|
|
331
|
+
? performance.now() + 30_000 : undefined;
|
|
332
|
+
if (windowsExitDeadline !== undefined && earlyGracefulPid !== null) {
|
|
333
|
+
// This observation only chooses when to scan; it never proves exit,
|
|
334
|
+
// authorizes a signal or replaces the residual-process check.
|
|
335
|
+
await trace.waitForDependency(giveWindowsDaemonTimeToExit(earlyGracefulPid, windowsExitDeadline), 'old daemon cooperative exit window');
|
|
336
|
+
}
|
|
337
|
+
const beforeStopSnapshot = await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection during shutdown');
|
|
338
|
+
const exitConfirmedBySnapshot = earlyGracefulPid !== null && beforeStopSnapshot.complete
|
|
339
|
+
&& beforeStopSnapshot.pids?.has(earlyGracefulPid) === false;
|
|
340
|
+
const earlyGracefulExited = exitConfirmedBySnapshot || earlyGracefulPid !== null && await trace.waitForDependency(platform.waitForProcessExit(earlyGracefulPid, windowsExitDeadline === undefined
|
|
341
|
+
? 30_000 : Math.max(0, Math.ceil(windowsExitDeadline - performance.now()))), 'old daemon exit');
|
|
291
342
|
let oldStatus = scanInstances({ includeAidActivity: false, processSnapshot: beforeStopSnapshot });
|
|
292
343
|
const orphanSnapshot = findOrphanProcesses(oldStatus, beforeStopSnapshot);
|
|
344
|
+
let stoppedSnapshot = exitConfirmedBySnapshot ? beforeStopSnapshot : undefined;
|
|
293
345
|
{
|
|
294
346
|
const leakedTestDaemons = orphanSnapshot.filter(o => o.confirmedTestDaemon);
|
|
295
347
|
if (leakedTestDaemons.length > 0) {
|
|
296
|
-
|
|
348
|
+
stoppedSnapshot = undefined;
|
|
349
|
+
const killed = await killOrphans(leakedTestDaemons);
|
|
297
350
|
log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
|
|
298
|
-
await trace.waitForDependency(sleep(500), 'test daemon exit');
|
|
299
351
|
}
|
|
300
352
|
}
|
|
301
353
|
// A stale instance record can disappear while the real Windows process is
|
|
@@ -314,15 +366,25 @@ export async function cmdRestartMonitor() {
|
|
|
314
366
|
const pids = runtimeOrphans.map(o => o.pid).join(', ');
|
|
315
367
|
log(`Stopping unregistered EvolCore process(es): ${pids}`);
|
|
316
368
|
const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
|
|
317
|
-
const ping = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor orphan cleanup', orphanPids), 'old daemon shutdown acknowledgement');
|
|
369
|
+
const ping = earlyGracefulPid !== null && orphanPids.has(earlyGracefulPid) ? earlyGracefulPid : await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor orphan cleanup', orphanPids), 'old daemon shutdown acknowledgement');
|
|
370
|
+
const retiredOrphans = new Set();
|
|
318
371
|
for (const orphan of runtimeOrphans) {
|
|
319
|
-
if (orphan.pid !== ping)
|
|
320
|
-
|
|
372
|
+
if (orphan.pid !== ping) {
|
|
373
|
+
if (await isRecordedProcessGone(orphan.pid, orphan.startedAt))
|
|
374
|
+
retiredOrphans.add(orphan.pid);
|
|
375
|
+
else
|
|
376
|
+
platform.killProcessOnly(orphan.pid, false);
|
|
377
|
+
}
|
|
321
378
|
}
|
|
322
379
|
const exited = await trace.waitForDependency(Promise.all(runtimeOrphans.map(async (orphan) => {
|
|
323
|
-
if (
|
|
380
|
+
if (retiredOrphans.has(orphan.pid))
|
|
324
381
|
return true;
|
|
325
|
-
|
|
382
|
+
if (orphan.pid === earlyGracefulPid ? earlyGracefulExited
|
|
383
|
+
: await platform.waitForProcessExit(orphan.pid, orphan.pid === ping ? 30_000 : 10_000))
|
|
384
|
+
return true;
|
|
385
|
+
if (await isRecordedProcessGone(orphan.pid, orphan.startedAt))
|
|
386
|
+
return true;
|
|
387
|
+
platform.killProcessOnly(orphan.pid, true);
|
|
326
388
|
return platform.waitForProcessExit(orphan.pid, 5_000);
|
|
327
389
|
})), 'unregistered daemon exit');
|
|
328
390
|
if (exited.some(result => !result)) {
|
|
@@ -336,18 +398,26 @@ export async function cmdRestartMonitor() {
|
|
|
336
398
|
invalidateProcessSnapshot();
|
|
337
399
|
const snapshot = await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection after orphan cleanup');
|
|
338
400
|
oldStatus = scanInstances({ includeAidActivity: false, processSnapshot: snapshot });
|
|
401
|
+
stoppedSnapshot = snapshot;
|
|
339
402
|
}
|
|
340
403
|
// 等待所有活 main 进程退出(可能不止一个)
|
|
341
404
|
const aliveMains = oldStatus.mains.filter(m => m.alive);
|
|
342
405
|
if (aliveMains.length > 0) {
|
|
406
|
+
stoppedSnapshot = undefined;
|
|
343
407
|
const oldPids = aliveMains.map(m => m.record.pid);
|
|
344
408
|
const expectedStarts = new Map(aliveMains.map(m => [m.record.pid, m.record.startedAt]));
|
|
345
409
|
log(`Monitoring ${oldPids.length} main process(es): ${oldPids.join(', ')}`);
|
|
346
|
-
const gracefulPid = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor', new Set(oldPids)), 'old daemon shutdown acknowledgement');
|
|
410
|
+
const gracefulPid = earlyGracefulPid !== null && expectedStarts.has(earlyGracefulPid) ? earlyGracefulPid : await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor', new Set(oldPids)), 'old daemon shutdown acknowledgement');
|
|
347
411
|
log(`Graceful shutdown request ${gracefulPid === null ? 'was not accepted' : `accepted by PID ${gracefulPid}`}`);
|
|
348
412
|
// 没有收到 IPC shutdown 确认的进程才走信号兜底
|
|
413
|
+
const retiredPids = new Set();
|
|
349
414
|
for (const pid of oldPids) {
|
|
350
415
|
if (pid !== gracefulPid) {
|
|
416
|
+
if (await isRecordedProcessGone(pid, expectedStarts.get(pid))) {
|
|
417
|
+
reportPidReused(pid, log);
|
|
418
|
+
retiredPids.add(pid);
|
|
419
|
+
continue;
|
|
420
|
+
}
|
|
351
421
|
try {
|
|
352
422
|
const killed = platform.killProcessOnly(pid, false);
|
|
353
423
|
log(`Sent graceful termination to PID ${pid}: ${killed ? 'accepted' : 'failed'}`);
|
|
@@ -358,15 +428,18 @@ export async function cmdRestartMonitor() {
|
|
|
358
428
|
}
|
|
359
429
|
}
|
|
360
430
|
const exited = await trace.waitForDependency(Promise.all(oldPids.map(async (oldPid) => {
|
|
431
|
+
if (retiredPids.has(oldPid))
|
|
432
|
+
return true;
|
|
361
433
|
const expectedStartedAt = expectedStarts.get(oldPid);
|
|
362
|
-
//
|
|
363
|
-
|
|
434
|
+
// Reuse the authenticated shutdown's exit result, including its timeout;
|
|
435
|
+
// a PID-addressed fallback below still verifies the current identity.
|
|
436
|
+
if (oldPid === earlyGracefulPid ? earlyGracefulExited : await platform.waitForProcessExit(oldPid, 30_000)) {
|
|
364
437
|
log(`Process ${oldPid} has exited`);
|
|
365
438
|
return true;
|
|
366
439
|
}
|
|
367
440
|
const state = platform.getProcessState(oldPid);
|
|
368
441
|
log(`ERROR: Process ${oldPid} still running after 30s${state ? ` (state=${state})` : ''}, force killing`);
|
|
369
|
-
if (await
|
|
442
|
+
if (await isRecordedProcessGone(oldPid, expectedStartedAt)) {
|
|
370
443
|
reportPidReused(oldPid, log);
|
|
371
444
|
return true;
|
|
372
445
|
}
|
|
@@ -374,7 +447,7 @@ export async function cmdRestartMonitor() {
|
|
|
374
447
|
log(`Forced termination for PID ${oldPid}: ${forcedKill ? 'accepted' : 'failed'}`);
|
|
375
448
|
const forced = await platform.waitForProcessExit(oldPid, 5_000);
|
|
376
449
|
log(`Forced termination wait for PID ${oldPid}: ${forced ? 'exited' : 'still running'}`);
|
|
377
|
-
if (!forced && await
|
|
450
|
+
if (!forced && await isRecordedProcessGone(oldPid, expectedStartedAt)) {
|
|
378
451
|
reportPidReused(oldPid, log);
|
|
379
452
|
return true;
|
|
380
453
|
}
|
|
@@ -400,8 +473,13 @@ export async function cmdRestartMonitor() {
|
|
|
400
473
|
// watchdog has successfully loaded.
|
|
401
474
|
// Shutdown changed the process table. A cached pre-shutdown snapshot can
|
|
402
475
|
// otherwise classify the exited daemon as an unregistered runtime process.
|
|
403
|
-
|
|
404
|
-
|
|
476
|
+
// A complete snapshot collected after the acknowledged daemon exited, or
|
|
477
|
+
// after orphan cleanup, is the final guard for this same synchronous phase.
|
|
478
|
+
// Any later main shutdown above invalidates it and requires a fresh view.
|
|
479
|
+
if (!stoppedSnapshot)
|
|
480
|
+
invalidateProcessSnapshot();
|
|
481
|
+
const afterStopSnapshot = stoppedSnapshot
|
|
482
|
+
?? await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection after shutdown');
|
|
405
483
|
const remainingStatus = scanInstances({ includeAidActivity: false, processSnapshot: afterStopSnapshot });
|
|
406
484
|
const remaining = findOrphanProcesses(remainingStatus, afterStopSnapshot);
|
|
407
485
|
const remainingMains = remainingStatus.mains.filter(item => item.alive);
|
|
@@ -422,12 +500,12 @@ export async function cmdRestartMonitor() {
|
|
|
422
500
|
}
|
|
423
501
|
const otherHome = remaining.filter(o => !o.confirmedTestDaemon && !belongsToRuntime(o));
|
|
424
502
|
if (process.argv.includes('--clear') && otherHome.length) {
|
|
425
|
-
log(`Cleaned cross-HOME orphans: ${killOrphans(otherHome).join(', ')}`);
|
|
503
|
+
log(`Cleaned cross-HOME orphans: ${(await killOrphans(otherHome)).join(', ')}`);
|
|
426
504
|
}
|
|
427
505
|
else if (otherHome.length) {
|
|
428
506
|
log(`Other HOME orphan processes left running: ${otherHome.map(o => o.pid).join(', ')}`);
|
|
429
507
|
}
|
|
430
|
-
const stoppedCodex = stopCodexAppServerOrphans();
|
|
508
|
+
const stoppedCodex = await trace.waitForDependency(stopCodexAppServerOrphans(afterStopSnapshot), 'registered Codex child cleanup');
|
|
431
509
|
if (stoppedCodex)
|
|
432
510
|
log(`Cleaned ${stoppedCodex} EvolCore codex app-server orphan(s)`);
|
|
433
511
|
try {
|
|
@@ -1225,7 +1303,20 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1225
1303
|
[CHANNEL_LOGS_ENV]: process.env[CHANNEL_LOGS_ENV] || 'false',
|
|
1226
1304
|
}
|
|
1227
1305
|
});
|
|
1306
|
+
// Detached children also emit an error on spawn failure. Keep an observer
|
|
1307
|
+
// for that path even when no foreground caller is waiting for the exit.
|
|
1308
|
+
let spawnFailed = false;
|
|
1309
|
+
child.once('error', error => {
|
|
1310
|
+
spawnFailed = true;
|
|
1311
|
+
log(`Daemon process error: ${error.message}`);
|
|
1312
|
+
});
|
|
1228
1313
|
const childPid = child.pid;
|
|
1314
|
+
fs.closeSync(out);
|
|
1315
|
+
fs.closeSync(err);
|
|
1316
|
+
if (childPid === undefined) {
|
|
1317
|
+
log('Could not spawn daemon: no child PID');
|
|
1318
|
+
return false;
|
|
1319
|
+
}
|
|
1229
1320
|
trace.setMeta('daemonPid', String(childPid));
|
|
1230
1321
|
trace.mark('monitor.waitReady', undefined, { initialPhase: 'running' });
|
|
1231
1322
|
if (foreground) {
|
|
@@ -1236,26 +1327,22 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1236
1327
|
}
|
|
1237
1328
|
else
|
|
1238
1329
|
child.unref();
|
|
1239
|
-
fs.closeSync(out);
|
|
1240
|
-
fs.closeSync(err);
|
|
1241
1330
|
log(`Spawned new process PID: ${childPid}, waiting for ready signal...`);
|
|
1242
|
-
const
|
|
1243
|
-
|
|
1244
|
-
|
|
1245
|
-
|
|
1246
|
-
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
|
|
1257
|
-
return true;
|
|
1258
|
-
}
|
|
1331
|
+
const childExited = () => spawnFailed || child.exitCode !== null || child.signalCode !== null;
|
|
1332
|
+
const isChildRunning = async () => !childExited() && await trace.waitForDependency(platform.isProcessRunningAsync(childPid), 'daemon process liveness') && !childExited();
|
|
1333
|
+
// The captured handle reports early exit. Only verify OS liveness after a
|
|
1334
|
+
// ready candidate is present or when the timeout recovery needs it.
|
|
1335
|
+
const ready = await trace.waitForDependency(waitForRestartReadySignal(p.readySignal, childExited, timeout, isChildRunning), 'daemon ready.signal');
|
|
1336
|
+
if (ready === 'exited') {
|
|
1337
|
+
log('Process exited before ready signal');
|
|
1338
|
+
if (requireEcweb)
|
|
1339
|
+
await trace.waitForDependency(stopEcwebForRestart(p, ecwebPort, log), 'ECWeb shutdown confirmation');
|
|
1340
|
+
return false;
|
|
1341
|
+
}
|
|
1342
|
+
if (ready === 'ready') {
|
|
1343
|
+
log('Daemon ready; managed services are supervised independently');
|
|
1344
|
+
trace.finish(true);
|
|
1345
|
+
return true;
|
|
1259
1346
|
}
|
|
1260
1347
|
const ping = await trace.waitForDependency(ipcQuery(p.socket, { type: 'ping' }, platform.isWindows ? 5_000 : 1_000), 'daemon IPC ping response');
|
|
1261
1348
|
if (ping?.pong === true && ping.pid === childPid && await isChildRunning()) {
|
|
@@ -1267,10 +1354,12 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1267
1354
|
// A timeout is still a live-process race: do not let self-heal spawn a
|
|
1268
1355
|
// replacement while the timed-out daemon owns the IPC endpoint or a port.
|
|
1269
1356
|
if (await isChildRunning()) {
|
|
1270
|
-
|
|
1357
|
+
// Signal the captured child handle, not a numeric PID that may be reused.
|
|
1358
|
+
child.kill('SIGTERM');
|
|
1271
1359
|
if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'timed out daemon exit')) {
|
|
1272
1360
|
log(`Process ${childPid} survived graceful termination, forcing kill`);
|
|
1273
|
-
|
|
1361
|
+
if (!childExited())
|
|
1362
|
+
child.kill('SIGKILL');
|
|
1274
1363
|
if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'forced daemon exit')) {
|
|
1275
1364
|
throw new Error(`Process ${childPid} survived forced termination; refusing rollback or duplicate startup`);
|
|
1276
1365
|
}
|
|
@@ -17,12 +17,16 @@ const HELP = `ec services — 服务路由运维
|
|
|
17
17
|
ec services ledger <包名> [--tail N] [--aid <aid>] 台账
|
|
18
18
|
ec services tail <包名> [--tail N] [--aid <aid>] 服务消息日志
|
|
19
19
|
ec services doctor [<包名>] [--aid <aid>] 诊断
|
|
20
|
-
ec services reload [
|
|
20
|
+
ec services reload [--aid <aid>] 重载(全部包)
|
|
21
21
|
ec services enable / disable [--aid <aid>] 总闸
|
|
22
|
+
ec services rules show [<type>] [--aid <aid>] 调用准入规则
|
|
23
|
+
ec services rules add <type> <aid...> [--deny] [--aid <aid>]
|
|
24
|
+
ec services rules remove <type> <aid...> [--deny] [--aid <aid>]
|
|
22
25
|
|
|
23
26
|
安装与卸载(L 类目录只能由 daemon 代写):
|
|
24
27
|
ec services pack add <包名> --from <源目录> [--aid <aid>]
|
|
25
28
|
ec services pack remove <包名> [--aid <aid>] [--purge]
|
|
29
|
+
ec services pack enable / disable <包名> [--aid <aid>]
|
|
26
30
|
|
|
27
31
|
add 遇到已安装的包直接报错,先 remove 再装。
|
|
28
32
|
remove 默认把日志与台账归档到 <包>/logs/archive-<时间戳>/;--purge 连归档一起删。
|
|
@@ -48,15 +52,25 @@ function readControlToken() {
|
|
|
48
52
|
async function queryServices(argv, timeoutMs = 20_000) {
|
|
49
53
|
// 托管会话优先带 delegation 身份:daemon 要靠它判定 owner/admin/member,
|
|
50
54
|
// 只带 control token 会被当成"主机终端",任何角色都能管理。
|
|
55
|
+
// 委托令牌缺失时快速失败,与 events 侧一致:托管任务不该回退去借宿主
|
|
56
|
+
// control token 充当本机身份——那会把一个 member 会话静默提成 local-control,
|
|
57
|
+
// 反手拿到 pack add / enable / disable 的全部权限。
|
|
51
58
|
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
52
59
|
const delegationToken = sessionId ? readDelegationCredential() : undefined;
|
|
60
|
+
if (sessionId && !delegationToken) {
|
|
61
|
+
return { transportError: 'DELEGATION_REQUIRED: 当前任务缺少委托令牌' };
|
|
62
|
+
}
|
|
53
63
|
const controlToken = delegationToken ? undefined : readControlToken();
|
|
54
64
|
try {
|
|
55
65
|
const response = await ipcQuery(resolvePaths().socket, {
|
|
56
66
|
type: 'services.op', argv, controlToken,
|
|
57
67
|
...(sessionId && delegationToken ? { sessionId, delegationToken, delegationCommandHash: hashCurrentDelegatedCommand() } : {}),
|
|
58
68
|
}, timeoutMs, { throwOnError: false });
|
|
59
|
-
|
|
69
|
+
// null = 本次 IPC 等到超时都没拿到应答(daemon 仍在跑,可能还在等对端)。
|
|
70
|
+
// 不能说成"不可达":那句话会把人引向重启 daemon,而实际问题是对端没回。
|
|
71
|
+
if (!response)
|
|
72
|
+
return { transportError: `daemon did not answer before the IPC deadline (${timeoutMs}ms)` };
|
|
73
|
+
if (typeof response !== 'object')
|
|
60
74
|
return { transportError: 'invalid daemon response' };
|
|
61
75
|
return { response };
|
|
62
76
|
}
|
|
@@ -87,8 +101,10 @@ export async function runServicesCommand(argv) {
|
|
|
87
101
|
console.log(HELP);
|
|
88
102
|
return;
|
|
89
103
|
}
|
|
90
|
-
// `call`
|
|
91
|
-
|
|
104
|
+
// `call` / `describe` / `schema` 都要等对端回包(daemon 侧是同一个 `runCall`,
|
|
105
|
+
// 默认等 30s):IPC 超时必须覆盖调用预算,否则 CLI 先断而 daemon 还在等,
|
|
106
|
+
// 空响应被误报成"daemon 不可达",request_id 也一起丢掉。
|
|
107
|
+
const callTimeoutMs = RELAY_COMMANDS.has(args[0] ?? '') ? readCallBudget(args) : undefined;
|
|
92
108
|
const query = await queryServices(args, callTimeoutMs);
|
|
93
109
|
if ('transportError' in query) {
|
|
94
110
|
console.error(`daemon 不可达:${query.transportError}`);
|
|
@@ -109,7 +125,14 @@ export async function runServicesCommand(argv) {
|
|
|
109
125
|
// 对端调用的成功输出是应答正文;--no-wait 时没有 response,回落到 request_id。
|
|
110
126
|
const result = response.result;
|
|
111
127
|
if (RELAY_COMMANDS.has(args[0] ?? '') && result && 'response' in result) {
|
|
112
|
-
|
|
128
|
+
const body = result.response;
|
|
129
|
+
printResult(body, json);
|
|
130
|
+
// 脚本跑完了但报了业务失败(`ok:false`):CLI 层面这是失败,退出码 1。
|
|
131
|
+
// 否则调用方必须解析 JSON 才能发现失败,`cmd && next` 这类用法会被骗过去。
|
|
132
|
+
// 注意与「没等到结果」区分:后者由上面 NO_RESULT 分支给退出码 2。
|
|
133
|
+
if (body && typeof body === 'object' && body.ok === false) {
|
|
134
|
+
process.exitCode = 1;
|
|
135
|
+
}
|
|
113
136
|
return;
|
|
114
137
|
}
|
|
115
138
|
printResult(result, json);
|
package/dist/cli/task-context.js
CHANGED
|
@@ -16,6 +16,22 @@ const generatedProcessManagedTempDirs = new Set();
|
|
|
16
16
|
const preparedWindowsSessionRuntimeDirs = new Set();
|
|
17
17
|
const pendingSessionRuntimeDirs = new Map();
|
|
18
18
|
let processTempCleanupRegistered = false;
|
|
19
|
+
export class SessionRuntimeError extends Error {
|
|
20
|
+
stage;
|
|
21
|
+
directory;
|
|
22
|
+
code = 'SESSION_RUNTIME_UNAVAILABLE';
|
|
23
|
+
systemCode;
|
|
24
|
+
constructor(stage, directory, cause) {
|
|
25
|
+
const failure = cause;
|
|
26
|
+
const systemCode = failure?.killed || failure?.code === 'ETIMEDOUT'
|
|
27
|
+
? 'ETIMEDOUT' : failure?.code === undefined ? undefined : String(failure.code);
|
|
28
|
+
super(`SESSION_RUNTIME_UNAVAILABLE: managed session TMPDIR is unavailable or untrusted (${stage}${systemCode ? `; ${systemCode}` : ''})`, { cause });
|
|
29
|
+
this.stage = stage;
|
|
30
|
+
this.directory = directory;
|
|
31
|
+
this.name = 'SessionRuntimeError';
|
|
32
|
+
this.systemCode = systemCode;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
19
35
|
function isPlainObject(value) {
|
|
20
36
|
return !!value && typeof value === 'object' && !Array.isArray(value);
|
|
21
37
|
}
|
|
@@ -225,16 +241,44 @@ function sessionRuntimeName(sessionId) {
|
|
|
225
241
|
* runner filesystem policy, so the runtime directory only needs a portable
|
|
226
242
|
* writable ACL rather than host-user secrecy.
|
|
227
243
|
*/
|
|
228
|
-
|
|
244
|
+
// Reapplying an inheritable ACE can walk a large existing session tree.
|
|
245
|
+
// Read only its root DACL first; use the original grant if evidence is absent.
|
|
246
|
+
const WINDOWS_SESSION_ACL_CHECK = `
|
|
247
|
+
$ErrorActionPreference='Stop'
|
|
248
|
+
$acl=[System.IO.Directory]::GetAccessControl($env:EVOLCORE_SESSION_RUNTIME_ACL_PATH)
|
|
249
|
+
$rules=@($acl.GetAccessRules($true,$true,[System.Security.Principal.SecurityIdentifier]))
|
|
250
|
+
$modify=[System.Security.AccessControl.FileSystemRights]::Modify
|
|
251
|
+
$inherit=[System.Security.AccessControl.InheritanceFlags]'ContainerInherit,ObjectInherit'
|
|
252
|
+
$ok=@($rules | Where-Object { $_.IdentityReference.Value -eq 'S-1-5-32-545' -and $_.AccessControlType -eq 'Allow' -and ($_.FileSystemRights -band $modify) -eq $modify -and ($_.InheritanceFlags -band $inherit) -eq $inherit -and $_.PropagationFlags -eq 'None' }).Count -gt 0
|
|
253
|
+
if ($ok -and @($rules | Where-Object { $_.AccessControlType -eq 'Deny' }).Count -eq 0) { 'ready' }
|
|
254
|
+
`;
|
|
255
|
+
function windowsSessionAclQuery(directory) {
|
|
256
|
+
return {
|
|
257
|
+
command: path.join(process.env.SystemRoot || process.env.WINDIR || 'C:\\Windows', 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe'),
|
|
258
|
+
args: ['-NoProfile', '-NonInteractive', '-Command', WINDOWS_SESSION_ACL_CHECK],
|
|
259
|
+
options: { windowsHide: true, timeout: 2_000, env: { ...process.env, EVOLCORE_SESSION_RUNTIME_ACL_PATH: directory } },
|
|
260
|
+
};
|
|
261
|
+
}
|
|
262
|
+
function ensureWindowsSessionRuntimeAccess(directory, existing) {
|
|
229
263
|
if (process.platform !== 'win32' || preparedWindowsSessionRuntimeDirs.has(directory))
|
|
230
264
|
return;
|
|
265
|
+
if (existing) {
|
|
266
|
+
const query = windowsSessionAclQuery(directory);
|
|
267
|
+
try {
|
|
268
|
+
if (execFileSync(query.command, query.args, { ...query.options, encoding: 'utf8' }).trim() === 'ready') {
|
|
269
|
+
preparedWindowsSessionRuntimeDirs.add(directory);
|
|
270
|
+
return;
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
catch { /* Unknown ACL: retain the original grant and failure behavior. */ }
|
|
274
|
+
}
|
|
231
275
|
const icacls = path.join(process.env.SystemRoot || process.env.WINDIR || 'C:\\Windows', 'System32', 'icacls.exe');
|
|
232
276
|
execFileSync(icacls, [
|
|
233
277
|
directory,
|
|
234
278
|
'/grant',
|
|
235
279
|
'*S-1-5-32-545:(OI)(CI)M',
|
|
236
280
|
'/Q',
|
|
237
|
-
], { windowsHide: true, stdio: 'pipe' });
|
|
281
|
+
], { windowsHide: true, stdio: 'pipe', timeout: 10_000 });
|
|
238
282
|
preparedWindowsSessionRuntimeDirs.add(directory);
|
|
239
283
|
}
|
|
240
284
|
/** Whether a task-provided runtime directory is a stable EvolCore session root. */
|
|
@@ -289,7 +333,7 @@ export function getManagedTaskTempDir(runtimeEnv) {
|
|
|
289
333
|
&& path.resolve(contextDir) === path.resolve(configured)
|
|
290
334
|
&& isManagedSessionRuntimeDir(configured);
|
|
291
335
|
if (!trusted) {
|
|
292
|
-
throw new
|
|
336
|
+
throw new SessionRuntimeError('validate', configured);
|
|
293
337
|
}
|
|
294
338
|
return path.resolve(configured);
|
|
295
339
|
}
|
|
@@ -303,15 +347,24 @@ export function ensureSessionRuntimeDir(sessionId) {
|
|
|
303
347
|
return undefined;
|
|
304
348
|
const root = systemTempRoot();
|
|
305
349
|
const directory = path.join(root, sessionRuntimeName(sessionId));
|
|
350
|
+
let stage = 'create-root';
|
|
306
351
|
try {
|
|
307
352
|
fs.mkdirSync(root, { recursive: true, mode: 0o700 });
|
|
308
|
-
|
|
309
|
-
|
|
353
|
+
stage = 'create-session';
|
|
354
|
+
const created = fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
|
|
355
|
+
stage = 'grant-access';
|
|
356
|
+
ensureWindowsSessionRuntimeAccess(directory, created === undefined);
|
|
357
|
+
stage = 'create-locks';
|
|
310
358
|
fs.mkdirSync(path.join(directory, 'locks'), { recursive: true, mode: 0o700 });
|
|
311
|
-
|
|
359
|
+
stage = 'validate';
|
|
360
|
+
if (!isManagedSessionRuntimeDir(directory, root))
|
|
361
|
+
throw new SessionRuntimeError(stage, directory);
|
|
362
|
+
return directory;
|
|
312
363
|
}
|
|
313
|
-
catch {
|
|
314
|
-
|
|
364
|
+
catch (error) {
|
|
365
|
+
if (error instanceof SessionRuntimeError)
|
|
366
|
+
throw error;
|
|
367
|
+
throw new SessionRuntimeError(stage, directory, error);
|
|
315
368
|
}
|
|
316
369
|
}
|
|
317
370
|
/** Await ACL preparation without blocking unrelated sessions or daemon I/O. */
|
|
@@ -324,21 +377,36 @@ export async function ensureSessionRuntimeDirAsync(sessionId) {
|
|
|
324
377
|
if (pending)
|
|
325
378
|
return pending;
|
|
326
379
|
const prepare = (async () => {
|
|
380
|
+
let stage = 'create-root';
|
|
327
381
|
try {
|
|
328
382
|
await fs.promises.mkdir(root, { recursive: true, mode: 0o700 });
|
|
329
|
-
|
|
383
|
+
stage = 'create-session';
|
|
384
|
+
const created = await fs.promises.mkdir(directory, { recursive: true, mode: 0o700 });
|
|
385
|
+
stage = 'grant-access';
|
|
330
386
|
if (process.platform === 'win32' && !preparedWindowsSessionRuntimeDirs.has(directory)) {
|
|
331
|
-
const
|
|
332
|
-
await new Promise(
|
|
333
|
-
execFile(
|
|
387
|
+
const query = windowsSessionAclQuery(directory);
|
|
388
|
+
const alreadyGranted = created === undefined && await new Promise(resolve => {
|
|
389
|
+
execFile(query.command, query.args, query.options, (error, stdout) => resolve(!error && String(stdout).trim() === 'ready'));
|
|
334
390
|
});
|
|
391
|
+
if (!alreadyGranted) {
|
|
392
|
+
const icacls = path.join(process.env.SystemRoot || process.env.WINDIR || 'C:\\Windows', 'System32', 'icacls.exe');
|
|
393
|
+
await new Promise((resolve, reject) => {
|
|
394
|
+
execFile(icacls, [directory, '/grant', '*S-1-5-32-545:(OI)(CI)M', '/Q'], { windowsHide: true, timeout: 10_000 }, error => error ? reject(error) : resolve());
|
|
395
|
+
});
|
|
396
|
+
}
|
|
335
397
|
preparedWindowsSessionRuntimeDirs.add(directory);
|
|
336
398
|
}
|
|
399
|
+
stage = 'create-locks';
|
|
337
400
|
await fs.promises.mkdir(path.join(directory, 'locks'), { recursive: true, mode: 0o700 });
|
|
338
|
-
|
|
401
|
+
stage = 'validate';
|
|
402
|
+
if (!isManagedSessionRuntimeDir(directory, root))
|
|
403
|
+
throw new SessionRuntimeError(stage, directory);
|
|
404
|
+
return directory;
|
|
339
405
|
}
|
|
340
|
-
catch {
|
|
341
|
-
|
|
406
|
+
catch (error) {
|
|
407
|
+
if (error instanceof SessionRuntimeError)
|
|
408
|
+
throw error;
|
|
409
|
+
throw new SessionRuntimeError(stage, directory, error);
|
|
342
410
|
}
|
|
343
411
|
})();
|
|
344
412
|
pendingSessionRuntimeDirs.set(directory, prepare);
|
|
@@ -73,9 +73,11 @@ export async function cmdUpgrade(argv) {
|
|
|
73
73
|
: await ipcHostQuery(resolvePaths().socket, command, 120_000, { throwOnError: true });
|
|
74
74
|
if (!raw)
|
|
75
75
|
throw Object.assign(new Error('无法连接 EvolCore daemon'), { code: 'DAEMON_UNAVAILABLE' });
|
|
76
|
-
//
|
|
76
|
+
// Upgrade executors return Menu responses directly; other IPC paths may wrap them.
|
|
77
|
+
// Authentication can also reject the request before the Menu adapter runs.
|
|
77
78
|
const envelope = raw;
|
|
78
|
-
const payload = envelope.
|
|
79
|
+
const payload = envelope.type === 'menu.response'
|
|
80
|
+
? raw : envelope.response ?? envelope.data?.response;
|
|
79
81
|
if (payload && typeof payload === 'object' && payload.type === 'menu.response') {
|
|
80
82
|
response = parseMenuResponse(payload);
|
|
81
83
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SYSTEM_SESSION_TYPES } from '../core/system-session/types.js';
|
|
2
|
+
import { isValidAid } from '../aun/aid/validation.js';
|
|
2
3
|
const BEHAVIOR_TOP_FIELDS = new Set([
|
|
3
4
|
'active_baseagent',
|
|
4
5
|
'chatmode',
|
|
@@ -13,6 +14,7 @@ const BEHAVIOR_TOP_FIELDS = new Set([
|
|
|
13
14
|
'session_renew',
|
|
14
15
|
'groupRules',
|
|
15
16
|
'group_venue_sync',
|
|
17
|
+
'team',
|
|
16
18
|
'render',
|
|
17
19
|
'sessionManifests',
|
|
18
20
|
'enable_rich_content',
|
|
@@ -148,6 +150,12 @@ export function resolveConfigFieldRule(fieldPath, scope) {
|
|
|
148
150
|
return scalar(field, 'boolean', 'owner-only');
|
|
149
151
|
if (field === 'bootstrapWelcome')
|
|
150
152
|
return scalar(field, 'boolean', 'owner-only');
|
|
153
|
+
// 团队成员名单:Evol App 的 Team Workspace 菜单也能改,CLI 只是同一份配置的
|
|
154
|
+
// 另一个入口。**不设 owner-only**:agent 之间自主协作时由 agent 自己组队,
|
|
155
|
+
// 加人要先过 Owner 审批就没法自动协作。成员资格的业务校验(在名录里、未拉黑、
|
|
156
|
+
// 有 owner 归属、不超 50 人)在写入点做,不靠字段权限。
|
|
157
|
+
if (field === 'team')
|
|
158
|
+
return scalar('team', 'aid-list');
|
|
151
159
|
if (field === 'ability')
|
|
152
160
|
return readonlyObject('ability');
|
|
153
161
|
if (field === 'ability.codeApproval.enabled')
|
|
@@ -351,5 +359,21 @@ export function parseConfigFieldValue(fieldPath, rawValue) {
|
|
|
351
359
|
return raw === 'load' || raw === 'ignore'
|
|
352
360
|
? { ok: true, value: raw }
|
|
353
361
|
: { ok: false, reason: `Config field ${fieldPath} must be load or ignore` };
|
|
362
|
+
case 'aid-list': {
|
|
363
|
+
// 空串是合法的"清空";非空时逐个校验。这里只管格式与去重,
|
|
364
|
+
// 业务规则(在不在名录、是不是自己、有没有 owner)在写入点按各自语义再做。
|
|
365
|
+
if (!raw)
|
|
366
|
+
return { ok: true, value: [] };
|
|
367
|
+
const items = raw.split(',').map(item => item.trim()).filter(Boolean);
|
|
368
|
+
if (items.length === 0)
|
|
369
|
+
return { ok: true, value: [] };
|
|
370
|
+
const invalid = items.find(aid => !isValidAid(aid));
|
|
371
|
+
if (invalid)
|
|
372
|
+
return { ok: false, reason: `Config field ${fieldPath} contains an invalid AID: ${invalid}` };
|
|
373
|
+
if (new Set(items).size !== items.length) {
|
|
374
|
+
return { ok: false, reason: `Config field ${fieldPath} contains duplicate AIDs` };
|
|
375
|
+
}
|
|
376
|
+
return { ok: true, value: items };
|
|
377
|
+
}
|
|
354
378
|
}
|
|
355
379
|
}
|