evolcore 0.0.43-test.5 → 0.0.43-test.6

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 (116) hide show
  1. package/CHANGELOG.md +47 -0
  2. package/bin/ecmsg.js +126 -43
  3. package/dist/agents/baseagent-availability.js +19 -4
  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 +14 -3
  7. package/dist/agents/codex-runner.js +6 -6
  8. package/dist/aun/group/invite-service.js +3 -2
  9. package/dist/aun/service-proxy.js +18 -6
  10. package/dist/channels/aun.js +73 -10
  11. package/dist/cli/agent-create.js +16 -6
  12. package/dist/cli/aun-commands.js +9 -1
  13. package/dist/cli/daemon-commands.js +30 -1
  14. package/dist/cli/ecmsg-gateway.js +3 -1
  15. package/dist/cli/init.js +75 -0
  16. package/dist/cli/provider-command.js +1 -1
  17. package/dist/cli/restart-monitor.js +24 -5
  18. package/dist/cli/task-context.js +38 -1
  19. package/dist/cli/watch-logs.js +6 -4
  20. package/dist/config/boot-log.js +6 -4
  21. package/dist/config/builtin-roles.js +2 -2
  22. package/dist/config/config-manager.js +1 -1
  23. package/dist/config/peer-role-resolver.js +1 -1
  24. package/dist/config/provider-identity-migration.js +92 -17
  25. package/dist/config/provider-local-sync.js +2 -0
  26. package/dist/config/providers-config.js +13 -0
  27. package/dist/config/providers-management.js +100 -10
  28. package/dist/config/role-service.js +8 -8
  29. package/dist/config/role-store.js +22 -22
  30. package/dist/config/schema-migration.js +80 -87
  31. package/dist/config/snapshot.js +70 -41
  32. package/dist/core/agent-runtime.js +44 -7
  33. package/dist/core/baseagent-loader.js +114 -11
  34. package/dist/core/channel-loader.js +36 -13
  35. package/dist/core/channel-runtime.js +112 -42
  36. package/dist/core/command/command-handler.js +5 -5
  37. package/dist/core/command/menu-handler.js +8 -3
  38. package/dist/core/command/menu-protocol.js +82 -11
  39. package/dist/core/command/role-menu.js +27 -15
  40. package/dist/core/daemon-control.js +42 -15
  41. package/dist/core/daemon-lifecycle.js +411 -67
  42. package/dist/core/handoff/dispatcher.js +9 -3
  43. package/dist/core/handoff/runtime.js +130 -42
  44. package/dist/core/handoff/store.js +190 -2
  45. package/dist/core/handoff/types.js +5 -0
  46. package/dist/core/initialization/service.js +4 -4
  47. package/dist/core/ipc-registration.js +5 -4
  48. package/dist/core/lifecycle-notice.js +10 -4
  49. package/dist/core/message/aun-ipc-sender.js +2 -2
  50. package/dist/core/message/message-bridge.js +53 -4
  51. package/dist/core/message/message-queue.js +46 -4
  52. package/dist/core/message/pending-hints.js +4 -10
  53. package/dist/core/message/response-engine.js +10 -2
  54. package/dist/core/message/send-routing.js +12 -2
  55. package/dist/core/ownership/owner-resolver.js +1 -0
  56. package/dist/core/permission/ec-command-parser.js +11 -1
  57. package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
  58. package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
  59. package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
  60. package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
  61. package/dist/core/session/session-fs-store.js +164 -3
  62. package/dist/core/session/session-idle-monitor.js +9 -1
  63. package/dist/core/session/session-manager.js +36 -2
  64. package/dist/directory/owner-directory-admission.js +26 -1
  65. package/dist/directory/owner-directory-cache.js +57 -16
  66. package/dist/directory/owner-directory-query-operation.js +4 -1
  67. package/dist/ecweb/runtime/lifecycle.js +9 -7
  68. package/dist/ecweb/runtime/supervisor.js +44 -27
  69. package/dist/index.js +548 -251
  70. package/dist/proxy/manager.js +38 -17
  71. package/dist/proxy/service-supervisor.js +65 -31
  72. package/dist/trigger/application-service.js +3 -1
  73. package/dist/trigger/audit.js +19 -4
  74. package/dist/trigger/authorization.js +14 -5
  75. package/dist/trigger/history.js +176 -7
  76. package/dist/trigger/manager.js +1 -3
  77. package/dist/trigger/scheduler.js +78 -5
  78. package/dist/utils/cross-platform.js +152 -4
  79. package/dist/utils/host-info.js +11 -8
  80. package/dist/utils/npm-ops.js +48 -0
  81. package/dist/utils/process-introspect.js +64 -1
  82. package/dist/utils/startup-trace.js +160 -19
  83. package/kits/docs/aun/ABILITY_CALLING.md +3 -3
  84. package/kits/docs/evolcore/INDEX.md +3 -2
  85. package/kits/docs/evolcore/ctl.md +2 -1
  86. package/kits/docs/evolcore/group.md +2 -2
  87. package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
  88. package/kits/docs/evolcore/msg.md +13 -6
  89. package/kits/docs/evolcore/provider.md +21 -3
  90. package/kits/docs/evolcore/response.md +1 -1
  91. package/kits/eck_manifest.json +19 -7
  92. package/kits/eck_message_manifest.json +3 -3
  93. package/kits/rules/06-channel.md +5 -6
  94. package/kits/schemas/daemon.schema.1.json +5 -0
  95. package/kits/schemas/daemon.schema.2.json +5 -0
  96. package/kits/schemas/daemon.schema.3.json +2 -1
  97. package/kits/schemas/daemon.schema.4.json +2 -1
  98. package/kits/schemas/daemon.schema.5.json +2 -1
  99. package/kits/schemas/daemon.schema.6.json +1 -1
  100. package/kits/schemas/daemon.schema.7.json +1 -1
  101. package/kits/schemas/daemon.schema.8.json +2 -1
  102. package/kits/schemas/daemon.schema.9.json +2 -1
  103. package/kits/schemas/role-registry.schema.1.json +2 -2
  104. package/kits/schemas/single-session.schema.1.json +1 -1
  105. package/kits/schemas/single-session.schema.2.json +1 -1
  106. package/kits/schemas/single-session.schema.3.json +1 -1
  107. package/kits/skills/aid-ability/SKILL.md +7 -7
  108. package/kits/skills/ec-group/SKILL.md +8 -5
  109. package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
  110. package/kits/skills/ec-trigger/SKILL.md +4 -4
  111. package/kits/skills/thread-ops/SKILL.md +10 -10
  112. package/kits/templates/system-fragments/commands.md +5 -5
  113. package/kits/templates/system-fragments/reply.md +2 -1
  114. package/kits/templates/system-fragments/session.md +1 -1
  115. package/kits/templates/system-fragments/thread.md +1 -1
  116. package/package.json +4 -3
