evolcore 0.0.46 → 0.0.48
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 +93 -0
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +139 -39
- package/dist/agent-template/service.js +66 -13
- package/dist/agents/baseagent.js +60 -20
- package/dist/agents/claude-runner.js +43 -18
- package/dist/agents/codex/app-server-client.js +32 -23
- package/dist/agents/codex-runner.js +31 -16
- package/dist/agents/ecagent-runner.js +7 -4
- package/dist/agents/gemini-runner.js +5 -2
- package/dist/agents/runner-types.js +5 -21
- package/dist/aun/aid/agentmd.js +5 -1
- package/dist/aun/group/fs-download.js +1 -1
- package/dist/aun/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +100 -32
- package/dist/channels/daemon.js +10 -26
- package/dist/cli/aun-commands.js +86 -51
- package/dist/cli/code-stats.js +19 -8
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +65 -76
- package/dist/cli/daemon-lifecycle-client.js +17 -3
- package/dist/cli/directory.js +7 -1
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +2 -8
- package/dist/cli/init-channel.js +6 -8
- package/dist/cli/init.js +74 -46
- package/dist/cli/invoke-command.js +1 -1
- package/dist/cli/provider-command.js +74 -13
- package/dist/cli/restart-monitor.js +104 -28
- package/dist/cli/role.js +61 -17
- package/dist/cli/stats.js +3 -3
- package/dist/cli/task-context.js +83 -15
- package/dist/cli/thread-command.js +16 -51
- package/dist/cli/upgrade-command.js +4 -2
- package/dist/config/boot-log.js +3 -9
- package/dist/config/builtin-roles.js +5 -7
- package/dist/config/config-manager.js +31 -23
- package/dist/config/daemon-services.js +30 -3
- package/dist/config/gateway-config.js +2 -2
- package/dist/config/invoke-ipc-service.js +6 -4
- package/dist/config/peer-bind-code.js +3 -4
- package/dist/config/peer-book-store.js +59 -218
- package/dist/config/peer-book.js +26 -27
- package/dist/config/peer-role-resolver.js +16 -1
- package/dist/config/provider-identity-migration.js +161 -6
- package/dist/config/provider-ipc-service.js +56 -11
- package/dist/config/provider-menu-request.js +24 -5
- package/dist/config/provider-templates.js +127 -0
- package/dist/config/providers-config.js +59 -8
- package/dist/config/providers-management.js +467 -49
- package/dist/config/role-command-service.js +248 -1
- package/dist/config/schema-migration.js +228 -20
- package/dist/config/schema-registry.js +6 -2
- package/dist/core/agent-application-service.js +6 -1
- package/dist/core/agent-runtime.js +10 -5
- package/dist/core/auth/agent-delegation.js +10 -4
- package/dist/core/auth/auth-gateway.js +2 -1
- package/dist/core/auth/delegation-authorization.js +3 -0
- package/dist/core/auth/delegation-diagnostics.js +56 -15
- package/dist/core/auth/operation-authorizer.js +26 -1
- package/dist/core/auth/operation-catalog.js +28 -64
- package/dist/core/capability/providers/codex-capability-provider.js +7 -8
- package/dist/core/channel-loader.js +18 -0
- package/dist/core/command/agent-control.js +32 -0
- package/dist/core/command/command-handler.js +81 -85
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +65 -153
- package/dist/core/command/menu-protocol.js +7 -1
- package/dist/core/command/provider-menu.js +13 -3
- package/dist/core/command/role-menu.js +47 -23
- package/dist/core/command/slash-handler.js +30 -49
- package/dist/core/command/team-workspace-items.js +81 -12
- package/dist/core/command/team-workspace-team.js +9 -71
- package/dist/core/command/topic-slash.js +9 -30
- package/dist/core/daemon-bootstrap.js +19 -10
- package/dist/core/daemon-control.js +8 -10
- package/dist/core/daemon-lifecycle.js +50 -40
- package/dist/core/evolagent-registry.js +22 -3
- package/dist/core/file-integrity/store.js +2 -0
- package/dist/core/handoff/runtime.js +37 -1
- package/dist/core/host-snapshot.js +9 -4
- package/dist/core/inference/text-inference.js +3 -1
- package/dist/core/initialization/service.js +31 -8
- package/dist/core/interaction-router.js +3 -0
- package/dist/core/invoke/executors/text.js +72 -19
- package/dist/core/ipc-registration.js +6 -4
- package/dist/core/memory/consolidation.js +6 -6
- package/dist/core/message/aun-ipc-sender.js +165 -55
- package/dist/core/message/im-renderer.js +1 -1
- package/dist/core/message/message-bridge.js +51 -334
- package/dist/core/message/message-log.js +5 -0
- package/dist/core/message/message-queue.js +22 -0
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +429 -116
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/ownership/owner-resolver.js +355 -60
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/relation/peer-identity.js +28 -2
- package/dist/core/relation/same-owner-proof.js +81 -111
- package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
- package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
- package/dist/core/session/session-file-health.js +49 -14
- package/dist/core/session/session-fs-store.js +91 -35
- package/dist/core/session/session-manager.js +68 -24
- package/dist/core/session/session-mapper.js +14 -34
- package/dist/core/session/session-transcript.js +5 -1
- package/dist/core/task/task-activity-store.js +84 -0
- package/dist/core/task/task-image-resources.js +1 -1
- package/dist/core/task/task-recovery-service.js +12 -0
- package/dist/core/thread/command-parser.js +7 -12
- package/dist/core/thread/thread-context-storage.js +3 -2
- package/dist/core/thread/thread-operation.js +2 -13
- package/dist/core/thread/thread-service.js +15 -46
- package/dist/directory/owner-directory-admission.js +1 -1
- package/dist/directory/owner-directory-cache.js +45 -28
- package/dist/directory/owner-directory-markdown.js +13 -1
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/eck/message-renderer.js +84 -24
- package/dist/ecweb/basic-settings-service.js +3 -1
- package/dist/ecweb/message-context-service.js +1 -1
- package/dist/ecweb/pairing.js +4 -3
- package/dist/ecweb/providers-service.js +26 -1
- package/dist/ecweb/runtime/lifecycle.js +82 -23
- package/dist/ecweb/runtime/proxy-access.js +74 -0
- package/dist/ecweb/runtime/supervisor.js +6 -17
- package/dist/event-center/registry.js +13 -2
- package/dist/event-center/runtime.js +103 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +129 -93
- package/dist/ipc.js +15 -3
- package/dist/outputs/events.js +62 -0
- package/dist/outputs/protocol.js +102 -0
- package/dist/outputs/service.js +279 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +89 -4
- package/dist/services/ipc-operation.js +4 -15
- package/dist/services/pack-manager.js +12 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +305 -24
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- package/dist/stats/role-budget.js +5 -2
- package/dist/stats/writer.js +10 -6
- package/dist/trigger/audit.js +7 -0
- package/dist/trigger/authorization.js +105 -11
- package/dist/trigger/feedback.js +10 -0
- package/dist/trigger/history.js +37 -11
- package/dist/trigger/ipc-service.js +12 -1
- package/dist/trigger/manager.js +1 -0
- package/dist/trigger/scheduler.js +11 -5
- package/dist/trigger/script-executor.js +2 -1
- package/dist/trigger/script-sandbox.js +9 -3
- package/dist/trigger/state.js +7 -0
- package/dist/trigger/validation.js +22 -0
- package/dist/utils/aid-bind.js +155 -18
- package/dist/utils/atomic-write.js +3 -3
- package/dist/utils/cross-platform.js +97 -31
- package/dist/utils/error-dict.json +94 -4
- package/dist/utils/error-utils.js +40 -4
- package/dist/utils/evolcore-version.js +36 -65
- package/dist/utils/instance-registry.js +61 -0
- package/dist/utils/msg-diag.js +1 -0
- package/dist/utils/process-introspect.js +158 -8
- package/dist/utils/process-tree.js +50 -2
- package/dist/utils/upgrade-jobs.js +4 -4
- package/dist/utils/windows-shell-trust.js +2 -0
- package/dist/workbench/protocol.js +80 -0
- package/dist/workbench/service.js +359 -0
- package/ecagent/dist/types.d.ts +6 -2
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +2 -2
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +12 -0
- package/kits/docs/evolcore/directory.md +22 -3
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +133 -5
- package/kits/docs/evolcore/role.md +80 -0
- package/kits/docs/evolcore/services.md +6 -6
- package/kits/docs/evolcore/team-workspace.md +1 -1
- package/kits/docs/evolcore/thread-chain.md +14 -15
- package/kits/docs/evolcore/tool-authorization.md +5 -0
- package/kits/docs/evolcore/trigger.md +10 -0
- package/kits/eck_message_manifest.json +12 -0
- package/kits/provider-templates.json +1213 -0
- package/kits/rules/04-relation.md +3 -3
- package/kits/schemas/_meta.json +14 -2
- package/kits/schemas/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ability/references/calling.md +1 -1
- package/kits/skills/ec-group/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +19 -72
- package/kits/skills/ec-provider/SKILL.md +221 -0
- package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +34 -21
- package/kits/templates/message-fragments/group-batch-item.md +1 -1
- package/kits/templates/message-fragments/group-batch.md +1 -1
- package/kits/templates/message-fragments/inject-default.md +1 -1
- package/kits/templates/message-fragments/interrupt-insert.md +1 -0
- package/kits/templates/message-fragments/item-group.md +1 -1
- package/kits/templates/message-fragments/item-private.md +1 -1
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/message-fragments/trigger-session.md +1 -1
- package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
- package/kits/templates/roles/admin.json +2 -19
- package/kits/templates/roles/member.json +0 -3
- package/kits/templates/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +3 -3
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +1 -1
- package/kits/templates/system-fragments/thread.md +6 -5
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +4 -1
- package/scripts/agent-template/shared/common.mjs +2 -3
- package/scripts/agent-template/shared/template-contract.mjs +2 -1
- package/scripts/agent-template/shared/template-package.mjs +9 -2
- package/scripts/agent-template/shared/template-runtime.mjs +20 -5
- package/scripts/agent-template/team-pack.mjs +6 -3
- package/dist/cli/peer.js +0 -127
- package/dist/config/peer-operation-service.js +0 -132
- package/dist/config/peer-request-service.js +0 -532
- package/dist/core/command/connect-menu.js +0 -624
|
@@ -103,6 +103,41 @@ function cleanEnv() {
|
|
|
103
103
|
function reportPidReused(pid, log) {
|
|
104
104
|
log(`Process ${pid} no longer refers to the recorded daemon; treating the original process as exited`);
|
|
105
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
|
+
}
|
|
106
141
|
export async function cmdRestartMonitor() {
|
|
107
142
|
// Defense in depth: a unit test that accidentally executes the real restart
|
|
108
143
|
// path must not detach a persistent daemon from the test worker.
|
|
@@ -281,12 +316,36 @@ export async function cmdRestartMonitor() {
|
|
|
281
316
|
// instance registry cannot see them. Their strict environment markers make
|
|
282
317
|
// them safe to reap globally on every real restart. Keep one process-table
|
|
283
318
|
// snapshot for both orphan categories; each Windows CIM scan is expensive.
|
|
284
|
-
|
|
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');
|
|
285
342
|
let oldStatus = scanInstances({ includeAidActivity: false, processSnapshot: beforeStopSnapshot });
|
|
286
343
|
const orphanSnapshot = findOrphanProcesses(oldStatus, beforeStopSnapshot);
|
|
344
|
+
let stoppedSnapshot = exitConfirmedBySnapshot ? beforeStopSnapshot : undefined;
|
|
287
345
|
{
|
|
288
346
|
const leakedTestDaemons = orphanSnapshot.filter(o => o.confirmedTestDaemon);
|
|
289
347
|
if (leakedTestDaemons.length > 0) {
|
|
348
|
+
stoppedSnapshot = undefined;
|
|
290
349
|
const killed = await killOrphans(leakedTestDaemons);
|
|
291
350
|
log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
|
|
292
351
|
}
|
|
@@ -307,7 +366,7 @@ export async function cmdRestartMonitor() {
|
|
|
307
366
|
const pids = runtimeOrphans.map(o => o.pid).join(', ');
|
|
308
367
|
log(`Stopping unregistered EvolCore process(es): ${pids}`);
|
|
309
368
|
const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
|
|
310
|
-
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');
|
|
311
370
|
const retiredOrphans = new Set();
|
|
312
371
|
for (const orphan of runtimeOrphans) {
|
|
313
372
|
if (orphan.pid !== ping) {
|
|
@@ -320,7 +379,8 @@ export async function cmdRestartMonitor() {
|
|
|
320
379
|
const exited = await trace.waitForDependency(Promise.all(runtimeOrphans.map(async (orphan) => {
|
|
321
380
|
if (retiredOrphans.has(orphan.pid))
|
|
322
381
|
return true;
|
|
323
|
-
if (
|
|
382
|
+
if (orphan.pid === earlyGracefulPid ? earlyGracefulExited
|
|
383
|
+
: await platform.waitForProcessExit(orphan.pid, orphan.pid === ping ? 30_000 : 10_000))
|
|
324
384
|
return true;
|
|
325
385
|
if (await isRecordedProcessGone(orphan.pid, orphan.startedAt))
|
|
326
386
|
return true;
|
|
@@ -338,14 +398,16 @@ export async function cmdRestartMonitor() {
|
|
|
338
398
|
invalidateProcessSnapshot();
|
|
339
399
|
const snapshot = await trace.waitForDependency(getProcessSnapshotAsync({ fresh: true }), 'process inspection after orphan cleanup');
|
|
340
400
|
oldStatus = scanInstances({ includeAidActivity: false, processSnapshot: snapshot });
|
|
401
|
+
stoppedSnapshot = snapshot;
|
|
341
402
|
}
|
|
342
403
|
// 等待所有活 main 进程退出(可能不止一个)
|
|
343
404
|
const aliveMains = oldStatus.mains.filter(m => m.alive);
|
|
344
405
|
if (aliveMains.length > 0) {
|
|
406
|
+
stoppedSnapshot = undefined;
|
|
345
407
|
const oldPids = aliveMains.map(m => m.record.pid);
|
|
346
408
|
const expectedStarts = new Map(aliveMains.map(m => [m.record.pid, m.record.startedAt]));
|
|
347
409
|
log(`Monitoring ${oldPids.length} main process(es): ${oldPids.join(', ')}`);
|
|
348
|
-
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');
|
|
349
411
|
log(`Graceful shutdown request ${gracefulPid === null ? 'was not accepted' : `accepted by PID ${gracefulPid}`}`);
|
|
350
412
|
// 没有收到 IPC shutdown 确认的进程才走信号兜底
|
|
351
413
|
const retiredPids = new Set();
|
|
@@ -369,8 +431,9 @@ export async function cmdRestartMonitor() {
|
|
|
369
431
|
if (retiredPids.has(oldPid))
|
|
370
432
|
return true;
|
|
371
433
|
const expectedStartedAt = expectedStarts.get(oldPid);
|
|
372
|
-
//
|
|
373
|
-
|
|
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)) {
|
|
374
437
|
log(`Process ${oldPid} has exited`);
|
|
375
438
|
return true;
|
|
376
439
|
}
|
|
@@ -410,8 +473,13 @@ export async function cmdRestartMonitor() {
|
|
|
410
473
|
// watchdog has successfully loaded.
|
|
411
474
|
// Shutdown changed the process table. A cached pre-shutdown snapshot can
|
|
412
475
|
// otherwise classify the exited daemon as an unregistered runtime process.
|
|
413
|
-
|
|
414
|
-
|
|
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');
|
|
415
483
|
const remainingStatus = scanInstances({ includeAidActivity: false, processSnapshot: afterStopSnapshot });
|
|
416
484
|
const remaining = findOrphanProcesses(remainingStatus, afterStopSnapshot);
|
|
417
485
|
const remainingMains = remainingStatus.mains.filter(item => item.alive);
|
|
@@ -437,7 +505,7 @@ export async function cmdRestartMonitor() {
|
|
|
437
505
|
else if (otherHome.length) {
|
|
438
506
|
log(`Other HOME orphan processes left running: ${otherHome.map(o => o.pid).join(', ')}`);
|
|
439
507
|
}
|
|
440
|
-
const stoppedCodex = await stopCodexAppServerOrphans();
|
|
508
|
+
const stoppedCodex = await trace.waitForDependency(stopCodexAppServerOrphans(afterStopSnapshot), 'registered Codex child cleanup');
|
|
441
509
|
if (stoppedCodex)
|
|
442
510
|
log(`Cleaned ${stoppedCodex} EvolCore codex app-server orphan(s)`);
|
|
443
511
|
try {
|
|
@@ -1235,7 +1303,20 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1235
1303
|
[CHANNEL_LOGS_ENV]: process.env[CHANNEL_LOGS_ENV] || 'false',
|
|
1236
1304
|
}
|
|
1237
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
|
+
});
|
|
1238
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
|
+
}
|
|
1239
1320
|
trace.setMeta('daemonPid', String(childPid));
|
|
1240
1321
|
trace.mark('monitor.waitReady', undefined, { initialPhase: 'running' });
|
|
1241
1322
|
if (foreground) {
|
|
@@ -1246,27 +1327,22 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
|
|
|
1246
1327
|
}
|
|
1247
1328
|
else
|
|
1248
1329
|
child.unref();
|
|
1249
|
-
fs.closeSync(out);
|
|
1250
|
-
fs.closeSync(err);
|
|
1251
1330
|
log(`Spawned new process PID: ${childPid}, waiting for ready signal...`);
|
|
1252
|
-
const childExited = () => child.exitCode !== null || child.signalCode !== null;
|
|
1331
|
+
const childExited = () => spawnFailed || child.exitCode !== null || child.signalCode !== null;
|
|
1253
1332
|
const isChildRunning = async () => !childExited() && await trace.waitForDependency(platform.isProcessRunningAsync(childPid), 'daemon process liveness') && !childExited();
|
|
1254
|
-
//
|
|
1255
|
-
|
|
1256
|
-
|
|
1257
|
-
|
|
1258
|
-
|
|
1259
|
-
if (
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
trace.finish(true);
|
|
1268
|
-
return true;
|
|
1269
|
-
}
|
|
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;
|
|
1270
1346
|
}
|
|
1271
1347
|
const ping = await trace.waitForDependency(ipcQuery(p.socket, { type: 'ping' }, platform.isWindows ? 5_000 : 1_000), 'daemon IPC ping response');
|
|
1272
1348
|
if (ping?.pong === true && ping.pid === childPid && await isChildRunning()) {
|
package/dist/cli/role.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
1
2
|
import { resolvePaths } from '../paths.js';
|
|
2
3
|
import { executeResolvedRoleCommand, resolveRoleCommand, } from '../config/role-command-service.js';
|
|
3
4
|
import { applyApprovedRoleAssignment } from '../core/command/role-menu.js';
|
|
@@ -11,26 +12,50 @@ export async function cmdRole(args) {
|
|
|
11
12
|
return;
|
|
12
13
|
}
|
|
13
14
|
const json = getArgValue(args, '--format') === 'json';
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const result = await runManaged(args
|
|
15
|
+
try {
|
|
16
|
+
if (process.env.EVOLCORE_SESSION_ID !== undefined || readDelegationCredential()) {
|
|
17
|
+
const result = await runManaged(args);
|
|
17
18
|
output(result, json);
|
|
19
|
+
return;
|
|
18
20
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
const resolved = resolveRoleCommand(args);
|
|
22
|
+
if (!resolved.ok)
|
|
23
|
+
fail(resolved.reason, resolved.code);
|
|
24
|
+
const selfAid = resolved.command.selfAid;
|
|
25
|
+
const quota = resolved.command.kind === 'quota';
|
|
26
|
+
if (quota) {
|
|
27
|
+
let controlToken;
|
|
28
|
+
try {
|
|
29
|
+
controlToken = fs.readFileSync(resolvePaths().controlToken, 'utf8').trim();
|
|
30
|
+
}
|
|
31
|
+
catch { }
|
|
32
|
+
const { response, transportError } = await queryDaemon(resolvePaths().socket, {
|
|
33
|
+
type: 'role.op', argv: ['role', ...args], controlToken,
|
|
34
|
+
}, 10_000);
|
|
35
|
+
if (!response)
|
|
36
|
+
fail(daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon'), 'DAEMON_UNAVAILABLE');
|
|
37
|
+
if (!response.ok || !response.result)
|
|
38
|
+
fail(response.error || 'role operation failed', response.code, response.data);
|
|
39
|
+
output(response.result, json);
|
|
40
|
+
return;
|
|
22
41
|
}
|
|
23
|
-
|
|
42
|
+
const actorAid = listStaticAgentOwners(selfAid)[0] ?? selfAid;
|
|
43
|
+
const result = await executeResolvedRoleCommand(resolved.command, actorAid, applyApprovedRoleAssignment, {
|
|
44
|
+
self: selfAid, actorRole: 'owner', actorAid,
|
|
45
|
+
});
|
|
46
|
+
if (!result.ok)
|
|
47
|
+
fail(result.error, result.code, result.data);
|
|
48
|
+
output(result, json);
|
|
49
|
+
}
|
|
50
|
+
catch (err) {
|
|
51
|
+
const failure = { ok: false, code: err.code ?? 'ROLE_OPERATION_FAILED', error: err.message ?? String(err),
|
|
52
|
+
...(err.data !== undefined ? { data: err.data } : {}) };
|
|
53
|
+
if (json)
|
|
54
|
+
output(failure, true);
|
|
55
|
+
else
|
|
56
|
+
console.error(`❌ [${failure.code}] ${failure.error}`);
|
|
57
|
+
process.exitCode = 1;
|
|
24
58
|
}
|
|
25
|
-
const resolved = resolveRoleCommand(args);
|
|
26
|
-
if (!resolved.ok)
|
|
27
|
-
fail(resolved.reason, resolved.code);
|
|
28
|
-
const selfAid = resolved.command.selfAid;
|
|
29
|
-
const actorAid = listStaticAgentOwners(selfAid)[0] ?? selfAid;
|
|
30
|
-
const result = await executeResolvedRoleCommand(resolved.command, actorAid, applyApprovedRoleAssignment);
|
|
31
|
-
if (!result.ok)
|
|
32
|
-
fail(result.error, result.code, result.data);
|
|
33
|
-
output(result, json);
|
|
34
59
|
}
|
|
35
60
|
function output(value, json) {
|
|
36
61
|
if (json)
|
|
@@ -38,7 +63,7 @@ function output(value, json) {
|
|
|
38
63
|
else
|
|
39
64
|
console.log(JSON.stringify(value, null, 2));
|
|
40
65
|
}
|
|
41
|
-
async function runManaged(args
|
|
66
|
+
async function runManaged(args) {
|
|
42
67
|
const sessionId = process.env.EVOLCORE_SESSION_ID;
|
|
43
68
|
const delegationToken = readDelegationCredential();
|
|
44
69
|
if (!delegationToken)
|
|
@@ -70,10 +95,29 @@ function printHelp() {
|
|
|
70
95
|
ec role list [--status pending|approved|rejected|expired] [--self <agent-aid>]
|
|
71
96
|
ec role approve <request-id> [--reason '<text>'] [--self <agent-aid>]
|
|
72
97
|
ec role reject <request-id> [--reason '<text>'] [--self <agent-aid>]
|
|
98
|
+
ec role quota show <role-id> [--self <agent-aid>] [--format json]
|
|
99
|
+
ec role quota set <role-id> [额度选项] [--self <agent-aid>]
|
|
100
|
+
ec role quota disable <role-id> [--self <agent-aid>]
|
|
101
|
+
ec role quota inherit <role-id> [--self <agent-aid>]
|
|
102
|
+
|
|
103
|
+
额度选项(仅修改明确传入的字段):
|
|
104
|
+
--enabled true|false 启用或关闭角色用量配额
|
|
105
|
+
--limit <amount|unlimited> 金额上限;0 表示阻止使用,unlimited 表示不限
|
|
106
|
+
--currency CNY|USD 人民币或美元
|
|
107
|
+
--reset daily|weekly|monthly|never 重置周期
|
|
108
|
+
--cost-basis gateway|official 网关价或官方价
|
|
109
|
+
--scope subject|role 每个对端独立额度或同角色共享额度
|
|
73
110
|
|
|
74
111
|
说明:
|
|
75
112
|
申请不会立即改变权限,只记录一条待审批请求,交由本 Agent 的 owner 审批。
|
|
76
113
|
approve / reject 只能由本 Agent 的 owner 执行;审批通过后才写入关系角色。
|
|
114
|
+
quota 管理角色定义 usageLimits,不是消息准入频率 access.requestLimit。
|
|
115
|
+
quota set 不自动启用限制;需要时明确传 --enabled true。disable 保留金额等设置。
|
|
116
|
+
inherit 删除角色自己的额度覆盖,恢复使用 member 额度;set 会将当前继承值物化为本角色配置。
|
|
117
|
+
owner/admin 不受角色配额限制;自定义角色没有显式额度时继承 member。
|
|
118
|
+
quota 设置属于角色定义管理,仅 DaemonOwner 或已有可信 /fa 授权任务可执行。
|
|
119
|
+
Owner/Admin 保留当前 Agent 的查询权限;普通 Owner 只能分配已有角色,不能修改额度。
|
|
120
|
+
DaemonOwner 和可信 /fa 可管理同一 daemon 的其他本机 Agent,无需兼任目标 Agent Owner。
|
|
77
121
|
|
|
78
122
|
Options:
|
|
79
123
|
--self <agent-aid> 本端 agent AID;省略时从当前运行环境推断
|
package/dist/cli/stats.js
CHANGED
|
@@ -26,7 +26,7 @@ ec stats — Token 用量与费用统计
|
|
|
26
26
|
--session <id> 指定会话
|
|
27
27
|
|
|
28
28
|
聚合粒度:
|
|
29
|
-
--by hour|day|week|month|model|peer|agent
|
|
29
|
+
--by hour|day|week|month|model|peer|agent|provider
|
|
30
30
|
|
|
31
31
|
快捷视图:
|
|
32
32
|
--session <id> 单个会话明细
|
|
@@ -252,7 +252,7 @@ export async function handleStats(args) {
|
|
|
252
252
|
// 全量重建日聚合表(运维兜底/排查),不依赖时间范围。
|
|
253
253
|
if (flags.rebuild) {
|
|
254
254
|
const { rebuildDailyRollup, getDb } = await import('../stats/db.js');
|
|
255
|
-
const { resolvePrices } = await import('../stats/
|
|
255
|
+
const { resolvePrices } = await import('../stats/model-resolver.js');
|
|
256
256
|
const startedAt = Date.now();
|
|
257
257
|
// 步骤1:回填 usage_events 的 cost 字段(只处理 cost_official_usd IS NULL 的行)
|
|
258
258
|
console.log(`${CYAN}正在回填历史事件的费用数据...${RESET}`);
|
|
@@ -680,7 +680,7 @@ export async function handleStats(args) {
|
|
|
680
680
|
const totCacheAll = totIn + totCacheRead;
|
|
681
681
|
const sessionCacheHitRate = totCacheAll > 0 ? totCacheRead / totCacheAll : 0;
|
|
682
682
|
// model_spec
|
|
683
|
-
const { resolveModelSpec } = await import('../stats/
|
|
683
|
+
const { resolveModelSpec } = await import('../stats/model-resolver.js');
|
|
684
684
|
const spec = resolveModelSpec(home, last.model);
|
|
685
685
|
const result = {
|
|
686
686
|
turn: {
|
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);
|