evolcore 0.0.43-test.5 → 0.0.43-test.7

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.
Files changed (259) hide show
  1. package/CHANGELOG.md +95 -0
  2. package/bin/ecmsg.js +281 -81
  3. package/dist/agents/baseagent-availability.js +20 -5
  4. package/dist/agents/baseagent.js +2 -2
  5. package/dist/agents/claude-runner.js +19 -4
  6. package/dist/agents/codex/app-server-client.js +36 -3
  7. package/dist/agents/codex-runner.js +75 -8
  8. package/dist/aun/group/invite-service.js +3 -2
  9. package/dist/aun/msg/p2p.js +6 -1
  10. package/dist/aun/service-proxy.js +18 -6
  11. package/dist/channels/aun.js +306 -30
  12. package/dist/cli/agent-create.js +18 -8
  13. package/dist/cli/aun-commands.js +9 -1
  14. package/dist/cli/daemon-commands.js +34 -65
  15. package/dist/cli/daemon-lifecycle-client.js +61 -0
  16. package/dist/cli/ecmsg-gateway.js +38 -3
  17. package/dist/cli/events-command.js +73 -0
  18. package/dist/cli/index.js +31 -14
  19. package/dist/cli/init.js +75 -0
  20. package/dist/cli/invoke-command.js +182 -0
  21. package/dist/cli/managed-command-guard.js +6 -1
  22. package/dist/cli/provider-command.js +1 -1
  23. package/dist/cli/restart-monitor.js +67 -50
  24. package/dist/cli/services-command.js +111 -0
  25. package/dist/cli/task-context.js +38 -1
  26. package/dist/cli/team-workspace-command.js +134 -0
  27. package/dist/cli/thread-command.js +6 -2
  28. package/dist/cli/watch-logs.js +6 -4
  29. package/dist/cli/watch-msg.js +1 -1
  30. package/dist/config/boot-log.js +6 -4
  31. package/dist/config/builtin-roles.js +2 -2
  32. package/dist/config/config-field-policy.js +2 -2
  33. package/dist/config/config-manager.js +1 -8
  34. package/dist/config/invoke-ipc-service.js +118 -0
  35. package/dist/config/peer-role-resolver.js +1 -1
  36. package/dist/config/provider-identity-migration.js +92 -17
  37. package/dist/config/provider-local-sync.js +2 -0
  38. package/dist/config/providers-config.js +13 -0
  39. package/dist/config/providers-management.js +100 -10
  40. package/dist/config/role-service.js +8 -8
  41. package/dist/config/role-store.js +22 -22
  42. package/dist/config/schema-migration.js +86 -88
  43. package/dist/config/snapshot.js +70 -41
  44. package/dist/config-store.js +2 -1
  45. package/dist/core/agent-reload-coordinator.js +6 -4
  46. package/dist/core/agent-runtime.js +146 -15
  47. package/dist/core/auth/delegation-authorization.js +66 -0
  48. package/dist/core/auth/operation-catalog.js +20 -0
  49. package/dist/core/baseagent-loader.js +75 -42
  50. package/dist/core/channel-loader.js +45 -13
  51. package/dist/core/channel-runtime.js +116 -45
  52. package/dist/core/command/agent-control.js +1 -1
  53. package/dist/core/command/agent-storage-menu.js +1 -1
  54. package/dist/core/command/chatmode-config.js +2 -36
  55. package/dist/core/command/command-handler.js +58 -16
  56. package/dist/core/command/data-root-resolver.js +32 -23
  57. package/dist/core/command/eventcenter-menu.js +338 -0
  58. package/dist/core/command/menu-catalog.js +8 -0
  59. package/dist/core/command/menu-handler.js +206 -87
  60. package/dist/core/command/menu-protocol.js +142 -22
  61. package/dist/core/command/menu-query-batch.js +194 -0
  62. package/dist/core/command/role-menu.js +27 -15
  63. package/dist/core/command/slash-gate.js +1 -1
  64. package/dist/core/command/slash-handler.js +34 -42
  65. package/dist/core/command/team-workspace-bootstrap.js +350 -0
  66. package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
  67. package/dist/core/command/team-workspace-initializer.js +2 -0
  68. package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
  69. package/dist/core/command/team-workspace-job-store.js +88 -0
  70. package/dist/core/command/team-workspace-management-service.js +2 -0
  71. package/dist/core/command/team-workspace-management-store.js +96 -0
  72. package/dist/core/command/team-workspace-management.js +265 -0
  73. package/dist/core/command/team-workspace-members-menu.js +88 -0
  74. package/dist/core/command/team-workspace-store.js +612 -0
  75. package/dist/core/command/team-workspace-team.js +193 -0
  76. package/dist/core/daemon-control.js +45 -15
  77. package/dist/core/daemon-lifecycle.js +478 -75
  78. package/dist/core/handoff/dispatcher.js +9 -3
  79. package/dist/core/handoff/runtime.js +130 -42
  80. package/dist/core/handoff/store.js +190 -2
  81. package/dist/core/handoff/types.js +5 -0
  82. package/dist/core/initialization/service.js +4 -4
  83. package/dist/core/invoke/executors/index.js +13 -0
  84. package/dist/core/invoke/executors/media.js +283 -0
  85. package/dist/core/invoke/executors/text.js +198 -0
  86. package/dist/core/invoke/invoke-service.js +157 -0
  87. package/dist/core/invoke/style-router.js +48 -0
  88. package/dist/core/invoke/types.js +19 -0
  89. package/dist/core/ipc-registration.js +51 -11
  90. package/dist/core/lifecycle-notice.js +10 -4
  91. package/dist/core/memory/consolidation.js +7 -5
  92. package/dist/core/message/aun-ipc-sender.js +149 -19
  93. package/dist/core/message/im-renderer.js +28 -84
  94. package/dist/core/message/message-bridge.js +57 -4
  95. package/dist/core/message/message-queue.js +46 -4
  96. package/dist/core/message/message-utils.js +10 -2
  97. package/dist/core/message/peer-mode.js +7 -34
  98. package/dist/core/message/pending-hints.js +4 -10
  99. package/dist/core/message/response-engine.js +163 -52
  100. package/dist/core/message/send-options.js +7 -4
  101. package/dist/core/message/send-routing.js +55 -7
  102. package/dist/core/ownership/owner-resolver.js +8 -0
  103. package/dist/core/permission/ec-command-parser.js +14 -3
  104. package/dist/core/permission/protected-paths.js +12 -2
  105. package/dist/core/permission/shell-environment.js +9 -0
  106. package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
  107. package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
  108. package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
  109. package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
  110. package/dist/core/session/session-file-health.js +243 -0
  111. package/dist/core/session/session-fs-store.js +163 -3
  112. package/dist/core/session/session-idle-monitor.js +9 -1
  113. package/dist/core/session/session-manager.js +36 -2
  114. package/dist/core/task/task-recovery-service.js +13 -2
  115. package/dist/core/thread/command-parser.js +9 -2
  116. package/dist/core/thread/thread-operation.js +21 -2
  117. package/dist/core/thread/thread-route.js +13 -2
  118. package/dist/directory/owner-directory-admission.js +42 -30
  119. package/dist/directory/owner-directory-cache.js +143 -126
  120. package/dist/directory/owner-directory-query-operation.js +9 -8
  121. package/dist/eck/kit-renderer.js +7 -5
  122. package/dist/ecweb/basic-settings-service.js +1 -1
  123. package/dist/ecweb/message-context-service.js +0 -4
  124. package/dist/ecweb/runtime/lifecycle.js +14 -8
  125. package/dist/ecweb/runtime/supervisor.js +62 -30
  126. package/dist/event-center/admission-materializer.js +114 -0
  127. package/dist/event-center/bus-gate.js +136 -0
  128. package/dist/event-center/bus-host.js +290 -0
  129. package/dist/event-center/bus-resolver.js +120 -0
  130. package/dist/event-center/center-config.js +100 -0
  131. package/dist/event-center/client-factory.js +50 -0
  132. package/dist/event-center/daemon.js +45 -0
  133. package/dist/event-center/directory-source.js +53 -0
  134. package/dist/event-center/dispatcher.js +157 -0
  135. package/dist/event-center/event-log.js +110 -0
  136. package/dist/event-center/index-generator.js +63 -0
  137. package/dist/event-center/ipc-operation.js +308 -0
  138. package/dist/event-center/ledger.js +52 -0
  139. package/dist/event-center/pack-loader.js +202 -0
  140. package/dist/event-center/pack-manager.js +85 -0
  141. package/dist/event-center/registry.js +238 -0
  142. package/dist/event-center/runtime.js +641 -0
  143. package/dist/event-center/script-runner.js +356 -0
  144. package/dist/event-center/types.js +35 -0
  145. package/dist/event-center/validation.js +413 -0
  146. package/dist/index.js +751 -268
  147. package/dist/ipc.js +66 -12
  148. package/dist/paths.js +20 -0
  149. package/dist/product.js +14 -0
  150. package/dist/proxy/manager.js +43 -18
  151. package/dist/proxy/service-supervisor.js +78 -35
  152. package/dist/response-system/engines/v1/index.js +0 -1
  153. package/dist/response-system/modes/single-session/index.js +1 -1
  154. package/dist/services/dispatcher.js +100 -0
  155. package/dist/services/idempotency.js +90 -0
  156. package/dist/services/identity.js +52 -0
  157. package/dist/services/index-generator.js +70 -0
  158. package/dist/services/index.js +449 -0
  159. package/dist/services/ipc-operation.js +458 -0
  160. package/dist/services/ledger.js +52 -0
  161. package/dist/services/message-log.js +112 -0
  162. package/dist/services/pack-manager.js +204 -0
  163. package/dist/services/reply.js +55 -0
  164. package/dist/services/router.js +95 -0
  165. package/dist/services/script-runner.js +422 -0
  166. package/dist/services/service-payload.js +70 -0
  167. package/dist/services/types.js +18 -0
  168. package/dist/services/validation.js +297 -0
  169. package/dist/trigger/application-service.js +21 -1
  170. package/dist/trigger/audit.js +19 -4
  171. package/dist/trigger/authorization.js +14 -5
  172. package/dist/trigger/event-source.js +1 -1
  173. package/dist/trigger/history.js +176 -7
  174. package/dist/trigger/ipc-service.js +3 -1
  175. package/dist/trigger/manager.js +1 -3
  176. package/dist/trigger/scheduler.js +78 -5
  177. package/dist/trigger/script-sandbox.js +118 -22
  178. package/dist/utils/cross-platform.js +175 -13
  179. package/dist/utils/evolcore-version.js +69 -27
  180. package/dist/utils/host-info.js +11 -8
  181. package/dist/utils/instance-registry.js +19 -13
  182. package/dist/utils/npm-ops.js +48 -0
  183. package/dist/utils/process-introspect.js +109 -10
  184. package/dist/utils/startup-trace.js +222 -44
  185. package/dist/utils/windows-shell-trust.js +80 -6
  186. package/kits/docs/INDEX.md +2 -2
  187. package/kits/docs/aun/ABILITY_CALLING.md +10 -17
  188. package/kits/docs/context-assembly.md +1 -1
  189. package/kits/docs/evolcore/INDEX.md +5 -2
  190. package/kits/docs/evolcore/ability.md +4 -0
  191. package/kits/docs/evolcore/aid.md +1 -1
  192. package/kits/docs/evolcore/ctl.md +2 -1
  193. package/kits/docs/evolcore/event-center.md +207 -0
  194. package/kits/docs/evolcore/file-navigation.md +10 -264
  195. package/kits/docs/evolcore/fs.md +3 -2
  196. package/kits/docs/evolcore/group.md +2 -2
  197. package/kits/docs/evolcore/memory-architecture.md +2 -0
  198. package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
  199. package/kits/docs/evolcore/menu-protocol.md +21 -0
  200. package/kits/docs/evolcore/msg.md +27 -8
  201. package/kits/docs/evolcore/provider.md +23 -3
  202. package/kits/docs/evolcore/response.md +5 -5
  203. package/kits/docs/evolcore/services.md +277 -0
  204. package/kits/docs/evolcore/task.md +2 -0
  205. package/kits/docs/evolcore/team-workspace.md +41 -0
  206. package/kits/eck_manifest.json +45 -7
  207. package/kits/eck_message_manifest.json +3 -3
  208. package/kits/rules/02-navigation.md +10 -1
  209. package/kits/rules/06-channel.md +5 -6
  210. package/kits/schemas/_meta.json +17 -6
  211. package/kits/schemas/agent-config.schema.19.json +5 -7
  212. package/kits/schemas/agent-config.schema.20.json +936 -0
  213. package/kits/schemas/daemon.schema.1.json +5 -0
  214. package/kits/schemas/daemon.schema.2.json +5 -0
  215. package/kits/schemas/daemon.schema.3.json +2 -1
  216. package/kits/schemas/daemon.schema.4.json +2 -1
  217. package/kits/schemas/daemon.schema.5.json +2 -1
  218. package/kits/schemas/daemon.schema.6.json +1 -1
  219. package/kits/schemas/daemon.schema.7.json +1 -1
  220. package/kits/schemas/daemon.schema.8.json +2 -1
  221. package/kits/schemas/daemon.schema.9.json +2 -1
  222. package/kits/schemas/relation-config.schema.12.json +2 -3
  223. package/kits/schemas/role-config.schema.2.json +4 -4
  224. package/kits/schemas/role-registry.schema.1.json +2 -2
  225. package/kits/schemas/single-session.schema.1.json +1 -1
  226. package/kits/schemas/single-session.schema.2.json +1 -1
  227. package/kits/schemas/single-session.schema.3.json +1 -1
  228. package/kits/skills/.switches.json +1 -5
  229. package/kits/skills/ability/SKILL.md +56 -0
  230. package/kits/skills/ability/references/calling.md +56 -0
  231. package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
  232. package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
  233. package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
  234. package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
  235. package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
  236. package/kits/skills/ec-agent-create/SKILL.md +0 -1
  237. package/kits/skills/ec-group/SKILL.md +8 -5
  238. package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
  239. package/kits/skills/ec-service-proxy/SKILL.md +34 -5
  240. package/kits/skills/ec-trigger/SKILL.md +4 -4
  241. package/kits/skills/personal-assistant/SKILL.md +6 -6
  242. package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
  243. package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
  244. package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
  245. package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
  246. package/kits/skills/thread-ops/SKILL.md +10 -10
  247. package/kits/templates/system-fragments/channel.md +3 -3
  248. package/kits/templates/system-fragments/commands.md +9 -7
  249. package/kits/templates/system-fragments/reply.md +2 -6
  250. package/kits/templates/system-fragments/session.md +1 -1
  251. package/kits/templates/system-fragments/thread.md +11 -9
  252. package/package.json +5 -6
  253. package/dist/cli/pa-workspace-command.js +0 -225
  254. package/dist/core/command/pa-workspace-store.js +0 -468
  255. package/dist/core/relation/pa-team.js +0 -132
  256. package/kits/docs/evolcore/pa-workspace.md +0 -51
  257. package/kits/skills/aid-ability/SKILL.md +0 -244
  258. package/kits/skills/ec-ability/SKILL.md +0 -67
  259. package/kits/skills/ec-ability/references/workflows.md +0 -15