package/CHANGELOG.md CHANGED
@@ -5,6 +5,53 @@
5
5
 
6
6
  ## Unreleased
7
7
 
8
+ ## 0.0.43-test.6 (2026-11-08)
9
+
10
+ ### 身份、Owner 与联系人
11
+
12
+ - Agent 常驻设定改用 personal/soul/ 分册,迁移旧 persona.md;移除 ec agent persona 命令,保留已有设定的覆盖保护。
13
+ - 显示名跟随签名名片刷新,移除一次性自我介绍注入;支持关闭首次欢迎消息,并在创建 Agent 时指定和校验 Provider。
14
+ - 新增 App 联系人准入协议及 allowAllContacts 总开关,完善黑名单、临时授权、Owner 名录范围、缓存同步和备注维护;未准入联系向本端 Owner 申请。
15
+ - 名录查询统一为 ec directory list/info,完善分页、搜索和文件变化检测;拉取被拒时保留可用本地快照。预置名录缺少有效授权文件时,可使用归属匹配的本地快照查询与准入,授权过期仍拒绝。
16
+ - 同 Owner 默认角色适用于签名名片及协议归属核验通过的内部 Agent;敏感操作重新核验,身份变化使旧授权失效。
17
+ - 普通 Agent 创建、绑定和转让要求目标为验签通过的 human;自动绑定邀约仅在初始化阶段处理,active Agent 不按遗留配置重新绑定。支持显式清除拒绝记录,共识确认后清理旧 Owner 配置字段。
18
+
19
+ ### 对话、模型与自动化
20
+
21
+ - 新增 paactive 私聊模式,通过可靠 activity 展示助理活动;群聊统一使用 proactive,输出遵循活动显示配置。
22
+ - 统一模型容量解析,按当前 Provider 计算自动压缩阈值,更新模型与价格数据;修正压缩后上下文用量,并增加手动压缩进度通知。
23
+ - ecagent 支持只读访问入站附件并校验真实路径;非法工具参数转为可恢复错误,摘要失败不再自动重试。
24
+ - Trigger 跟随 Agent 当前基座,阻止恢复基座不匹配的任务;支持静默结果和带自定义提示词的单次闲置触发,减少启动时重复读取历史。
25
+ - 完善任务取消、子进程清理和失败反馈;输入已提交而结果不明时不重复提交,明确上下文超限不进入通用重试。
26
+
27
+ ### 消息与权限
28
+
29
+ - 新增 ecmsg 统一发送入口,统一话题路由、复查和加密选项,支持向其他渠道的既有会话投递。
30
+ - AUN Menu 请求与响应使用独立 control 消息流,响应强制加密;话题摘要改为异步分批读取,完善响应重试、耗时诊断和 Codex 话题派生。
31
+ - 完善 Fullaccess 委托核验、授权审计、PowerShell 与跨 Shell 参数解析,以及只读查询和路径范围判断;可信 Fullaccess 任务可读取原始日志。
32
+ - 停止向 Owner 观察通道转发 thought.put 返回结果;模型信息、Slash 回执及运行状态使用结构化通知,完善工具参数错误与权限拒绝的归因。
33
+
34
+ ### 能力插件与工作区
35
+
36
+ - 新增按 Agent 或主机 AID 管理的能力插件平台,支持开发、构建、安装、授权、发布、升级及回滚,并提供 EC Web 管理入口。
37
+ - 支持多种进程运行时,完善能力发现、多设备结果、请求关联、契约校验和重放保护;资源代理增加批量存储与工作区读取。
38
+ - PA 工作区增加项目索引、清空和锁定操作,完善初始化、迁移与路径规范;任务图片按活动保存为可校验的不可变资源。
39
+
40
+ ### Provider、安装与运行管理
41
+
42
+ - Provider 改用基于域名的稳定 ID,增加 v2 Schema、旧 ID 别名及引用迁移;迁移冲突时保留原配置并阻止启动,环境变量地址需提供有效域名。
43
+ - 初始化自动导入本机 Provider,保留可用默认选择;完善连接复用、地址固化、导入合并、接口风格保存和引用迁移。
44
+ - 启动时按恢复优先级调度持久队列、处理中会话、Handoff 和活动 Trigger,分阶段放行 Runner 与渠道;区分控制面就绪、任务就绪和后台审计。
45
+ - 强化受管服务与 EC Web 的实例身份、生命周期、健康检查和恢复计数;进程探测及临时目录准备改为异步,防止停止后继续接管或发布就绪。
46
+ - 统一 Daemon 与 Agent 上下线通知开关;下线通知完成准入后再释放 Owner 共识,完善并行停机和跨平台协作退出。
47
+ - 完善 Windows 安装卸载、编码、PATH、自启动诊断及确认后修复;强化控制 AID 材料校验和 CLI 探测,裸跑 ec 显示帮助,移除 ec handoff 入口。
48
+ - 移除 EC Web 内置 PA 看板导航入口,看板服务需单独部署。
49
+
50
+ ### 依赖与兼容性
51
+
52
+ - AUN SDK 最低兼容版本提升至 0.5.33;Node.js 要求保持 >=22.16.0,配套 ec-web@0.0.43-test.6。
53
+ - Agent、Relation、Role Schema 分别收敛为 v19、v12、v2;兼容的 Agent v20 与 Relation v13 配置启动时备份迁移,自定义 Role v3 需人工调整。内部联系人默认角色字段统一为 internalContact,兼容迁移旧 paTeam 字段。
54
+
8
55
  ## 0.0.43-test.5 (2026-11-07)
