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.
Files changed (228) hide show
  1. package/CHANGELOG.md +113 -0
  2. package/bin/ecmsg.js +33 -23
  3. package/dist/ability/application-service.js +1 -2
  4. package/dist/ability/package.js +28 -0
  5. package/dist/agent-template/jobs.js +158 -36
  6. package/dist/agent-template/runtime.js +401 -34
  7. package/dist/agent-template/service.js +764 -369
  8. package/dist/agent-template/tool-runner.js +35 -17
  9. package/dist/agent-template/types.js +7 -4
  10. package/dist/agents/baseagent.js +10 -9
  11. package/dist/agents/claude-runner.js +22 -6
  12. package/dist/agents/codex/app-server-client.js +34 -27
  13. package/dist/agents/codex/diagnostics.js +18 -1
  14. package/dist/agents/codex-runner.js +3 -1
  15. package/dist/agents/ecagent-runner.js +3 -1
  16. package/dist/agents/gemini-runner.js +2 -1
  17. package/dist/aun/group/fs-download.js +1 -1
  18. package/dist/aun/menu/client.js +142 -182
  19. package/dist/aun/rpc/client.js +33 -17
  20. package/dist/aun/service-proxy.js +6 -23
  21. package/dist/channels/aun.js +675 -120
  22. package/dist/channels/daemon.js +1 -1
  23. package/dist/cli/agent-create.js +37 -10
  24. package/dist/cli/agent-template.js +105 -84
  25. package/dist/cli/agent.js +31 -18
  26. package/dist/cli/daemon-commands.js +42 -56
  27. package/dist/cli/daemon-lifecycle-client.js +55 -19
  28. package/dist/cli/directory.js +12 -4
  29. package/dist/cli/ecmsg-gateway.js +5 -2
  30. package/dist/cli/events-command.js +2 -1
  31. package/dist/cli/init-channel.js +2 -2
  32. package/dist/cli/init.js +57 -21
  33. package/dist/cli/integrity-command.js +2 -0
  34. package/dist/cli/managed-command-guard.js +20 -1
  35. package/dist/cli/menu-client.js +7 -5
  36. package/dist/cli/restart-monitor.js +135 -46
  37. package/dist/cli/services-command.js +28 -5
  38. package/dist/cli/task-context.js +83 -15
  39. package/dist/cli/upgrade-command.js +4 -2
  40. package/dist/config/config-field-policy.js +24 -0
  41. package/dist/config/config-manager.js +49 -19
  42. package/dist/config/peer-book-store.js +167 -127
  43. package/dist/config/peer-role-resolver.js +24 -4
  44. package/dist/config/provider-identity-migration.js +158 -6
  45. package/dist/config/provider-identity.js +10 -4
  46. package/dist/config/provider-ipc-service.js +10 -2
  47. package/dist/config/provider-local-sync.js +2 -2
  48. package/dist/config/providers-config.js +95 -10
  49. package/dist/config/providers-import.js +4 -6
  50. package/dist/config/providers.js +14 -3
  51. package/dist/config/role-store.js +1 -1
  52. package/dist/config/schema-migration.js +123 -16
  53. package/dist/config/schema-registry.js +6 -2
  54. package/dist/config-store.js +9 -1
  55. package/dist/core/agent-application-service.js +56 -29
  56. package/dist/core/agent-create-status.js +3 -1
  57. package/dist/core/agent-creation-claim.js +1 -0
  58. package/dist/core/agent-ipc-registration.js +2 -2
  59. package/dist/core/agent-reload-coordinator.js +38 -1
  60. package/dist/core/agent-runtime.js +91 -43
  61. package/dist/core/auth/agent-delegation.js +13 -3
  62. package/dist/core/auth/delegation-diagnostics.js +56 -15
  63. package/dist/core/auth/operation-authorizer.js +2 -2
  64. package/dist/core/auth/operation-catalog.js +3 -3
  65. package/dist/core/bootstrap-service.js +3 -0
  66. package/dist/core/capability/capability-manager.js +3 -1
  67. package/dist/core/channel-loader.js +29 -3
  68. package/dist/core/channel-runtime.js +1 -1
  69. package/dist/core/command/agent-control.js +6 -5
  70. package/dist/core/command/agent-template-menu.js +32 -97
  71. package/dist/core/command/eventcenter-menu.js +61 -13
  72. package/dist/core/command/menu-catalog.js +11 -4
  73. package/dist/core/command/menu-handler.js +39 -12
  74. package/dist/core/command/menu-protocol.js +8 -16
  75. package/dist/core/command/skill-slash.js +6 -2
  76. package/dist/core/command/slash-handler.js +4 -6
  77. package/dist/core/command/team-workspace-bootstrap.js +1 -2
  78. package/dist/core/command/team-workspace-management-store.js +83 -0
  79. package/dist/core/command/team-workspace-management.js +1 -2
  80. package/dist/core/command/team-workspace-team.js +26 -3
  81. package/dist/core/daemon-bootstrap.js +11 -9
  82. package/dist/core/daemon-control.js +4 -7
  83. package/dist/core/daemon-lifecycle.js +189 -143
  84. package/dist/core/evolagent-registry.js +50 -2
  85. package/dist/core/evolagent.js +2 -1
  86. package/dist/core/file-integrity/read.js +9 -16
  87. package/dist/core/file-integrity/store.js +94 -34
  88. package/dist/core/handoff/dispatcher.js +33 -7
  89. package/dist/core/handoff/runtime.js +8 -0
  90. package/dist/core/host-snapshot.js +9 -4
  91. package/dist/core/inference/text-inference.js +12 -2
  92. package/dist/core/initialization/service.js +22 -4
  93. package/dist/core/invoke/invoke-service.js +24 -3
  94. package/dist/core/ipc-registration.js +7 -3
  95. package/dist/core/memory/consolidation.js +6 -6
  96. package/dist/core/message/aun-ipc-sender.js +109 -7
  97. package/dist/core/message/contact-admission.js +6 -2
  98. package/dist/core/message/message-bridge.js +13 -0
  99. package/dist/core/message/message-queue.js +131 -30
  100. package/dist/core/message/pending-hints.js +8 -0
  101. package/dist/core/message/response-engine.js +48 -2
  102. package/dist/core/message/send-routing.js +3 -12
  103. package/dist/core/model/catalog-service.js +13 -0
  104. package/dist/core/model/model-catalog.js +57 -18
  105. package/dist/core/ownership/owner-resolver.js +27 -10
  106. package/dist/core/pack-auth.js +163 -31
  107. package/dist/core/pack-install.js +42 -1
  108. package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
  109. package/dist/core/permission/ec-command-parser.js +3 -1
  110. package/dist/core/permission/shell-environment.js +23 -0
  111. package/dist/core/rate-window.js +6 -1
  112. package/dist/core/relation/peer-identity.js +5 -1
  113. package/dist/core/relation/same-owner-proof.js +2 -1
  114. package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
  115. package/dist/core/session/session-file-health.js +36 -7
  116. package/dist/core/session/session-idle-monitor.js +0 -1
  117. package/dist/core/session/session-manager.js +14 -0
  118. package/dist/core/session/session-title.js +26 -6
  119. package/dist/core/skill/index-generator.js +3 -4
  120. package/dist/core/task/task-image-resources.js +1 -1
  121. package/dist/core/thread/thread-service.js +0 -1
  122. package/dist/core/thread/topic-id.js +8 -0
  123. package/dist/directory/owner-directory-admission.js +17 -0
  124. package/dist/directory/owner-directory-cache.js +3 -1
  125. package/dist/directory/owner-directory-markdown.js +145 -23
  126. package/dist/directory/owner-directory-policy.js +23 -0
  127. package/dist/directory/owner-directory-query-operation.js +20 -6
  128. package/dist/directory/owner-directory-search.js +47 -0
  129. package/dist/eck/message-renderer.js +171 -32
  130. package/dist/ecweb/basic-settings-service.js +7 -3
  131. package/dist/ecweb/providers-service.js +17 -10
  132. package/dist/ecweb/runtime/lifecycle.js +65 -16
  133. package/dist/ecweb/runtime/supervisor.js +79 -50
  134. package/dist/event-center/admission-materializer.js +1 -1
  135. package/dist/event-center/bus-gate.js +48 -4
  136. package/dist/event-center/bus-host.js +3 -3
  137. package/dist/event-center/center-config.js +57 -28
  138. package/dist/event-center/dispatcher.js +8 -0
  139. package/dist/event-center/event-log.js +69 -27
  140. package/dist/event-center/index-generator.js +6 -1
  141. package/dist/event-center/ipc-operation.js +66 -25
  142. package/dist/event-center/pack-loader.js +12 -55
  143. package/dist/event-center/pack-manager.js +5 -3
  144. package/dist/event-center/registry.js +48 -52
  145. package/dist/event-center/runtime.js +219 -81
  146. package/dist/event-center/script-runner.js +18 -7
  147. package/dist/event-center/types.js +9 -1
  148. package/dist/event-center/validation.js +33 -4
  149. package/dist/index.js +132 -75
  150. package/dist/ipc.js +35 -8
  151. package/dist/product.js +1 -0
  152. package/dist/proxy/manager.js +52 -11
  153. package/dist/proxy/service-supervisor.js +265 -67
  154. package/dist/services/dispatcher.js +26 -3
  155. package/dist/services/idempotency.js +128 -0
  156. package/dist/services/identity.js +3 -27
  157. package/dist/services/index-generator.js +5 -1
  158. package/dist/services/index.js +244 -45
  159. package/dist/services/ipc-operation.js +164 -20
  160. package/dist/services/pack-manager.js +37 -9
  161. package/dist/services/router.js +100 -31
  162. package/dist/services/script-runner.js +15 -4
  163. package/dist/services/service-payload.js +50 -2
  164. package/dist/services/validation.js +107 -3
  165. package/dist/trigger/scheduler.js +18 -4
  166. package/dist/trigger/script-sandbox.js +39 -2
  167. package/dist/trigger/state.js +7 -0
  168. package/dist/utils/aid-bind.js +155 -18
  169. package/dist/utils/atomic-write.js +3 -3
  170. package/dist/utils/cross-platform.js +59 -16
  171. package/dist/utils/error-utils.js +26 -1
  172. package/dist/utils/instance-registry.js +94 -35
  173. package/dist/utils/process-introspect.js +187 -27
  174. package/dist/utils/project-path.js +47 -3
  175. package/dist/utils/upgrade-jobs.js +4 -4
  176. package/dist/utils/windows-shell-trust.js +174 -68
  177. package/kits/docs/context-assembly.md +3 -3
  178. package/kits/docs/evolcore/agent.md +28 -10
  179. package/kits/docs/evolcore/aid.md +3 -1
  180. package/kits/docs/evolcore/config.md +22 -0
  181. package/kits/docs/evolcore/directory.md +46 -12
  182. package/kits/docs/evolcore/event-center.md +6 -6
  183. package/kits/docs/evolcore/group-collaboration.md +1 -1
  184. package/kits/docs/evolcore/menu-client.md +7 -5
  185. package/kits/docs/evolcore/menu-protocol.md +5 -3
  186. package/kits/docs/evolcore/msg.md +10 -3
  187. package/kits/docs/evolcore/provider.md +17 -5
  188. package/kits/docs/evolcore/services.md +145 -12
  189. package/kits/docs/evolcore/thread-chain.md +17 -9
  190. package/kits/docs/prompt-loading-architecture.md +4 -4
  191. package/kits/eck_message_manifest.json +46 -3
  192. package/kits/rules/04-relation.md +10 -2
  193. package/kits/rules/06-channel.md +2 -1
  194. package/kits/schemas/providers.schema.2.json +1 -0
  195. package/kits/skills/ec-group/SKILL.md +4 -0
  196. package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
  197. package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
  198. package/kits/skills/thread-ops/SKILL.md +8 -5
  199. package/kits/templates/message-fragments/group-batch-item.md +3 -0
  200. package/kits/templates/message-fragments/group-batch.md +1 -0
  201. package/kits/templates/message-fragments/item-group.md +4 -0
  202. package/kits/templates/message-fragments/item-private.md +4 -0
  203. package/kits/templates/message-fragments/thread-context.md +1 -1
  204. package/kits/templates/system-fragments/commands.md +5 -5
  205. package/kits/templates/system-fragments/managed-runtime.md +1 -1
  206. package/kits/templates/system-fragments/relation.md +11 -7
  207. package/package.json +3 -2
  208. package/scripts/agent-template/index.mjs +9 -4
  209. package/scripts/agent-template/inspect.mjs +16 -9
  210. package/scripts/agent-template/shared/plan.mjs +3 -33
  211. package/scripts/agent-template/shared/template-contract.mjs +186 -3
  212. package/scripts/agent-template/shared/template-package.mjs +119 -10
  213. package/scripts/agent-template/shared/template-runtime.mjs +49 -6
  214. package/scripts/agent-template/shared/template.mjs +5 -5
  215. package/scripts/agent-template/team-pack.mjs +245 -0
  216. package/scripts/agent-template/team-preview.mjs +111 -0
  217. package/scripts/aid-batch/identity-batch.mjs +143 -0
  218. package/dist/ability/versions.js +0 -32
  219. package/dist/aun/model-headers.js +0 -17
  220. package/dist/channels/builtin-plugins.js +0 -19
  221. package/dist/core/command/team-workspace-initializer.js +0 -2
  222. package/dist/core/command/team-workspace-job-store.js +0 -88
  223. package/dist/core/command/team-workspace-management-service.js +0 -2
  224. package/dist/core/contact-bind-registry.js +0 -27
  225. package/dist/event-center/ledger.js +0 -52
  226. package/dist/services/reply.js +0 -55
  227. package/kits/templates/message-fragments/item.md +0 -3
  228. package/scripts/agent-template/pack.mjs +0 -169