@@ -9,17 +9,17 @@ 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/index.js';
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
14
  import { CHANNEL_LOGS_ENV, MAIN_PACKAGE_NAME, RESTART_REQUEST_ID_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-commands.js';
20
- import { getProcessStartTime, invalidateProcessSnapshot, startTimeMatches } from '../utils/process-introspect.js';
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';
22
+ import { StartupTracer, STARTUP_TRACE_ID_ENV } from '../utils/startup-trace.js';
23
23
  const execFileAsync = promisify(execFile);
24
24
  /** Read-only check performed before stopping the current daemon. */
25
25
  function preflightDataMigration(root, log) {
@@ -100,10 +100,10 @@ function cleanEnv() {
100
100
  delete process.env[key];
101
101
  }
102
102
  }
103
- function isPidReused(pid, expectedStartedAt) {
103
+ async function isPidReused(pid, expectedStartedAt) {
104
104
  if (expectedStartedAt === undefined)
105
105
  return false;
106
- const actualStartedAt = getProcessStartTime(pid);
106
+ const actualStartedAt = await getProcessStartTimeAsync(pid);
107
107
  return actualStartedAt !== null && !startTimeMatches(expectedStartedAt, actualStartedAt);
108
108
  }
109
109
  function reportPidReused(pid, log) {
@@ -158,7 +158,7 @@ export async function cmdRestartMonitor() {
158
158
  }
159
159
  // 单实例保护:pre-check + post-write 自检(同 main 进程)
160
160
  {
161
- const pre = scanInstances();
161
+ const pre = scanInstances({ kind: 'restart-monitor', includeAidActivity: false });
162
162
  const aliveOthers = pre.restartMonitors.filter(m => m.alive && m.record.pid !== process.pid);
163
163
  if (aliveOthers.length > 0) {
164
164
  log(`Another restart-monitor already running (PID: ${aliveOthers.map(m => m.record.pid).join(', ')}), exiting`);
@@ -201,7 +201,7 @@ export async function cmdRestartMonitor() {
201
201
  const isServiceAlive = async () => {
202
202
  if (!fs.existsSync(p.readySignal))
203
203
  return false;
204
- const s = scanInstances();
204
+ const s = scanInstances({ kind: 'main', includeAidActivity: false });
205
205
  if (!s.mains.some(m => m.alive))
206
206
  return false;
207
207
  return true;
@@ -210,7 +210,7 @@ export async function cmdRestartMonitor() {
210
210
  if (!hasCorrelatedRequest)
211
211
  return;
212
212
  const requesterPid = readRestartRequest(pendingFile, requestId)?.requesterPid;
213
- 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;
214
214
  if (daemonPid && updateRestartRequest(pendingFile, requestId, { status: 'ready', daemonPid })) {
215
215
  if (upgradeJob && !readUpgradeJob(upgradeJob.jobId)?.lifecycle)
216
216
  updateUpgradeJob(upgradeJob.jobId, { lifecycle: { status: 'ready', at: new Date().toISOString() } });
@@ -222,6 +222,15 @@ export async function cmdRestartMonitor() {
222
222
  };
223
223
  // Keep this path available for a failed read-only preflight so a stale
224
224
  // restart request cannot be replayed by a later daemon startup.
225
+ const trace = new StartupTracer('restart-monitor', {
226
+ traceId: process.env[STARTUP_TRACE_ID_ENV] || undefined,
227
+ firstPhase: 'monitor.bootstrap',
228
+ initialPhase: 'running',
229
+ });
230
+ delete process.env[STARTUP_TRACE_ID_ENV];
231
+ trace.setMeta('operation', 'restart');
232
+ process.once('exit', () => trace.finish(false));
233
+ trace.mark('monitor.preflight');
225
234
  log(`Restart monitor started (requestId=${requestId})`);
226
235
  // 升级成功时记下版本变化,回执里要告诉 agent 实际跑的是哪个版本。
227
236
  let upgradeVersions;
@@ -268,22 +277,25 @@ export async function cmdRestartMonitor() {
268
277
  }
269
278
  }
270
279
  updateRestartMonitorPhase(process.pid, 'accepted');
280
+ trace.mark('monitor.stopDaemon', undefined, { initialPhase: 'running' });
271
281
  log('Restart monitor accepted after migration preflight and monitor election');
272
282
  if (upgradeJob) {
273
283
  updateUpgradeJob(upgradeJob.jobId, { status: 'restart-started', success: true, phase: 'restart' }, '预检通过,已进入重启执行;不代表新进程已就绪');
274
- await acknowledgeUpgradeRestart(upgradeJob.jobId);
284
+ await trace.waitForDependency(acknowledgeUpgradeRestart(upgradeJob.jobId), 'upgrade restart acknowledgement');
275
285
  }
276
286
  // Test daemons live in one temporary HOME per test, so the current HOME's
277
287
  // instance registry cannot see them. Their strict environment markers make
278
288
  // them safe to reap globally on every real restart. Keep one process-table
279
289
  // snapshot for both orphan categories; each Windows CIM scan is expensive.
280
- const orphanSnapshot = findOrphanProcesses();
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);
281
293
  {
282
294
  const leakedTestDaemons = orphanSnapshot.filter(o => o.confirmedTestDaemon);
283
295
  if (leakedTestDaemons.length > 0) {
284
296
  const killed = killOrphans(leakedTestDaemons);
285
297
  log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
286
- await sleep(500);
298
+ await trace.waitForDependency(sleep(500), 'test daemon exit');
287
299
  }
288
300
  }
289
301
  // A stale instance record can disappear while the real Windows process is
@@ -302,17 +314,17 @@ export async function cmdRestartMonitor() {
302
314
  const pids = runtimeOrphans.map(o => o.pid).join(', ');
303
315
  log(`Stopping unregistered EvolCore process(es): ${pids}`);
304
316
  const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
305
- 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');
306
318
  for (const orphan of runtimeOrphans) {
307
319
  if (orphan.pid !== ping)
308
320
  platform.killProcess(orphan.pid, false);
309
321
  }
310
- const exited = await Promise.all(runtimeOrphans.map(async (orphan) => {
322
+ const exited = await trace.waitForDependency(Promise.all(runtimeOrphans.map(async (orphan) => {
311
323
  if (await platform.waitForProcessExit(orphan.pid, orphan.pid === ping ? 30_000 : 10_000))
312
324
  return true;
313
325
  platform.killProcess(orphan.pid, true);
314
326
  return platform.waitForProcessExit(orphan.pid, 5_000);
315
- }));
327
+ })), 'unregistered daemon exit');
316
328
  if (exited.some(result => !result)) {
317
329
  const message = `未登记的 EvolCore 进程仍未退出(PID: ${pids}),已停止重启以避免重复连接 AUN。`;
318
330
  log(message);
@@ -320,15 +332,18 @@ export async function cmdRestartMonitor() {
320
332
  process.exit(1);
321
333
  }
322
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 });
323
339
  }
324
340
  // 等待所有活 main 进程退出(可能不止一个)
325
- const oldStatus = scanInstances();
326
341
  const aliveMains = oldStatus.mains.filter(m => m.alive);
327
342
  if (aliveMains.length > 0) {
328
343
  const oldPids = aliveMains.map(m => m.record.pid);
329
344
  const expectedStarts = new Map(aliveMains.map(m => [m.record.pid, m.record.startedAt]));
330
345
  log(`Monitoring ${oldPids.length} main process(es): ${oldPids.join(', ')}`);
331
- 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');
332
347
  log(`Graceful shutdown request ${gracefulPid === null ? 'was not accepted' : `accepted by PID ${gracefulPid}`}`);
333
348
  // 没有收到 IPC shutdown 确认的进程才走信号兜底
334
349
  for (const pid of oldPids) {
@@ -342,27 +357,16 @@ export async function cmdRestartMonitor() {
342
357
  }
343
358
  }
344
359
  }
345
- const exited = await Promise.all(oldPids.map(async (oldPid) => {
360
+ const exited = await trace.waitForDependency(Promise.all(oldPids.map(async (oldPid) => {
346
361
  const expectedStartedAt = expectedStarts.get(oldPid);
347
- if (isPidReused(oldPid, expectedStartedAt)) {
348
- reportPidReused(oldPid, log);
349
- return true;
350
- }
362
+ // The phase snapshot verified the registered identity before requesting shutdown.
351
363
  if (await platform.waitForProcessExit(oldPid, 30_000)) {
352
- if (isPidReused(oldPid, expectedStartedAt)) {
353
- reportPidReused(oldPid, log);
354
- return true;
355
- }
356
364
  log(`Process ${oldPid} has exited`);
357
365
  return true;
358
366
  }
359
- if (isPidReused(oldPid, expectedStartedAt)) {
360
- reportPidReused(oldPid, log);
361
- return true;
362
- }
363
367
  const state = platform.getProcessState(oldPid);
364
368
  log(`ERROR: Process ${oldPid} still running after 30s${state ? ` (state=${state})` : ''}, force killing`);
365
- if (isPidReused(oldPid, expectedStartedAt)) {
369
+ if (await isPidReused(oldPid, expectedStartedAt)) {
366
370
  reportPidReused(oldPid, log);
367
371
  return true;
368
372
  }
@@ -370,7 +374,7 @@ export async function cmdRestartMonitor() {
370
374
  log(`Forced termination for PID ${oldPid}: ${forcedKill ? 'accepted' : 'failed'}`);
371
375
  const forced = await platform.waitForProcessExit(oldPid, 5_000);
372
376
  log(`Forced termination wait for PID ${oldPid}: ${forced ? 'exited' : 'still running'}`);
373
- if (isPidReused(oldPid, expectedStartedAt)) {
377
+ if (!forced && await isPidReused(oldPid, expectedStartedAt)) {
374
378
  reportPidReused(oldPid, log);
375
379
  return true;
376
380
  }
@@ -379,7 +383,7 @@ export async function cmdRestartMonitor() {
379
383
  log(`ERROR: Process ${oldPid} survived forced termination${finalState ? ` (state=${finalState})` : ''}`);
380
384
  }
381
385
  return forced;
382
- }));
386
+ })), 'old daemon exit');
383
387
  if (exited.some(result => !result)) {
384
388
  log('❌ Existing daemon process could not be stopped; refusing to spawn a replacement');
385
389
  await notifyDaemonOwners(p, '❌ 旧 EvolCore 进程未能退出,已停止重启,避免重复连接 AUN。', log);
@@ -397,8 +401,10 @@ export async function cmdRestartMonitor() {
397
401
  // Shutdown changed the process table. A cached pre-shutdown snapshot can
398
402
  // otherwise classify the exited daemon as an unregistered runtime process.
399
403
  invalidateProcessSnapshot();
400
- const remaining = findOrphanProcesses();
401
- const remainingMains = scanInstances().mains.filter(item => item.alive);
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);
402
408
  const remainingRuntime = remaining.filter(belongsToRuntime);
403
409
  if (remainingMains.length || remainingRuntime.length) {
404
410
  const pids = [...new Set([
@@ -427,7 +433,7 @@ export async function cmdRestartMonitor() {
427
433
  try {
428
434
  const service = ecwebService(loadDaemonConfig().services);
429
435
  if (service?.enabled && serviceRuntimeMode(service) === 'managed') {
430
- await stopEcwebForRestart(p, service.port ?? DEFAULT_ECWEB_PORT, log);
436
+ await trace.waitForDependency(stopEcwebForRestart(p, service.port ?? DEFAULT_ECWEB_PORT, log), 'ECWeb shutdown confirmation');
431
437
  }
432
438
  }
433
439
  catch (error) {
@@ -441,6 +447,7 @@ export async function cmdRestartMonitor() {
441
447
  cleanupPendingFile(pendingFile, log, hasCorrelatedRequest ? requestId : undefined);
442
448
  process.exit(1);
443
449
  }
450
+ trace.mark('monitor.packageUpgrade');
444
451
  let upgradeBackup = null;
445
452
  let upgrade;
446
453
  if (applyPackageUpgrades) {
@@ -503,6 +510,7 @@ export async function cmdRestartMonitor() {
503
510
  }
504
511
  // 编译在 daemon 停止之后、拉起之前:此时没有活进程占着 dist/,
505
512
  // 失败还能回滚到上一份可用产物,因此这一步整体是可撤销的。
513
+ trace.mark('monitor.sourceBuild');
506
514
  const buildOutcome = await buildSourcesTransactionally(log);
507
515
  if (buildOutcome.status === 'failed') {
508
516
  const message = `服务未重启:${buildOutcome.reason ?? '构建失败'}`;
@@ -516,6 +524,7 @@ export async function cmdRestartMonitor() {
516
524
  log(`↩ ${buildOutcome.reason ?? '已回滚'};继续以上一版本启动`);
517
525
  await notifyDaemonOwners(p, `⚠️ ${buildOutcome.reason ?? '已回滚'},正在以上一版本启动服务`, log);
518
526
  }
527
+ trace.mark('monitor.dataMigration');
519
528
  const migration = applyPendingDataMigration(p.root, log);
520
529
  if (!migration.ok) {
521
530
  const message = `服务未重启:用户数据迁移失败(${migration.reason ?? 'unknown error'})`;
@@ -527,7 +536,7 @@ export async function cmdRestartMonitor() {
527
536
  // daemon's own launcher and ECWeb's stale-instance cleanup, which could
528
537
  // leave ServiceProxy pointed at a dead PID.
529
538
  // 启动并检测 ready signal
530
- let started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
539
+ let started = await spawnAndWaitReady(p, log, READY_TIMEOUT, trace);
531
540
  if (started) {
532
541
  if (upgrade.status === 'upgraded' || upgrade.status === 'failed') {
533
542
  await recordPackageUpgrade(MAIN_PACKAGE_NAME, {
@@ -565,7 +574,7 @@ export async function cmdRestartMonitor() {
565
574
  }, log);
566
575
  if (await restoreDistBackup(upgradeBackup, log)) {
567
576
  await notifyDaemonOwners(p, `⚠️ 升级到 ${upgradeVersions.to} 后启动失败,正在回滚到 ${upgradeVersions.from} 重试...`, log);
568
- started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
577
+ started = await spawnAndWaitReady(p, log, READY_TIMEOUT, trace);
569
578
  if (started) {
570
579
  const reason = `升级到 ${upgradeVersions.to} 后启动失败,已回滚到 ${upgradeVersions.from}`;
571
580
  await recordPackageUpgrade(MAIN_PACKAGE_NAME, {
@@ -586,7 +595,7 @@ export async function cmdRestartMonitor() {
586
595
  const reverted = await revertToPreviousBuild(log);
587
596
  if (reverted) {
588
597
  await notifyDaemonOwners(p, '⚠️ 新编译产物启动失败,正在回滚到上一版本重试...', log);
589
- started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
598
+ started = await spawnAndWaitReady(p, log, READY_TIMEOUT, trace);
590
599
  if (started) {
591
600
  const reason = '新编译产物启动失败,已回滚到上一个可用版本';
592
601
  log(`✓ ${reason}`);
@@ -664,7 +673,7 @@ export async function cmdRestartMonitor() {
664
673
  continue;
665
674
  }
666
675
  // claude 正常完成但服务没自动启动,尝试 spawn
667
- started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
676
+ started = await spawnAndWaitReady(p, log, READY_TIMEOUT, trace);
668
677
  if (started) {
669
678
  log(`✓ Self-heal succeeded on attempt ${attempt}`);
670
679
  markRequestReady();
@@ -1096,7 +1105,8 @@ function cleanupPendingFile(filePath, log, requestId) {
1096
1105
  /**
1097
1106
  * 启动新进程并等待 ready.signal
1098
1107
  */
1099
- async function spawnAndWaitReady(p, log, timeout) {
1108
+ async function spawnAndWaitReady(p, log, timeout, trace) {
1109
+ trace.mark('monitor.spawnDaemon');
1100
1110
  const ecweb = ecwebService(loadDaemonConfig().services);
1101
1111
  const requireEcweb = ecweb?.enabled === true && serviceRuntimeMode(ecweb) === 'managed';
1102
1112
  const ecwebPort = ecweb?.port ?? DEFAULT_ECWEB_PORT;
@@ -1128,6 +1138,7 @@ async function spawnAndWaitReady(p, log, timeout) {
1128
1138
  ...process.env,
1129
1139
  EVOLCORE_HOME: p.root,
1130
1140
  EVOLCORE_LAUNCHED_BY: 'restart-monitor',
1141
+ [STARTUP_TRACE_ID_ENV]: trace.id,
1131
1142
  [RESTART_REQUEST_ID_ENV]: '',
1132
1143
  LOG_LEVEL: process.env.LOG_LEVEL || 'INFO',
1133
1144
  MESSAGE_LOG: process.env.MESSAGE_LOG || 'true',
@@ -1136,6 +1147,8 @@ async function spawnAndWaitReady(p, log, timeout) {
1136
1147
  }
1137
1148
  });
1138
1149
  const childPid = child.pid;
1150
+ trace.setMeta('daemonPid', String(childPid));
1151
+ trace.mark('monitor.waitReady', undefined, { initialPhase: 'running' });
1139
1152
  if (foreground) {
1140
1153
  foregroundDaemonExit = new Promise(resolve => {
1141
1154
  child.once('error', () => resolve(1));
@@ -1147,42 +1160,45 @@ async function spawnAndWaitReady(p, log, timeout) {
1147
1160
  fs.closeSync(out);
1148
1161
  fs.closeSync(err);
1149
1162
  log(`Spawned new process PID: ${childPid}, waiting for ready signal...`);
1163
+ const isChildRunning = () => trace.waitForDependency(platform.isProcessRunningAsync(childPid), 'daemon process liveness');
1150
1164
  // 轮询等待 ready.signal 出现
1151
1165
  const start = Date.now();
1152
1166
  while (Date.now() - start < timeout) {
1153
- await sleep(500);
1167
+ await trace.waitForDependency(sleep(500), 'daemon ready.signal');
1154
1168
  // 进程已退出则提前失败
1155
- if (!platform.isProcessRunning(childPid)) {
1169
+ if (!await isChildRunning()) {
1156
1170
  log('Process exited before ready signal');
1157
1171
  if (requireEcweb)
1158
- await stopEcwebForRestart(p, ecwebPort, log);
1172
+ await trace.waitForDependency(stopEcwebForRestart(p, ecwebPort, log), 'ECWeb shutdown confirmation');
1159
1173
  return false;
1160
1174
  }
1161
1175
  if (fs.existsSync(p.readySignal)) {
1162
1176
  log('Daemon ready; managed services are supervised independently');
1177
+ trace.finish(true);
1163
1178
  return true;
1164
1179
  }
1165
1180
  }
1166
- const ping = await ipcQuery(p.socket, { type: 'ping' }, platform.isWindows ? 5_000 : 1_000);
1167
- if (ping?.pong === true && ping.pid === childPid && platform.isProcessRunning(childPid)) {
1181
+ const ping = await trace.waitForDependency(ipcQuery(p.socket, { type: 'ping' }, platform.isWindows ? 5_000 : 1_000), 'daemon IPC ping response');
1182
+ if (ping?.pong === true && ping.pid === childPid && await isChildRunning()) {
1168
1183
  log(`Daemon IPC is ready (PID: ${childPid}); startup finalization and managed services continue in background`);
1184
+ trace.finish(true);
1169
1185
  return true;
1170
1186
  }
1171
1187
  log(`Daemon ready signal not received within ${timeout / 1000}s and identified IPC is unavailable`);
1172
1188
  // A timeout is still a live-process race: do not let self-heal spawn a
1173
1189
  // replacement while the timed-out daemon owns the IPC endpoint or a port.
1174
- if (platform.isProcessRunning(childPid)) {
1190
+ if (await isChildRunning()) {
1175
1191
  platform.killProcessOnly(childPid, false);
1176
- if (!await platform.waitForProcessExit(childPid, 5_000)) {
1192
+ if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'timed out daemon exit')) {
1177
1193
  log(`Process ${childPid} survived graceful termination, forcing kill`);
1178
1194
  platform.killProcessOnly(childPid, true);
1179
- if (!await platform.waitForProcessExit(childPid, 5_000)) {
1195
+ if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'forced daemon exit')) {
1180
1196
  throw new Error(`Process ${childPid} survived forced termination; refusing rollback or duplicate startup`);
1181
1197
  }
1182
1198
  }
1183
1199
  }
1184
1200
  if (requireEcweb)
1185
- await stopEcwebForRestart(p, ecwebPort, log);
1201
+ await trace.waitForDependency(stopEcwebForRestart(p, ecwebPort, log), 'ECWeb shutdown confirmation');
1186
1202
  cleanupInstances();
1187
1203
  return false;
1188
1204
  }
@@ -1306,6 +1322,7 @@ async function notifyDaemonOwners(p, message, log) {
1306
1322
  });
1307
1323
  if (validOwners.length === 0)
1308
1324
  return;
1325
+ const { msgSend } = await import('../aun/msg/index.js');
1309
1326
  const text = formatDaemonOwnerNotice(p, message);
1310
1327
  for (const owner of validOwners) {
1311
1328
  try {
@@ -0,0 +1,111 @@
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 { ipcQuery } from '../ipc.js';
9
+ import { resolvePaths } from '../paths.js';
10
+ const HELP = `ec services — 服务路由运维
11
+
12
+ 本机:
13
+ ec services status [<包名>] [--aid <aid>] [--format json] 每包状态
14
+ ec services types [--aid <aid>] 本 AID 可接的全部 services.* type
15
+ ec services ledger <包名> [--tail N] [--aid <aid>] 台账
16
+ ec services tail <包名> [--tail N] [--aid <aid>] 服务消息日志
17
+ ec services doctor [<包名>] [--aid <aid>] 诊断
18
+ ec services reload [<包名>] [--aid <aid>] 重载
19
+ ec services enable / disable [--aid <aid>] 总闸
20
+
21
+ 对端:
22
+ ec services describe <aid> [--service <type>] 查对端可用服务
23
+ ec services schema <aid> <type> 查某个服务的请求 schema
24
+ ec services call <aid> <type> --data '<json>' [--timeout 30] [--encrypted] [--no-wait]
25
+ ec services call --request-id <id> --wait 查已发出的调用(--aid 指定本端)
26
+
27
+ 服务调用是点对点、要结果、不丢的消息:结果由 daemon 落盘,CLI 被杀也不丢。`;
28
+ /** 这三个子命令的回包是「对端应答」,CLI 只打印正文。 */
29
+ const RELAY_COMMANDS = new Set(['call', 'describe', 'schema']);
30
+ function readControlToken() {
31
+ try {
32
+ return fs.readFileSync(resolvePaths().controlToken, 'utf8').trim() || undefined;
33
+ }
34
+ catch {
35
+ return undefined;
36
+ }
37
+ }
38
+ async function queryServices(argv, timeoutMs = 20_000) {
39
+ const controlToken = readControlToken();
40
+ try {
41
+ const response = await ipcQuery(resolvePaths().socket, { type: 'services.op', argv, controlToken }, timeoutMs, { throwOnError: false });
42
+ if (!response || typeof response !== 'object')
43
+ return { transportError: 'invalid daemon response' };
44
+ return { response };
45
+ }
46
+ catch (error) {
47
+ return { transportError: error instanceof Error ? error.message : String(error) };
48
+ }
49
+ }
50
+ function printResult(result, json) {
51
+ if (json || (result && typeof result === 'object')) {
52
+ console.log(JSON.stringify(result, null, 2));
53
+ return;
54
+ }
55
+ console.log(String(result));
56
+ }
57
+ export async function runServicesCommand(argv) {
58
+ const args = [...argv];
59
+ const json = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
60
+ if (args.length === 0 || args[0] === 'help' || args[0] === '--help') {
61
+ console.log(HELP);
62
+ return;
63
+ }
64
+ // `call` 要等结果:IPC 超时必须覆盖调用预算,否则 CLI 先断而 daemon 还在等。
65
+ const callTimeoutMs = args[0] === 'call' ? readCallBudget(args) : undefined;
66
+ const query = await queryServices(args, callTimeoutMs);
67
+ if ('transportError' in query) {
68
+ console.error(`daemon 不可达:${query.transportError}`);
69
+ process.exitCode = 1;
70
+ return;
71
+ }
72
+ const { response } = query;
73
+ if (!response.ok) {
74
+ const result = response.result && typeof response.result === 'object' ? response.result : undefined;
75
+ if (json)
76
+ console.log(JSON.stringify({ ok: false, code: response.code, error: response.error, ...(result ?? {}) }));
77
+ else
78
+ console.error(`${response.code ?? 'ERROR'}: ${response.error ?? 'unknown error'}`);
79
+ // 超时不重试:退出码 2 表示「可能已执行」。
80
+ process.exitCode = response.code === 'NO_RESULT' ? 2 : 1;
81
+ return;
82
+ }
83
+ // 对端调用的成功输出是应答正文;--no-wait 时没有 response,回落到 request_id。
84
+ const result = response.result;
85
+ if (RELAY_COMMANDS.has(args[0] ?? '') && result && 'response' in result) {
86
+ printResult(result.response, json);
87
+ return;
88
+ }
89
+ printResult(result, json);
90
+ }
91
+ /** `--timeout` 预算 + 5s 余量,作为 IPC 等待上限。 */
92
+ function readCallBudget(args) {
93
+ const index = args.indexOf('--timeout');
94
+ const raw = index >= 0 ? args[index + 1] : undefined;
95
+ const parsed = raw === undefined ? 30_000 : parseTimeoutMs(raw);
96
+ return (parsed ?? 30_000) + 5_000;
97
+ }
98
+ function parseTimeoutMs(value) {
99
+ const trimmed = value.trim().toLowerCase();
100
+ const plain = Number(trimmed);
101
+ if (Number.isFinite(plain) && plain > 0)
102
+ return Math.round(plain * 1000);
103
+ const match = /^(\d+(?:\.\d+)?)(ms|s|m)$/.exec(trimmed);
104
+ if (!match)
105
+ return undefined;
106
+ const amount = Number(match[1]);
107
+ if (!Number.isFinite(amount) || amount <= 0)
108
+ return undefined;
109
+ const unit = match[2];
110
+ return Math.round(unit === 'ms' ? amount : unit === 'm' ? amount * 60_000 : amount * 1000);
111
+ }
@@ -1,7 +1,7 @@
1
1
  import { normalizeCausation } from '../core/causation/context.js';
2
2
  import { RUNTIME_LOCK_DIR_ENV } from '../core/runtime-lock.js';
3
3
  import crypto from 'node:crypto';
4
- import { execFileSync } from 'node:child_process';
4
+ import { execFile, execFileSync } from 'node:child_process';
5
5
  import fs from 'node:fs';
6
6
  import os from 'node:os';
7
7
  import path from 'node:path';
@@ -14,6 +14,7 @@ export const DAEMON_RUNTIME_EPOCH_ENV = 'EVOLCORE_DAEMON_RUNTIME_EPOCH';
14
14
  export { RUNTIME_LOCK_DIR_ENV };
15
15
  const generatedProcessManagedTempDirs = new Set();
16
16
  const preparedWindowsSessionRuntimeDirs = new Set();
17
+ const pendingSessionRuntimeDirs = new Map();
17
18
  let processTempCleanupRegistered = false;
18
19
  function isPlainObject(value) {
19
20
  return !!value && typeof value === 'object' && !Array.isArray(value);
@@ -313,6 +314,42 @@ export function ensureSessionRuntimeDir(sessionId) {
313
314
  return undefined;
314
315
  }
315
316
  }
317
+ /** Await ACL preparation without blocking unrelated sessions or daemon I/O. */
318
+ export async function ensureSessionRuntimeDirAsync(sessionId) {
319
+ if (!sessionId)
320
+ return undefined;
321
+ const root = systemTempRoot();
322
+ const directory = path.join(root, sessionRuntimeName(sessionId));
323
+ const pending = pendingSessionRuntimeDirs.get(directory);
324
+ if (pending)
325
+ return pending;
326
+ const prepare = (async () => {
327
+ try {
328
+ await fs.promises.mkdir(root, { recursive: true, mode: 0o700 });
329
+ await fs.promises.mkdir(directory, { recursive: true, mode: 0o700 });
330
+ if (process.platform === 'win32' && !preparedWindowsSessionRuntimeDirs.has(directory)) {
331
+ const icacls = path.join(process.env.SystemRoot || process.env.WINDIR || 'C:\\Windows', 'System32', 'icacls.exe');
332
+ await new Promise((resolve, reject) => {
333
+ execFile(icacls, [directory, '/grant', '*S-1-5-32-545:(OI)(CI)M', '/Q'], { windowsHide: true, timeout: 10_000 }, error => error ? reject(error) : resolve());
334
+ });
335
+ preparedWindowsSessionRuntimeDirs.add(directory);
336
+ }
337
+ await fs.promises.mkdir(path.join(directory, 'locks'), { recursive: true, mode: 0o700 });
338
+ return isManagedSessionRuntimeDir(directory, root) ? directory : undefined;
339
+ }
340
+ catch {
341
+ return undefined;
342
+ }
343
+ })();
344
+ pendingSessionRuntimeDirs.set(directory, prepare);
345
+ try {
346
+ return await prepare;
347
+ }
348
+ finally {
349
+ if (pendingSessionRuntimeDirs.get(directory) === prepare)
350
+ pendingSessionRuntimeDirs.delete(directory);
351
+ }
352
+ }
316
353
  /** Return the lock namespace inside the session-owned runtime directory. */
317
354
  export function ensureRuntimeLockDir(sessionRuntimeDir) {
318
355
  if (!sessionRuntimeDir || !path.isAbsolute(sessionRuntimeDir))