9
56
 
10
57
  ### 身份、Owner 与联系人
package/bin/ecmsg.js CHANGED
@@ -46,7 +46,8 @@ const HELP = `用法: ecmsg send '<正文>' [选项]
46
46
  发送目标(三选一,优先级从高到低):
47
47
  (省略) 回复当前会话的对端/群
48
48
  --thread <话题id> 发到指定话题;只接受 thread-… 或 main:<aidA>:<aidB>
49
- --to <对端ID> 发到指定对端
49
+ --to <对端ID> 发到指定对端(群 AID 或对方 AID,按本地关系判定类型)
50
+ --from <本端AID> 可省略;出现时必须等于当前会话本端(--self 同义)
50
51
 
51
52
  复查:
52
53
  跨话题(对端或话题与会话不同)自动创建复查 Trigger,默认 20m;
@@ -64,6 +65,10 @@ const HELP = `用法: ecmsg send '<正文>' [选项]
64
65
  --link <url> [--title T] 链接卡片
65
66
  --payload '<json>' 自定义 payload
66
67
 
68
+ @提及(仅群聊;私聊带 --mention 会被拒绝):
69
+ --mention '<aid1>,<aid2>' @指定成员,逗号分隔
70
+ --mention-all @所有人
71
+
67
72
  其它:
68
73
  --format json 输出 JSON 回执
69
74
  --help 显示本帮助
@@ -167,6 +172,63 @@ async function loadDist(relative) {
167
172
  }
168
173
  }
169
174
 
175
+ /**
176
+ * 判定 `--to` 的目标是私聊还是群。
177
+ *
178
+ * AID 的字面形态**从来不是证据**(`aun/group/identity.ts` 的既定原则:
179
+ * 数字 base 也可能是人,`g-` 前缀不是保留给群的)。依据按可信度排序:
180
+ *
181
+ * 1. 目标就是当前会话对端 —— 路由上下文本身就是证据
182
+ * 2. 本地关系记录的 targetKind / 验签通过的 agent.md type
183
+ * 3. 兜底私聊 —— 群关系必然在本地留痕(不是成员发不了),查不到就不是群
184
+ *
185
+ * 第 3 条同时覆盖"首次联系一个人":这时关系记录还不存在,按私聊发出,
186
+ * 会话随首条消息建立。
187
+ */
188
+ async function resolveTargetPeerKind(runtime, targetId) {
189
+ const currentKind = runtime.chatType === 'group' ? 'group' : 'private';
190
+ if (runtime.channel !== 'aun') return currentKind;
191
+
192
+ const normalize = value => String(value ?? '').trim().replace(/^@/, '').toLowerCase();
193
+ const currentPeerId = currentPeerIdOf(runtime);
194
+ if (normalize(targetId) === normalize(currentPeerId)) return currentKind;
195
+
196
+ const peerIdentity = await loadDist('core/relation/peer-identity.js');
197
+ try {
198
+ const local = peerIdentity?.readAunPeerKind?.(runtime.selfAid, targetId)?.kind;
199
+ if (local === 'private' || local === 'group') return local;
200
+ } catch { /* 本地证据不可用不算错误,继续往下判 */ }
201
+ try {
202
+ const remote = await peerIdentity?.resolveAunPeerKind?.(runtime.selfAid, targetId);
203
+ if (remote?.kind === 'private' || remote?.kind === 'group') return remote.kind;
204
+ } catch { /* 网络不可用时不阻塞发送,按私聊兜底 */ }
205
+ return 'private';
206
+ }
207
+
208
+ // ── 当前对端 ──
209
+
210
+ /**
211
+ * 当前会话对端的原生 ID。
212
+ *
213
+ * 群会话里 `runtime.peerId` 是发言人(入站消息的 userId),不是群;群 ID 在
214
+ * `peerKey`(`aun#<群AID>`)里。私聊的 peerId 才是对端。优先取 peerKey:它与授权层
215
+ * 判定「当前关系」用的是同一个字段,trigger / handoff 来源的会话也由它携带。
216
+ * peerKey 缺失时才回落:群用 channelId,私聊用 peerId。
217
+ */
218
+ function currentPeerIdOf(runtime) {
219
+ const key = typeof runtime.peerKey === 'string' ? runtime.peerKey : '';
220
+ const idx = key.indexOf('#');
221
+ if (idx > 0) {
222
+ try {
223
+ const id = decodeURIComponent(key.slice(idx + 1));
224
+ if (id) return id;
225
+ } catch { /* peerKey 格式异常:按缺失处理,走下面的回落 */ }
226
+ }
227
+ return runtime.chatType === 'group'
228
+ ? (runtime.channelId ?? '')
229
+ : (runtime.peerId ?? runtime.channelId ?? '');
230
+ }
231
+
170
232
  // ── 错误输出 ──