@@ -1,7 +1,7 @@
1
1
  /**
2
- * services.* 命名空间的形状判定。
2
+ * services.* 命名空间的请求与应答格式。
3
3
  *
4
- * 这里只回答「这条 payload.type 是不是服务消息、是请求还是应答」,
4
+ * 这里只处理消息类型识别、监听匹配和应答构造,
5
5
  * 不涉及「本机有没有包能接」(那是 pack-manager 的事),也不涉及
6
6
  * 「这条消息来自谁」(那是准入的事)。三层判据互不推导。
7
7
  */
@@ -68,3 +68,51 @@ export function matchesListen(listenType, actualType) {
68
68
  export function resultTypeFor(requestType) {
69
69
  return requestType.endsWith('.result') ? requestType : `${requestType}.result`;
70
70
  }
71
+ /** 成功:{type, request_id, ok:true, data}。 */
72
+ export function buildSuccessReply(requestType, requestId, data) {
73
+ const type = resultTypeFor(requestType);
74
+ return {
75
+ type,
76
+ requestId,
77
+ shouldSend: true,
78
+ payload: {
79
+ type,
80
+ request_id: requestId,
81
+ ok: true,
82
+ ...(data !== undefined ? { data } : {}),
83
+ },
84
+ };
85
+ }
86
+ /** 失败:{type, request_id, ok:false, error:{code,message}}。 */
87
+ export function buildErrorReply(requestType, requestId, code, message, extra) {
88
+ const type = resultTypeFor(requestType);
89
+ return {
90
+ type,
91
+ requestId: requestId ?? '',
92
+ shouldSend: true,
93
+ payload: {
94
+ type,
95
+ request_id: requestId,
96
+ ok: false,
97
+ error: { code, message },
98
+ ...(extra ?? {}),
99
+ },
100
+ };
101
+ }
102
+ /** 静默:不回,调用方只能等到超时(blocked / unmatched=silent / 总闸关闭)。 */
103
+ export function buildSilentReply(requestType, requestId) {
104
+ return {
105
+ type: resultTypeFor(requestType),
106
+ requestId,
107
+ shouldSend: false,
108
+ payload: {},
109
+ };
110
+ }
111
+ /** 脚本执行结果 → 回复。noop 不回。 */
112
+ export function replyFromOutcome(requestType, requestId, outcome) {
113
+ if (outcome.outcome === 'noop')
114
+ return buildSilentReply(requestType, requestId);
115
+ if (outcome.outcome === 'success')
116
+ return buildSuccessReply(requestType, requestId, outcome.data);
117
+ return buildErrorReply(requestType, requestId, outcome.error?.code ?? 'HANDLER_FAILED', outcome.error?.message ?? 'service handler failed');
118
+ }
@@ -3,9 +3,28 @@
3
3
  * 约束 1:1 映射 docs/services/schema/{service,router}.schema.json;Schema 为权威,
4
4
  * 两者不一致改这里并同步 Schema。手写校验器(不引 ajv),失败逐条报错。
5
5
  */
6
- import { isListenableType } from './service-payload.js';
6
+ import { isListenableType, RESERVED_TYPES } from './service-payload.js';
7
7
  export const SCRIPT_EXTENSIONS = ['mjs', 'cjs', 'js', 'py', 'sh', 'ps1'];
8
8
  export const RUNTIME_WHITELIST = ['node', 'python', 'bash', 'powershell'];
9
+ /**
10
+ * 扩展名 → 运行时的本地映射(已知扩展名恒有值)。
11
+ *
12
+ * 不复用 `script-runner` 的 `inferRuntime`:`validation → script-runner →
13
+ * pack-manager → validation` 会成环,加载期 `RUNTIME_WHITELIST` 可能是 undefined。
14
+ * 两边本来就是同一张表,这里只保证校验期能判自洽。
15
+ */
16
+ function runtimeForExtension(script) {
17
+ const ext = script.split('.').pop()?.toLowerCase();
18
+ if (ext === 'mjs' || ext === 'cjs' || ext === 'js')
19
+ return 'node';
20
+ if (ext === 'py')
21
+ return 'python';
22
+ if (ext === 'sh')
23
+ return 'bash';
24
+ if (ext === 'ps1')
25
+ return 'powershell';
26
+ return undefined;
27
+ }
9
28
  const TIMEOUT_MIN = 1000;
10
29
  const TIMEOUT_MAX = 300_000;
11
30
  const TIMEOUT_DEFAULT = 30_000;
@@ -106,6 +125,15 @@ function validateHandler(raw, errors) {
106
125
  if (raw.runtime !== undefined && !RUNTIME_WHITELIST.includes(raw.runtime)) {
107
126
  errors.push(`listen[].handler.runtime must be one of ${RUNTIME_WHITELIST.join('/')}`);
108
127
  }
128
+ else if (script !== undefined && raw.runtime !== undefined) {
129
+ // runtime 与扩展名必须自洽:`runtime: "python"` 配 `.mjs` 能过枚举校验,却在
130
+ // 运行时才因解释器不认脚本而失败。schema 也这么写("推断不出判校验失败"),
131
+ // 这里提前到加载期。
132
+ const inferred = runtimeForExtension(script);
133
+ if (inferred !== undefined && inferred !== raw.runtime) {
134
+ errors.push(`listen[].handler.runtime "${String(raw.runtime)}" does not match the script extension (expected "${inferred}"): ${script}`);
135
+ }
136
+ }
109
137
  if (raw.args !== undefined && (!Array.isArray(raw.args) || raw.args.some(item => typeof item !== 'string'))) {
110
138
  errors.push('listen[].handler.args must be an array of strings');
111
139
  }
@@ -177,6 +205,11 @@ function validateReplyPolicy(raw, errors) {
177
205
  if (raw.payloadTypes !== undefined) {
178
206
  if (!Array.isArray(raw.payloadTypes))
179
207
  errors.push('reply.payloadTypes must be an array');
208
+ else if (raw.payloadTypes.length === 0) {
209
+ // 空数组在 schema 里也是合法的(items 约束对空数组无约束力),但它表达不了任何
210
+ // 回复形态——照原样放行会让 reply.allowed=true 却一个结果都不认。
211
+ errors.push('reply.payloadTypes must not be empty; omit it to accept "service-result"');
212
+ }
180
213
  else if (raw.payloadTypes.some(item => item !== 'service-result')) {
181
214
  errors.push('reply.payloadTypes only accepts "service-result"');
182
215
  }
@@ -256,14 +289,84 @@ function validateQuota(raw, field, fallback, errors) {
256
289
  errors.push(`${field} has unknown fields: ${extra.join(', ')}`);
257
290
  const perMinute = intInRange(raw.perMinute, `${field}.perMinute`, 1, Number.MAX_SAFE_INTEGER, errors);
258
291
  const perHour = intInRange(raw.perHour, `${field}.perHour`, 1, Number.MAX_SAFE_INTEGER, errors);
292
+ // 分钟额度大于小时额度时小时那格永远轮不到,配置读起来像是生效其实没用。
293
+ if (perMinute !== undefined && perHour !== undefined && perMinute > perHour) {
294
+ errors.push(`${field}.perMinute must be <= ${field}.perHour`);
295
+ }
259
296
  return { perMinute: perMinute ?? fallback.perMinute, perHour: perHour ?? fallback.perHour };
260
297
  }
298
+ /** 与 `event-center/validation.ts` 的 `AID_PATTERN` 同一份口径;两处独立声明,改一处要同步另一处。 */
299
+ const AID_PATTERN = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*\.[a-z]{2,}$/;
300
+ function validateAidList(value, field, errors) {
301
+ if (value === undefined)
302
+ return [];
303
+ if (!Array.isArray(value)) {
304
+ errors.push(`${field} must be an array`);
305
+ return undefined;
306
+ }
307
+ const out = [];
308
+ for (const item of value) {
309
+ if (typeof item !== 'string' || !AID_PATTERN.test(item)) {
310
+ errors.push(`${field} contains an invalid AID: ${String(item)}`);
311
+ return undefined;
312
+ }
313
+ // 去重保序:手抄白名单时重复项很常见,静默去掉比报错更省事。
314
+ if (!out.includes(item))
315
+ out.push(item);
316
+ }
317
+ return out;
318
+ }
319
+ /**
320
+ * 校验 `rules`:`{ <service.type>: { allow: [aid...], deny: [aid...] } }`。
321
+ *
322
+ * 与事件中心的 rules 同构:联系人快照是基础集合,allow 额外放行,deny 优先剔除。
323
+ * 同一个 AID 同时出现在 allow 和 deny 里是配置错误——deny 会赢,写的人多半
324
+ * 以为 allow 会赢,必须报出来而不是静默按 deny 处理。
325
+ */
326
+ function validateRules(raw, errors) {
327
+ const rules = {};
328
+ if (!isRecord(raw)) {
329
+ if (raw !== undefined)
330
+ errors.push('rules must be an object');
331
+ return rules;
332
+ }
333
+ for (const [type, entry] of Object.entries(raw)) {
334
+ if (!isListenableType(type)) {
335
+ errors.push(`rules key must be a service type: ${type}`);
336
+ continue;
337
+ }
338
+ // 内置保留字不受 rules 约束:它们的准入是刻意分级的(ping 零信息全开、
339
+ // list 空壳、带 service 的统一拒绝),加 deny 会造出"被拒 vs 正常"的可区分
340
+ // 信号,正是分级要避免的枚举信道。存下来却不生效更糟——写入时就拒绝。
341
+ if (RESERVED_TYPES.has(type)) {
342
+ errors.push(`rules must not target a builtin reserved type: ${type} (builtin admission is fixed)`);
343
+ continue;
344
+ }
345
+ if (!isRecord(entry)) {
346
+ errors.push(`rules.${type} must be an object`);
347
+ continue;
348
+ }
349
+ const extra = Object.keys(entry).filter(key => !['allow', 'deny'].includes(key));
350
+ if (extra.length)
351
+ errors.push(`rules.${type} has unknown fields: ${extra.join(', ')}`);
352
+ const allow = validateAidList(entry.allow, `rules.${type}.allow`, errors);
353
+ const deny = validateAidList(entry.deny, `rules.${type}.deny`, errors);
354
+ if (!allow || !deny)
355
+ continue;
356
+ const overlap = allow.filter(aid => deny.includes(aid));
357
+ if (overlap.length) {
358
+ errors.push(`rules.${type} contains the same AID in allow and deny: ${overlap.join(', ')}`);
359
+ }
360
+ rules[type] = { allow, deny };
361
+ }
362
+ return rules;
363
+ }
261
364
  /** 校验 services-config.json 原始对象。 */
262
365
  export function validateRouterConfig(raw) {
263
366
  const errors = [];
264
367
  if (!isRecord(raw))
265
368
  return { ok: false, errors: ['services-config.json must be a JSON object'] };
266
- const extra = Object.keys(raw).filter(key => !['v', 'enabled', 'rateLimit'].includes(key));
369
+ const extra = Object.keys(raw).filter(key => !['v', 'enabled', 'rateLimit', 'rules'].includes(key));
267
370
  if (extra.length)
268
371
  errors.push(`unknown top-level fields: ${extra.join(', ')}`);
269
372
  if (raw.v !== 1)
@@ -287,11 +390,12 @@ export function validateRouterConfig(raw) {
287
390
  };
288
391
  }
289
392
  }
393
+ const rules = validateRules(raw.rules, errors);
290
394
  if (errors.length)
291
395
  return { ok: false, errors };
292
396
  return {
293
397
  ok: true,
294
398
  errors: [],
295
- value: { v: 1, enabled: raw.enabled === true, rateLimit },
399
+ value: { v: 1, enabled: raw.enabled === true, rateLimit, rules },
296
400
  };
297
401
  }
@@ -1,4 +1,5 @@
1
1
  import crypto from 'crypto';
2
+ import { templateInstallationGate } from '../agent-template/jobs.js';
2
3
  import fs from 'fs';
3
4
  import { CronExpressionParser } from 'cron-parser';
4
5
  import { logger } from '../utils/logger.js';
@@ -41,20 +42,27 @@ export class TriggerRuntimeScheduler {
41
42
  initialized = false;
42
43
  stopping = false;
43
44
  lifecycleGeneration = 0;
44
- mutationPaused = false;
45
+ mutationPauses = new Set();
46
+ get mutationPaused() { return this.mutationPauses.size > 0; }
45
47
  pendingMutationStarts = 0;
46
48
  /** Hold scheduling without changing definitions or consuming one-shot triggers. */
47
- async pauseForMutation() {
49
+ async pauseForMutation(token = Symbol('mutation')) {
48
50
  if (this.mutationPaused || this.running.size || this.runStartLocks.size || this.pendingMutationStarts) {
49
51
  throw Object.assign(new Error('Trigger scheduler has active work'), { code: 'AGENT_BUSY' });
50
52
  }
51
- this.mutationPaused = true;
53
+ this.mutationPauses.add(token);
52
54
  for (const timer of this.timers.values())
53
55
  clearTimeout(timer);
54
56
  this.timers.clear();
55
57
  this.eventSource?.stop();
58
+ let released = false;
56
59
  return async () => {
57
- this.mutationPaused = false;
60
+ if (released)
61
+ return;
62
+ released = true;
63
+ this.mutationPauses.delete(token);
64
+ if (this.mutationPaused)
65
+ return;
58
66
  if (!this.stopping)
59
67
  for (const definition of this.manager.list())
60
68
  this.schedule(definition);
@@ -480,6 +488,8 @@ export class TriggerRuntimeScheduler {
480
488
  }
481
489
  }
482
490
  async startRun(definition, payload) {
491
+ if (templateInstallationGate(this.manager.agentAid ?? definition.agentAid).blocked)
492
+ return { ok: false, runId: 'team-pending', triggerId: definition.id, status: 'skipped', reason: 'stopped' };
483
493
  if (this.mutationPaused)
484
494
  return { ok: false, runId: 'mutation', triggerId: definition.id, status: 'skipped', reason: 'stopped' };
485
495
  this.pendingMutationStarts++;
@@ -1520,6 +1530,7 @@ export class TriggerRuntimeScheduler {
1520
1530
  startedAt: run.startedAt,
1521
1531
  executionSessionId: session.id,
1522
1532
  executionDeadlineAt: run.executionDeadlineAt,
1533
+ resume: true,
1523
1534
  });
1524
1535
  let execution = await this.runRecoveredExecutionAttempt(definition, runtime, session);
1525
1536
  this.state.completeExecutionAttempt(definition.id, run.runId, attemptId, attemptSummaryFromExecution(attempt, attemptId, execution));
@@ -1552,6 +1563,9 @@ export class TriggerRuntimeScheduler {
1552
1563
  trigger: definition,
1553
1564
  runId: run.runId,
1554
1565
  attemptId: run.attemptId,
1566
+ // Keep run/attempt/session identity while giving this continuation its
1567
+ // own durable queue claim and response slot. Never erase inbound dedup.
1568
+ deliveryId: `${run.attemptId}:resume:${run.resumeCount}`,
1555
1569
  firedAt: source.firedAt,
1556
1570
  projectPath: session.projectPath,
1557
1571
  baseagent: session.baseagent,
@@ -8,11 +8,45 @@ import { resolveCodexCliPath } from '../agents/baseagent.js';
8
8
  import { ensureSessionRuntimeDir } from '../cli/task-context.js';
9
9
  import { buildBubblewrapCommand, buildHClassGuardCommand, resolveBubblewrapPath, } from '../core/permission/sandbox-runtime.js';
10
10
  import { resolvePhaseOneExecutionSandbox } from '../core/permission/mode.js';
11
- import { sanitizeShellExecutionEnvironment } from '../core/permission/shell-environment.js';
11
+ import { isCredentialEnvironmentName, sanitizeShellExecutionEnvironment } from '../core/permission/shell-environment.js';
12
12
  import { buildCodexProtectedFilesystemRules, classifyProtectedPath, getExistingRelationAttachmentDirs, isSameOrDescendant, } from '../core/permission/protected-paths.js';
13
13
  import { resolveRoot } from '../paths.js';
14
14
  import { buildCliLaunchCommand, killProcess, resolveCommandPath } from '../utils/cross-platform.js';
15
15
  import { TRIGGER_LOCAL_FILE_LIMIT } from './local-files.js';
16
+ /**
17
+ * 沙箱探针(`prepare()`)的超时上限。
18
+ *
19
+ * 探针要在 Windows 上做两次真实子进程往返(可读 + 拒读),正常情况下几百毫秒。
20
+ * 但没有上限时一旦 provisioning 卡住(ACL 写入、codex 启动),调用方会无限等待:
21
+ * services / events 的 dispatcher 槽位永不释放,并发槽打满后整条流水线停摆。
22
+ */
23
+ export const SANDBOX_PREPARE_TIMEOUT_MS = 30_000;
24
+ /**
25
+ * 给 `prepare()` 套一层超时:超时即 abort,让探针内部杀掉子进程并退出。
26
+ *
27
+ * 只做 `Promise.race` 不够——被抛弃的探针仍在后台跑子进程。所以传 signal 进去,
28
+ * 让探针自己收尾;`race` 只负责让调用方尽快拿到失败。
29
+ */
30
+ export async function runPrepareWithDeadline(prepare, timeoutMs = SANDBOX_PREPARE_TIMEOUT_MS) {
31
+ const controller = new AbortController();
32
+ let timer;
33
+ const timeout = new Promise((_, reject) => {
34
+ timer = setTimeout(() => {
35
+ // 先 reject 再 abort:abort 会同步触发探针的 abort 监听,它自己的拒绝可能
36
+ // 抢在超时错误之前结算,导致调用方拿到的是 `aborted` 而不是稳定错误码。
37
+ reject(Object.assign(new Error(`sandbox prepare timed out after ${timeoutMs}ms`), { code: 'SCRIPT_SANDBOX_TIMEOUT' }));
38
+ controller.abort();
39
+ }, timeoutMs);
40
+ timer.unref?.();
41
+ });
42
+ try {
43
+ await Promise.race([prepare(controller.signal), timeout]);
44
+ }
45
+ finally {
46
+ if (timer)
47
+ clearTimeout(timer);
48
+ }
49
+ }
16
50
  const WINDOWS_SANDBOX_SETUP_VERSION = 5;
17
51
  const SCRIPT_ENVIRONMENT_EXCLUDES = [
18
52
  'CODEX_HOME',
@@ -462,7 +496,10 @@ function buildSandboxEnvironment(workDir) {
462
496
  };
463
497
  }
464
498
  function getScriptEnvironmentExcludes() {
465
- const dynamic = Object.keys(process.env).filter(key => key.toUpperCase().startsWith('EVOLCORE_'));
499
+ // 三类:固定名单、本机凭据命名的变量、EvolCore 自己的控制变量。
500
+ // 凭据类必须按名字扫——`GITHUB_TOKEN` / `AWS_SECRET_ACCESS_KEY` 不在固定名单里,
501
+ // 漏掉就会随 `inherit="all"` 原样进到脚本。
502
+ const dynamic = Object.keys(process.env).filter(key => key.toUpperCase().startsWith('EVOLCORE_') || isCredentialEnvironmentName(key));
466
503
  return [...new Set([...SCRIPT_ENVIRONMENT_EXCLUDES, ...dynamic])];
467
504
  }
468
505
  function filesystemEntry(value, access) {
@@ -58,6 +58,13 @@ export class TriggerRunStateStore {
58
58
  if (existing) {
59
59
  if (input.executionSessionId)
60
60
  existing.executionSessionId = input.executionSessionId;
61
+ if (input.resume) {
62
+ // Suspension may have settled the old delivery as cancelled. The
63
+ // recovery event preserves that history; its logical attempt resumes.
64
+ existing.status = 'running';
65
+ delete existing.finishedAt;
66
+ delete existing.error;
67
+ }
61
68
  }
62
69
  else {
63
70
  attempts.push({
@@ -1,28 +1,165 @@
1
- import { randomUUID } from 'crypto';
1
+ import { randomBytes, randomUUID, timingSafeEqual, createHash } from 'crypto';
2
+ import { loadAgent } from '../config-store.js';
3
+ import { isValidAid } from '../aun/aid/validation.js';
4
+ import { ownerResolver } from '../core/ownership/owner-resolver.js';
5
+ import { readInstalledEvolcoreVersion } from './evolcore-version.js';
2
6
  const BIND_TTL_MS = 10 * 60 * 1000;
3
- const deferredMessage = 'Evol App ownership binding is deferred; use ec aid bind <ownerAid> [--subject <subjectAid>]';
4
7
  export class BindService {
5
- constructor(_options) { }
6
- startCleanup() { }
7
- stopCleanup() { }
8
- begin(_request) {
9
- return {
10
- ok: true,
11
- taskId: randomUUID(),
12
- qrData: {},
13
- expiresAt: Date.now() + BIND_TTL_MS,
8
+ options;
9
+ sessions = new Map();
10
+ cleanup;
11
+ constructor(options) {
12
+ this.options = options;
13
+ }
14
+ startCleanup() {
15
+ if (this.cleanup)
16
+ return;
17
+ this.cleanup = setInterval(() => this.expireSessions(), 60_000);
18
+ this.cleanup.unref?.();
19
+ }
20
+ stopCleanup() { clearInterval(this.cleanup); this.cleanup = undefined; }
21
+ begin(request) {
22
+ this.expireSessions();
23
+ if (!['daemon', 'agent'].includes(request.bindType) || 'ownerMode' in request) {
24
+ return { ok: false, code: 'INVALID_ARGUMENT', error: 'Select a daemon or Agent binding; use Ownership transfer to replace an Owner' };
25
+ }
26
+ const subjectAid = request.bindType === 'daemon' ? this.options.receiverAid : request.targetAid;
27
+ if (!subjectAid || !isValidAid(subjectAid)
28
+ || (request.bindType === 'agent' && (subjectAid === this.options.receiverAid || !loadAgent(subjectAid)))) {
29
+ return { ok: false, code: 'SUBJECT_UNAVAILABLE', error: 'Binding requires a local subject AID' };
30
+ }
31
+ if (this.sessions.size >= 128)
32
+ return { ok: false, code: 'BIND_CAPACITY', error: 'Too many pending binding sessions' };
33
+ const ttl = request.ttlMs ?? BIND_TTL_MS;
34
+ if (!Number.isFinite(ttl) || ttl <= 0 || ttl > BIND_TTL_MS) {
35
+ return { ok: false, code: 'INVALID_ARGUMENT', error: 'Binding TTL must be between 1 and 600000 milliseconds' };
36
+ }
37
+ const session = {
38
+ id: randomUUID(), token: randomBytes(32).toString('base64url'), bindType: request.bindType,
39
+ subjectAid, expiresAt: Date.now() + ttl, status: 'pending',
14
40
  };
41
+ this.sessions.set(session.id, session);
42
+ return { ok: true, taskId: session.id, expiresAt: session.expiresAt, qrData: {
43
+ type: 'evolcore.bind', version: readInstalledEvolcoreVersion(),
44
+ platform: process.platform === 'win32' ? 'windows' : process.platform,
45
+ bindType: session.bindType, subjectAid, receiverAid: this.options.receiverAid,
46
+ token: session.token, expiresAt: session.expiresAt,
47
+ } };
15
48
  }
16
- status(_taskId) {
17
- return { ok: false, code: 'OWNERSHIP_APP_DEFERRED', error: deferredMessage };
49
+ async status(taskId) {
50
+ this.expireSessions();
51
+ const session = this.sessions.get(taskId);
52
+ if (!session)
53
+ return { ok: false, code: 'BIND_SESSION_INVALID', error: 'Binding session does not exist' };
54
+ if (session.status !== 'cancelled' && session.ownerAid) {
55
+ try {
56
+ const state = await ownerResolver.status(session.subjectAid, { force: true });
57
+ session.status = this.confirmsOwner(session, state) ? 'bound' : 'pending';
58
+ }
59
+ catch (error) {
60
+ session.status = 'pending';
61
+ const code = error?.code;
62
+ return { ok: false,
63
+ code: typeof code === 'string' && /^[A-Za-z0-9_]{1,64}$/.test(code) ? code : 'OWNERSHIP_UNAVAILABLE',
64
+ error: 'Unable to verify current Ownership consensus' };
65
+ }
66
+ }
67
+ return { ok: true, taskId, status: session.status,
68
+ ...(session.status === 'bound' ? { boundAid: session.ownerAid } : {}) };
18
69
  }
19
- cancel(_taskId) {
20
- return { ok: false, code: 'OWNERSHIP_APP_DEFERRED', error: deferredMessage };
70
+ cancel(taskId) {
71
+ const session = this.sessions.get(taskId);
72
+ if (!session)
73
+ return { ok: false, code: 'BIND_SESSION_INVALID', error: 'Binding session does not exist' };
74
+ if (session.ownerAid)
75
+ return { ok: false, code: 'BIND_PENDING', error: 'An accepted Ownership request cannot be cancelled by cancelling its QR session' };
76
+ session.status = 'cancelled';
77
+ return { ok: true, taskId, status: 'cancelled' };
21
78
  }
22
- async handleRequest(payload, _fromAid) {
79
+ async handleRequest(payload, fromAid, encrypted = false) {
23
80
  if (payload?.type !== 'bind.request')
24
81
  return null;
25
- return { type: 'bind.response', bindType: payload.bindType === 'agent' ? 'agent' : 'daemon', success: false,
26
- error: { code: 'OWNERSHIP_APP_DEFERRED', message: deferredMessage } };
82
+ this.expireSessions();
83
+ const response = (code, message) => ({
84
+ type: 'bind.response', bindType: payload.bindType === 'agent' ? 'agent' : 'daemon', success: false,
85
+ ...(typeof payload.creationId === 'string' && payload.creationId.length <= 128 ? { creationId: payload.creationId } : {}),
86
+ error: { code, message },
87
+ });
88
+ if (!encrypted)
89
+ return response('ENCRYPTION_REQUIRED', 'Binding requires an encrypted identity message');
90
+ if (!isValidAid(fromAid))
91
+ return response('INVALID_SENDER', 'Binding requires an authenticated sender AID');
92
+ const session = [...this.sessions.values()].find(item => typeof payload.token === 'string'
93
+ && Buffer.byteLength(payload.token) === Buffer.byteLength(item.token)
94
+ && timingSafeEqual(Buffer.from(payload.token), Buffer.from(item.token)));
95
+ if (!session) {
96
+ return await this.options.handleAppBindRequest?.(payload, fromAid, encrypted)
97
+ ?? response('BIND_SESSION_INVALID', 'Binding session is invalid; refresh the QR code');
98
+ }
99
+ if (payload.bindType !== session.bindType
100
+ || (payload.subjectAid !== undefined && payload.subjectAid !== session.subjectAid)
101
+ || (payload.targetAid !== undefined && payload.targetAid !== session.subjectAid)) {
102
+ return response('BIND_CONFLICT', 'Binding subject does not match the QR session');
103
+ }
104
+ if (typeof payload.creationId !== 'string' || !payload.creationId.trim() || payload.creationId.length > 128) {
105
+ return response('INVALID_CREATION_ID', 'Binding requires a creationId');
106
+ }
107
+ if (payload.timestamp !== undefined && (typeof payload.timestamp !== 'number' || !Number.isFinite(payload.timestamp)
108
+ || Math.abs(Date.now() - payload.timestamp) > BIND_TTL_MS))
109
+ return response('REQUEST_EXPIRED', 'Binding request has expired');
110
+ const ownerAid = fromAid.toLowerCase();
111
+ const fingerprint = createHash('sha256').update(JSON.stringify({
112
+ ownerAid, creationId: payload.creationId, bindType: payload.bindType,
113
+ subjectAid: session.subjectAid, clientName: payload.clientName, deviceName: payload.deviceName,
114
+ platform: payload.platform, appVersion: payload.appVersion, timestamp: payload.timestamp,
115
+ })).digest('hex');
116
+ if (session.ownerAid) {
117
+ if (session.ownerAid !== ownerAid || session.fingerprint !== fingerprint)
118
+ return response('BIND_CONFLICT', 'Binding request conflicts with an accepted request');
119
+ return session.flight ?? session.response;
120
+ }
121
+ if (session.status !== 'pending' || session.expiresAt <= Date.now())
122
+ return response('BIND_SESSION_EXPIRED', 'Binding QR session is no longer valid');
123
+ session.ownerAid = ownerAid;
124
+ session.creationId = payload.creationId;
125
+ session.fingerprint = fingerprint;
126
+ const work = async () => {
127
+ try {
128
+ const state = await ownerResolver.bind(session.subjectAid, ownerAid, () => session.status !== 'cancelled', () => { session.submissionStarted = true; });
129
+ const bound = this.confirmsOwner(session, state);
130
+ session.status = bound ? 'bound' : 'pending';
131
+ return { type: 'bind.response', bindType: session.bindType, creationId: session.creationId,
132
+ success: true, subjectAid: session.subjectAid, ownerAid, status: bound ? 'bound' : 'pending' };
133
+ }
134
+ catch (error) {
135
+ if (session.submissionStarted)
136
+ return { type: 'bind.response', bindType: session.bindType,
137
+ creationId: session.creationId, success: true, subjectAid: session.subjectAid, ownerAid, status: 'unknown' };
138
+ session.ownerAid = undefined;
139
+ session.fingerprint = undefined;
140
+ const code = error?.code;
141
+ return response(typeof code === 'string' && /^[A-Za-z0-9_]{1,64}$/.test(code) ? code : 'BIND_FAILED', 'Binding preparation failed; query Ownership before retrying');
142
+ }
143
+ };
144
+ session.flight = work();
145
+ try {
146
+ return session.response = await session.flight;
147
+ }
148
+ finally {
149
+ session.flight = undefined;
150
+ }
151
+ }
152
+ confirmsOwner(session, state) {
153
+ return state.consensusStatus === 'consensus' && state.ownerAid === session.ownerAid
154
+ && state.consensus?.sub_aid === session.subjectAid && state.consensus.lock === 'locked'
155
+ && state.authorizationStatus === 'verified' && !state.refreshFailure;
156
+ }
157
+ expireSessions() {
158
+ for (const [id, session] of this.sessions) {
159
+ if (!session.ownerAid && session.status === 'pending' && session.expiresAt <= Date.now())
160
+ session.status = 'expired';
161
+ if (!session.flight && session.expiresAt + BIND_TTL_MS <= Date.now())
162
+ this.sessions.delete(id);
163
+ }
27
164
  }
28
165
  }
@@ -324,8 +324,8 @@ export async function atomicReplaceJson(file, value) {
324
324
  const retryableCodes = new Set(['EPERM', 'EACCES', 'EBUSY']);
325
325
  const delays = [10, 25, 50, 100];
326
326
  const pause = new Int32Array(new SharedArrayBuffer(4));
327
- /** Retry brief file-handle contention without opening or deleting the live file. */
328
- export function atomicReplaceFile(source, destination) {
327
+ /** Retry brief contention; disable allowInPlaceFallback when replacement must remain atomic. */
328
+ export function atomicReplaceFile(source, destination, options = {}) {
329
329
  let lastError;
330
330
  for (let attempt = 0;; attempt += 1) {
331
331
  try {
@@ -341,7 +341,7 @@ export function atomicReplaceFile(source, destination) {
341
341
  }
342
342
  }
343
343
  const code = lastError?.code;
344
- if (process.platform === 'win32' && code === 'EPERM') {
344
+ if (options.allowInPlaceFallback !== false && process.platform === 'win32' && code === 'EPERM') {
345
345
  // Some Windows file projections deny renaming an open JSON target. Keep
346
346
  // its inode and use atomicWrite's hot-backup/stable-write fallback instead.
347
347
  atomicWrite(destination, fs.readFileSync(source, 'utf8'));