171
233
 
172
234
  let jsonOutput = false;
@@ -244,29 +306,67 @@ async function main() {
244
306
  || passthrough.some(flag => gateway.BODY_FLAGS.has(flag));
245
307
  if (!hasBody) fail('缺少正文', 'INVALID_ARGUMENT', { hint: "例:ecmsg send '收到'" });
246
308
 
247
- // 话题索引:只有 --thread 是独立话题时才真读盘,其余情况零 IO。
309
+ // 话题索引:--thread 是独立话题、或 --to 需要判断"是不是首次联系"时才真读盘,
310
+ // 其余情况零 IO。
248
311
  const deps = {};
249
- if (gateway.needsThreadIndexLookup(routeOpts.thread)) {
312
+
313
+ // --to 的目标类型:下游按它选 msg send / group send,必须解析而不是沿用
314
+ // 当前会话的类型——否则"在私聊会话里给群发"会走成私聊,"在群会话里给个人发"
315
+ // 会走成群消息。
316
+ if (routeOpts.to !== undefined && String(routeOpts.to).trim()) {
317
+ const peerKind = await resolveTargetPeerKind(runtime, String(routeOpts.to).trim());
318
+ deps.resolveTarget = id => ({ channelType: runtime.channel, peerKind, id });
319
+ }
320
+ // `--thread main:<a>:<b>` 的对端类型:主话题 id 里只有两个 AID,群的主话题同样写成
321
+ // main:<self>:<群AID>。类型按关系证据解析(与 --to 同一套),再同步注入给纯函数;
322
+ // 否则网关会把群主话题当私聊,下游走 msg scope 被判 TOPIC_NOT_FOUND。
323
+ if (typeof routeOpts.thread === 'string' && routeOpts.thread.trim()) {
324
+ const topicIds = await loadDist('core/thread/topic-id.js');
325
+ const threadValue = routeOpts.thread.trim();
326
+ const mainPeer = topicIds?.isMainTopicId?.(threadValue)
327
+ ? topicIds.mainTopicPeer(threadValue, runtime.selfAid)
328
+ : undefined;
329
+ if (mainPeer) {
330
+ const mainPeerKind = await resolveTargetPeerKind(runtime, mainPeer);
331
+ deps.resolvePeerKind = () => mainPeerKind;
332
+ }
333
+ }
334
+ const needsThreadModule = gateway.needsThreadIndexLookup(routeOpts.thread)
335
+ || routeOpts.to !== undefined;
336
+ if (needsThreadModule) {
250
337
  const threadModule = await loadDist('core/thread/thread-service.js');
251
- if (!threadModule) fail(BUILD_HINT, 'BUILD_REQUIRED');
252
- let entry;
253
- try {
254
- entry = threadModule.ThreadService.findThreadById(runtime.selfAid, routeOpts.thread);
255
- } catch {
256
- entry = undefined;
338
+ if (!threadModule && gateway.needsThreadIndexLookup(routeOpts.thread)) {
339
+ fail(BUILD_HINT, 'BUILD_REQUIRED');
257
340
  }
258
- deps.resolveThread = threadId => {
259
- if (!entry || entry.threadId !== threadId) return undefined;
260
- return {
261
- threadId: entry.threadId,
262
- selfAid: runtime.selfAid,
263
- peer: {
264
- channelType: entry.channelType ?? 'aun',
265
- peerKind: entry.peerKind,
266
- id: entry.peer,
267
- },
341
+ if (threadModule) {
342
+ let entry;
343
+ try {
344
+ entry = threadModule.ThreadService.findThreadById(runtime.selfAid, routeOpts.thread);
345
+ } catch {
346
+ entry = undefined;
347
+ }
348
+ deps.resolveThread = threadId => {
349
+ if (!entry || entry.threadId !== threadId) return undefined;
350
+ return {
351
+ threadId: entry.threadId,
352
+ selfAid: runtime.selfAid,
353
+ peer: {
354
+ channelType: entry.channelType ?? 'aun',
355
+ peerKind: entry.peerKind,
356
+ id: entry.peer,
357
+ },
358
+ };
268
359
  };
269
- };
360
+ // 查不到主会话 = 还没跟这个人聊过,按首次联系处理;查询异常一律按"已存在"放行,
361
+ // 判定权仍归下游。
362
+ deps.mainSessionExists = peer => {
363
+ try {
364
+ return !!threadModule.ThreadService.findMainSessionEntry(runtime.selfAid, peer.id);
365
+ } catch {
366
+ return true;
367
+ }
368
+ };
369
+ }
270
370
  }
271
371
 
272
372
  const outcome = routing.resolveSendRoute(
@@ -286,7 +386,7 @@ async function main() {
286
386
  selfAid: runtime.selfAid,
287
387
  channelType: runtime.channel,
288
388
  chatType: runtime.chatType === 'group' ? 'group' : 'private',
289
- peerId: runtime.peerId ?? runtime.channelId,
389
+ peerId: currentPeerIdOf(runtime),
290
390
  threadId: routing.isThreadTopicId(runtime.threadId) ? runtime.threadId : undefined,
291
391
  },
292
392
  deps,
@@ -294,26 +394,6 @@ async function main() {
294
394
 
295
395
  if (!outcome.ok) fail(outcome.message, outcome.code, outcome.hint ? { hint: outcome.hint } : {});
296
396
 
297
- // `--to` 推导到主话题时,投递要求本端已有与目标的主会话。这里先查一次,
298
- // 免得把"还没跟这个人聊过"报成一句从 daemon 冒出来的 TOPIC_NOT_FOUND。
299
- // 查询异常一律放行,判定权仍归 daemon。
300
- if (runtime.channel === 'aun' && !routeOpts.thread
301
- && outcome.source?.peer === 'to' && outcome.peer.peerKind === 'private') {
302
- const threadModule = await loadDist('core/thread/thread-service.js');
303
- let exists = true;
304
- if (threadModule) {
305
- try {
306
- exists = !!threadModule.ThreadService.findMainSessionEntry(runtime.selfAid, outcome.peer.id);
307
- } catch {
308
- exists = true;
309
- }
310
- }
311
- if (!exists) {
312
- fail(`与 ${outcome.peer.id} 还没有主会话记录,无法以主话题发送`, 'TOPIC_NOT_FOUND',
313
- { hint: '先给对方发一条消息建立会话,或用 --thread 指定已有话题' });
314
- }
315
- }
316
-
317
397
  // ── 分派 ──
318
398
  const dispatch = gateway.decideDispatch(outcome, text, passthrough, runtime.channel);
319
399
  if (dispatch.kind === 'reject') {
@@ -387,6 +467,7 @@ function renderReceipt(route, result, routing, gateway) {
387
467
  thread: route.threadId,
388
468
  chatType: route.peer.peerKind,
389
469
  crossTopic: route.crossTopic,
470
+ firstContact: route.firstContact,
390
471
  checkEveryMs: route.checkEveryMs,
391
472
  checkEveryDefaulted: route.checkEveryDefaulted,
392
473
  checkEveryIgnored: route.checkEveryIgnored,
@@ -413,12 +494,14 @@ function renderReceipt(route, result, routing, gateway) {
413
494
  `✓ 已发送 ${routeLine} message_id=${result.message_id ?? '-'} seq=${seq} status=${result.status ?? '-'}\n`,
414
495
  );
415
496
 
416
- if (route.crossTopic) {
497
+ if (route.firstContact) {
498
+ process.stdout.write('· 首次联系:目标会话随本条建立,本次不建复查\n');
499
+ } else if (route.crossTopic) {
417
500
  const duration = gateway.formatDuration(route.checkEveryMs);
418
501
  const label = route.checkEveryDefaulted ? `默认 ${duration}` : duration;
419
502
  process.stdout.write(`✓ 已建复查(${label}) trigger_id=${result.trigger_id ?? '(未返回)'}\n`);
420
503
  }
421
- if (route.checkEveryIgnored) process.stdout.write('· 同话题,未创建复查\n');
504
+ if (route.checkEveryIgnored && !route.firstContact) process.stdout.write('· 同话题,未创建复查\n');
422
505
  if (result.trigger_error) {
423
506
  process.stderr.write(`⚠ 复查 Trigger 未创建: ${result.trigger_error}\n`);
424
507
  }
@@ -1,7 +1,7 @@
1
1
  import { normalizeBaseagent } from './baseagent.js';
2
- import { commandExists } from '../utils/cross-platform.js';
3
- import { getCodexAppServerAvailability } from './codex-runner.js';
4
- import { probeBundledClaudeVersion, resolveBundledClaudeExecutable } from './claude-runner.js';
2
+ import { commandExists, commandExistsAsync } from '../utils/cross-platform.js';
3
+ import { getCodexAppServerAvailability, getCodexAppServerAvailabilityAsync } from './codex-runner.js';
4
+ import { probeBundledClaudeVersion, probeBundledClaudeVersionAsync, resolveBundledClaudeExecutable } from './claude-runner.js';
5
5
  /**
6
6
  * Claude 的检测判据就是执行判据:会话只会在 Windows 上跑内置的、与 SDK 锁定版本
7
7
  * 配套的 claude.exe。PATH 里的全局 claude 执行层从不使用,因此不能作为可用判据——
@@ -35,6 +35,21 @@ export function detectBaseagentDetails(codexAvailability = getCodexAppServerAvai
35
35
  const claude = claudeExecutable();
36
36
  const claudeVersion = claude ? probeBundledClaudeVersion() : undefined;
37
37
  const gemini = commandExists('gemini');
38
+ return baseagentDetails(codexAvailability, claude, claudeVersion, gemini);
39
+ }
40
+ export async function detectBaseagentDetailsAsync() {
41
+ const [codex, claude, gemini] = await Promise.all([
42
+ getCodexAppServerAvailabilityAsync(),
43
+ (process.platform === 'win32'
44
+ ? Promise.resolve(resolveBundledClaudeExecutable())
45
+ : commandExistsAsync('claude').then(found => found ? 'claude' : undefined))
46
+ .then(async (executable) => ({ executable,
47
+ version: executable ? await probeBundledClaudeVersionAsync() : undefined })),
48
+ commandExistsAsync('gemini'),
49
+ ]);
50
+ return baseagentDetails(codex, claude.executable, claude.version, gemini);
51
+ }
52
+ function baseagentDetails(codexAvailability, claude, claudeVersion, gemini) {
38
53
  return [
39
54
  {
40
55
  id: 'claude',
@@ -132,6 +147,6 @@ export async function getBaseagentSnapshot(options = {}) {
132
147
  }
133
148
  const detections = options.probe === false
134
149
  ? null
135
- : detectBaseagentDetails();
150
+ : await detectBaseagentDetailsAsync();
136
151
  return buildBaseagentSnapshot(config ?? {}, detections, options.loaded);
137
152
  }
@@ -543,8 +543,8 @@ export function resolveOpenaiConfig(config, override, runtime) {
543
543
  authType: 'apiKey',
544
544
  authSource: 'agent-config',
545
545
  baseUrl: provider.baseUrl,
546
- provider: providerId,
547
- providerId,
546
+ provider: provider.providerId,
547
+ providerId: provider.providerId,
548
548
  headers: provider.headers,
549
549
  queryParams: provider.queryParams,
550
550
  model: override?.model || config.agents?.codex?.model || codexSettings.model
@@ -1,6 +1,6 @@
1
1
  import { getRunnerCatalog, peekRunnerCatalog, catalogEfforts, resolveCatalogModel, assertCatalogSelectable } from '../core/model/model-catalog.js';
2
2
  import { query, forkSession as sdkForkSession, getSessionMessages as sdkGetSessionMessages, resolveSettings as sdkResolveSettings, } from '@anthropic-ai/claude-agent-sdk';
3
- import { spawn, execFileSync } from 'child_process';
3
+ import { spawn } from 'child_process';
4
4
  import { createRequire } from 'module';
5
5
  import { ensureDir } from '../utils/atomic-write.js';
6
6
  import { resolveAnthropicConfig } from './baseagent.js';
@@ -22,7 +22,7 @@ import { checkBashDescription, checkDangerousCommand, checkReadonly, evaluateToo
22
22
  import { sanitizeShellExecutionEnvironment } from '../core/permission/shell-environment.js';
23
23
  import { summarizeToolInput, summarizeToolInputForAudit } from '../utils/tool-summary.js';
24
24
  import { renderToolTime } from './tool-time-context.js';
25
- import { encodePath } from '../utils/cross-platform.js';
25
+ import { encodePath, probeCli, probeCliSync } from '../utils/cross-platform.js';
26
26
  import { getPackageRoot, resolvePaths } from '../paths.js';
27
27
  import { resolveEffective } from '../config/config-manager.js';
28
28
  import { sanitizeSessionTitle } from '../core/session/session-title.js';
@@ -165,8 +165,23 @@ export function probeBundledClaudeVersion() {
165
165
  if (!executable)
166
166
  return undefined;
167
167
  try {
168
- const raw = execFileSync(executable, ['--version'], {
169
- encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], windowsHide: true, timeout: 3000,
168
+ const raw = probeCliSync('bundled-claude', ['--version'], {
169
+ executable, validateOutput: output => /^\d+\.\d+\.\d+\b/.test(output.trim()),
170
+ });
171
+ return raw.trim().split(/\s+/)[0] || undefined;
172
+ }
173
+ catch {
174
+ return undefined;
175
+ }
176
+ }
177
+ /** Shares the installation-aware probe cache and in-flight request with other readers. */
178
+ export async function probeBundledClaudeVersionAsync() {
179
+ const executable = resolveBundledClaudeExecutable();
180
+ if (!executable)
181
+ return undefined;
182
+ try {
183
+ const raw = await probeCli('bundled-claude', ['--version'], {
184
+ executable, validateOutput: output => /^\d+\.\d+\.\d+\b/.test(output.trim()),
170
185
  });
171
186
  return raw.trim().split(/\s+/)[0] || undefined;
172
187
  }
@@ -92,6 +92,7 @@ export class CodexAppServerClient {
92
92
  return this.request('thread/start', {
93
93
  cwd: projectPath,
94
94
  model: options?.model ?? this.options.model ?? null,
95
+ ...(this.runtimeModelProvider() ? { modelProvider: this.runtimeModelProvider() } : {}),
95
96
  approvalPolicy: options?.approvalPolicy ?? null,
96
97
  approvalsReviewer: options?.approvalsReviewer ?? this.options.approvalsReviewer ?? null,
97
98
  ...(configUsesPermissionProfile
@@ -116,6 +117,7 @@ export class CodexAppServerClient {
116
117
  threadId,
117
118
  cwd: projectPath,
118
119
  model: options?.model ?? this.options.model ?? null,
120
+ ...(this.runtimeModelProvider() ? { modelProvider: this.runtimeModelProvider() } : {}),
119
121
  approvalPolicy: options?.approvalPolicy ?? null,
120
122
  approvalsReviewer: options?.approvalsReviewer ?? this.options.approvalsReviewer ?? null,
121
123
  ...(configUsesPermissionProfile
@@ -239,6 +241,7 @@ export class CodexAppServerClient {
239
241
  threadId,
240
242
  cwd: projectPath,
241
243
  model: options?.model ?? this.options.model ?? null,
244
+ ...(this.runtimeModelProvider() ? { modelProvider: this.runtimeModelProvider() } : {}),
242
245
  approvalPolicy: options?.approvalPolicy ?? null,
243
246
  approvalsReviewer: options?.approvalsReviewer ?? this.options.approvalsReviewer ?? null,
244
247
  ...(options?.permissions && !configUsesPermissionProfile
@@ -260,6 +263,9 @@ export class CodexAppServerClient {
260
263
  }
261
264
  buildThreadConfig(effort, config) {
262
265
  const merged = { ...(config ?? {}) };
266
+ const provider = this.runtimeModelProvider();
267
+ if (provider)
268
+ merged.model_provider = provider;
263
269
  if (effort)
264
270
  merged.model_reasoning_effort = effort;
265
271
  return Object.keys(merged).length > 0 ? merged : null;
@@ -756,6 +762,13 @@ export class CodexAppServerClient {
756
762
  + 'Restart EvolCore to install missing hooks and reload the Codex policy.');
757
763
  }
758
764
  }
765
+ runtimeModelProvider() {
766
+ if (!this.options.baseUrl && !this.options.provider
767
+ && !Object.keys(this.options.headers ?? {}).length && !Object.keys(this.options.queryParams ?? {}).length)
768
+ return undefined;
769
+ const provider = this.options.provider?.trim();
770
+ return provider && !BUILT_IN_CODEX_PROVIDER_IDS.has(provider.toLowerCase()) ? provider : runtimeProviderId(this.options.baseUrl);
771
+ }
759
772
  buildProcessArgs() {
760
773
  const args = ['app-server', '--listen', 'stdio://'];
761
774
  // 记忆只走 EvolCore(ec memory):显式关闭 Codex 原生 memories,
@@ -773,9 +786,7 @@ export class CodexAppServerClient {
773
786
  if (hasHeaders || hasQueryParams || this.options.baseUrl || this.options.provider) {
774
787
  const configuredProvider = this.options.provider?.trim();
775
788
  const useRuntimeProvider = !configuredProvider || BUILT_IN_CODEX_PROVIDER_IDS.has(configuredProvider.toLowerCase());
776
- const providerName = !useRuntimeProvider
777
- ? configuredProvider
778
- : runtimeProviderId(this.options.baseUrl);
789
+ const providerName = this.runtimeModelProvider();
779
790
  const provider = tomlProviderKey(providerName);
780
791
  args.push('--config', `model_provider=${JSON.stringify(providerName)}`);
781
792
  args.push('--config', `model_providers.${provider}.name=${JSON.stringify('EvolCore runtime gateway')}`);
@@ -32,7 +32,7 @@ import { ensureSessionRuntimeDir, getManagedTaskTempDir } from '../cli/task-cont
32
32
  import { buildTranscriptTurns } from '../core/session/session-transcript.js';
33
33
  import { CodexSessionFileAdapter } from '../core/session/adapters/codex-session-file-adapter.js';
34
34
  import { execFileSync } from 'child_process';
35
- import { probeCli, probeCliSync } from '../utils/cross-platform.js';
35
+ import { probeCli, probeCliSync, CODEX_CLI_PROBE_TIMEOUT_MS, CODEX_CLI_PROBE_RETRY_TIMEOUT_MS } from '../utils/cross-platform.js';
36
36
  import { createHash, randomBytes } from 'crypto';
37
37
  import { buildModelRequestHeaders } from './request-identity.js';
38
38
  import { extractStructuredToolErrorMarker, normalizeToolErrorClassification, normalizeToolErrorCode, normalizeToolErrorDetailCode, } from '../core/permission/tool-error-code.js';
@@ -303,9 +303,6 @@ export function parseCodexCliVersion(output) {
303
303
  export function isCodexCliVersionSupported(version) {
304
304
  return compareVersions(version, MIN_CODEX_CLI_VERSION) >= 0;
305
305
  }
306
- // Windows shim/process startup can exceed the quick probe deadline under load.
307
- const CODEX_CLI_PROBE_TIMEOUT_MS = 3000;
308
- const CODEX_CLI_PROBE_RETRY_TIMEOUT_MS = 15_000;
309
306
  function compactCodexProbeText(value, maxLength = 600) {
310
307
  if (Buffer.isBuffer(value))
311
308
  value = value.toString('utf-8');
@@ -3346,7 +3343,10 @@ export class CodexRunner {
3346
3343
  const mode = normalizePermissionMode(context?.permissionMode).mode;
3347
3344
  const executionSandbox = this.buildExecutionSandboxOptions(sessionKey, mode, projectPath, undefined, undefined, context ?? {});
3348
3345
  const capabilityConfig = await this.resolveCapabilityThreadConfig(projectPath);
3349
- const appServer = this.getAppServerClient();
3346
+ // Fork against the connection that owns the source thread. Codex keeps
3347
+ // normal and full-access threads on separate app-server clients; using the
3348
+ // default client here makes full-access forks time out or lose the thread.
3349
+ const appServer = this.getAppServerClientForThread(agentSessionId);
3350
3350
  const externalToolConfig = await this.resolveExternalToolApprovalConfig(appServer, projectPath, capabilityConfig, mode);
3351
3351
  if (sessionKey)
3352
3352
  await this.assertProactiveHookAvailability(sessionKey, appServer);
@@ -3375,7 +3375,7 @@ export class CodexRunner {
3375
3375
  async forkSessionAt(agentSessionId, projectPath, assistantMessageId, title, context) {
3376
3376
  const release = await this.acquireThreadOperation(this.threadOperationKey(agentSessionId), 'forkAt');
3377
3377
  try {
3378
- const appServer = this.getAppServerClient();
3378
+ const appServer = this.getAppServerClientForThread(agentSessionId);
3379
3379
  const history = await this.readForkHistory(appServer, agentSessionId);
3380
3380
  const messages = this.mapThreadToSessionMessages(history, agentSessionId);
3381
3381
  const turns = buildTranscriptTurns(messages);
@@ -285,9 +285,10 @@ export class GroupInviteReviewService {
285
285
  this.router = router;
286
286
  this.store = store;
287
287
  this.timer = setInterval(() => {
288
- for (const runtime of this.bindings.values())
289
- if (runtime.nextSync <= Date.now())
288
+ for (const runtime of this.bindings.values()) {
289
+ if (runtime.channel.isConnected() && runtime.nextSync <= Date.now())
290
290
  this.wake(runtime);
291
+ }
291
292
  }, RECONCILE_TICK_MS);
292
293
  this.timer.unref?.();
293
294
  }
@@ -21,7 +21,7 @@ import { ServiceProxyClient, EndpointPolicy } from '@agentunion/fastaun';
21
21
  import { resolvePaths } from '../paths.js';
22
22
  import { logger } from '../utils/logger.js';
23
23
  import { parseEcwebInstanceRecord } from '../contracts/ecweb-instance.js';
24
- import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
24
+ import { getProcessStartTimeAsync, startTimeMatches } from '../utils/process-introspect.js';
25
25
  const LOG = '[ServiceProxy]';
26
26
  const INSTANCE_DISCOVERY_TIMEOUT_MS = 10_000;
27
27
  const INSTANCE_DISCOVERY_INTERVAL_MS = 250;
@@ -33,7 +33,7 @@ function sleep(ms) {
33
33
  * 读 data/instance/ 下指定服务的存活实例端口。
34
34
  * 取 startedAt 最新的一条(多实例保护下通常只有一条存活)。
35
35
  */
36
- function discoverInstancePort(serviceName, expectedPort) {
36
+ async function discoverInstancePort(serviceName, expectedPort) {
37
37
  const dir = resolvePaths().instanceDir;
38
38
  let files;
39
39
  try {
@@ -64,14 +64,15 @@ function discoverInstancePort(serviceName, expectedPort) {
64
64
  && Number.isFinite(rec.startedAt)
65
65
  && (raw.owner !== 'evolcore-service-supervisor'
66
66
  || ((raw.state === undefined || raw.state === 'ready')
67
- && startTimeMatches(rec.startedAt, getProcessStartTime(rec.pid))))
68
- && (serviceName !== 'ecweb' || !('schemaVersion' in rec) || startTimeMatches(rec.startedAt, getProcessStartTime(rec.pid)))
67
+ && startTimeMatches(rec.startedAt, await getProcessStartTimeAsync(rec.pid))))
68
+ && (serviceName !== 'ecweb' || !('schemaVersion' in rec) || startTimeMatches(rec.startedAt, await getProcessStartTimeAsync(rec.pid)))
69
69
  && rec.startedAt >= 0
70
70
  && Number.isInteger(rec.port)
71
71
  && rec.port >= 1
72
72
  && rec.port <= 65535
73
73
  && (expectedPort === undefined || rec.port === expectedPort)) {
74
- records.push({ pid: rec.pid, port: rec.port, startedAt: rec.startedAt });
74
+ if (isProcessAlive(rec.pid))
75
+ records.push({ pid: rec.pid, port: rec.port, startedAt: rec.startedAt });
75
76
  }
76
77
  }
77
78
  catch {
@@ -97,7 +98,7 @@ async function waitForInstancePort(serviceName, expectedPort) {
97
98
  const deadline = Date.now() + INSTANCE_DISCOVERY_TIMEOUT_MS;
98
99
  let loggedWait = false;
99
100
  while (Date.now() <= deadline) {
100
- const port = discoverInstancePort(serviceName, expectedPort);
101
+ const port = await discoverInstancePort(serviceName, expectedPort);
101
102
  if (port)
102
103
  return port;
103
104
  if (!loggedWait) {
@@ -130,6 +131,14 @@ async function resolveEndpoint(svc) {
130
131
  logger.warn(`${LOG} 服务 "${svc.name}" 未配置有效 proxy.source,跳过`);
131
132
  return null;
132
133
  }
134
+ /** Current endpoint only; watching instance files must not start discovery waits. */
135
+ export async function readServiceProxyEndpoint(svc) {
136
+ if (svc.proxy?.source === 'instance') {
137
+ const port = await discoverInstancePort(svc.name, svc.port);
138
+ return port ? `http://127.0.0.1:${port}` : null;
139
+ }
140
+ return svc.proxy?.source === 'static' ? svc.proxy.endpoint?.trim() || null : null;
141
+ }
133
142
  /** Probe the local service root without exposing the local endpoint to callers. */
134
143
  export async function probeServiceRoot(service) {
135
144
  const endpoint = await resolveEndpoint(service);
@@ -168,6 +177,7 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
168
177
  let stopped = false;
169
178
  let proxyClient = null;
170
179
  const startupAbort = new AbortController();
180
+ const endpoints = {};
171
181
  const run = async () => {
172
182
  try {
173
183
  // 控制 AID 与本地服务并行启动;等待认证连接完成,避免把正常启动阶段当作隧道故障。
@@ -240,6 +250,7 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
240
250
  metadata: svc.proxy?.metadata ?? {},
241
251
  });
242
252
  registered += 1;
253
+ endpoints[svc.name] = endpoint;
243
254
  logger.info(`${LOG} 注册服务 "${svc.name}" → ${endpoint} (type=${svc.proxy?.serviceType ?? 'http'}, visibility=${svc.proxy?.visibility ?? 'private'})`);
244
255
  }
245
256
  catch (e) {
@@ -286,6 +297,7 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
286
297
  void ready.catch(() => { });
287
298
  return {
288
299
  ready,
300
+ endpoints,
289
301
  unregister: async (serviceNames) => {
290
302
  if (!proxyClient || serviceNames.length === 0)
291
303
  return;