evolcore 0.0.43-test.6 → 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.
- package/CHANGELOG.md +48 -0
- package/bin/ecmsg.js +171 -54
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/codex/app-server-client.js +22 -0
- package/dist/agents/codex-runner.js +69 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/channels/aun.js +234 -21
- package/dist/cli/agent-create.js +2 -2
- package/dist/cli/daemon-commands.js +6 -66
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +35 -2
- package/dist/cli/events-command.js +73 -0
- package/dist/cli/index.js +31 -14
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/restart-monitor.js +45 -47
- package/dist/cli/services-command.js +111 -0
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +6 -2
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +0 -7
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/schema-migration.js +6 -1
- package/dist/config-store.js +2 -1
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +104 -10
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-catalog.js +20 -0
- package/dist/core/baseagent-loader.js +60 -130
- package/dist/core/channel-loader.js +10 -1
- package/dist/core/channel-runtime.js +4 -3
- package/dist/core/command/agent-control.js +1 -1
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +53 -11
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +338 -0
- package/dist/core/command/menu-catalog.js +8 -0
- package/dist/core/command/menu-handler.js +198 -84
- package/dist/core/command/menu-protocol.js +60 -11
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +8 -5
- package/dist/core/daemon-lifecycle.js +132 -73
- package/dist/core/handoff/runtime.js +3 -3
- package/dist/core/invoke/executors/index.js +13 -0
- package/dist/core/invoke/executors/media.js +283 -0
- package/dist/core/invoke/executors/text.js +198 -0
- package/dist/core/invoke/invoke-service.js +157 -0
- package/dist/core/invoke/style-router.js +48 -0
- package/dist/core/invoke/types.js +19 -0
- package/dist/core/ipc-registration.js +46 -7
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +147 -17
- package/dist/core/message/im-renderer.js +28 -84
- package/dist/core/message/message-bridge.js +4 -0
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/response-engine.js +157 -54
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +43 -5
- package/dist/core/ownership/owner-resolver.js +7 -0
- package/dist/core/permission/ec-command-parser.js +3 -2
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +2 -3
- package/dist/core/task/task-recovery-service.js +13 -2
- package/dist/core/thread/command-parser.js +9 -2
- package/dist/core/thread/thread-operation.js +21 -2
- package/dist/core/thread/thread-route.js +13 -2
- package/dist/directory/owner-directory-admission.js +40 -53
- package/dist/directory/owner-directory-cache.js +89 -113
- package/dist/directory/owner-directory-query-operation.js +8 -10
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +6 -2
- package/dist/ecweb/runtime/supervisor.js +19 -4
- package/dist/event-center/admission-materializer.js +114 -0
- package/dist/event-center/bus-gate.js +136 -0
- package/dist/event-center/bus-host.js +290 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +100 -0
- package/dist/event-center/client-factory.js +50 -0
- package/dist/event-center/daemon.js +45 -0
- package/dist/event-center/directory-source.js +53 -0
- package/dist/event-center/dispatcher.js +157 -0
- package/dist/event-center/event-log.js +110 -0
- package/dist/event-center/index-generator.js +63 -0
- package/dist/event-center/ipc-operation.js +308 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +202 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +238 -0
- package/dist/event-center/runtime.js +641 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +35 -0
- package/dist/event-center/validation.js +413 -0
- package/dist/index.js +285 -99
- package/dist/ipc.js +66 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +5 -1
- package/dist/proxy/service-supervisor.js +13 -4
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/modes/single-session/index.js +1 -1
- package/dist/services/dispatcher.js +100 -0
- package/dist/services/idempotency.js +90 -0
- package/dist/services/identity.js +52 -0
- package/dist/services/index-generator.js +70 -0
- package/dist/services/index.js +449 -0
- package/dist/services/ipc-operation.js +458 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +204 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +95 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +18 -0
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/script-sandbox.js +118 -22
- package/dist/utils/cross-platform.js +24 -10
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/process-introspect.js +45 -9
- package/dist/utils/startup-trace.js +74 -37
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +7 -14
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +2 -0
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/event-center.md +207 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +3 -2
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-protocol.md +21 -0
- package/kits/docs/evolcore/msg.md +15 -3
- package/kits/docs/evolcore/provider.md +3 -1
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +277 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/eck_manifest.json +26 -0
- package/kits/rules/02-navigation.md +10 -1
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/personal-assistant/SKILL.md +6 -6
- package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
- package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
- package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
- package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/reply.md +0 -5
- package/kits/templates/system-fragments/thread.md +10 -8
- package/package.json +3 -5
- package/dist/cli/pa-workspace-command.js +0 -225
- package/dist/core/command/pa-workspace-store.js +0 -468
- package/dist/core/relation/pa-team.js +0 -132
- package/kits/docs/evolcore/pa-workspace.md +0 -51
- package/kits/skills/aid-ability/SKILL.md +0 -244
- package/kits/skills/ec-ability/SKILL.md +0 -67
- package/kits/skills/ec-ability/references/workflows.md +0 -15
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,54 @@
|
|
|
5
5
|
|
|
6
6
|
## Unreleased
|
|
7
7
|
|
|
8
|
+
## 0.0.43-test.7 (2026-11-09)
|
|
9
|
+
|
|
10
|
+
### 身份、Owner 与联系人
|
|
11
|
+
|
|
12
|
+
- Agent 常驻设定改用 personal/soul/ 分册,迁移旧 persona.md;显示名跟随签名名片刷新,支持关闭首次欢迎消息。
|
|
13
|
+
- 新增 App 联系人准入与同 Owner 内部联系人默认角色,完善黑名单、临时授权、名录范围和出站联系申请;敏感操作重新核验协议归属。
|
|
14
|
+
- 名录查询统一为 ec directory list/info,准入与查询使用本地快照,废弃本地授权凭据;明确撤权持久化,阻止共享缓存恢复已撤权快照,并允许缺少快照时刷新。
|
|
15
|
+
- 上下文与记忆写入统一使用协议确认的 Owner;普通 Agent 绑定和转让要求目标为验签通过的 human,自动绑定仅限初始化阶段,active Agent 跳过旧配置邀约。
|
|
16
|
+
|
|
17
|
+
### 对话、模型与自动化
|
|
18
|
+
|
|
19
|
+
- 移除 paactive 对话模式,仅保留 interactive/proactive。个人助理与本人 Owner 的 AUN 私聊按已核验身份自动使用可靠 activity 投递;正式回复仍通过 ecmsg 发送,超限 activity 不降级为普通文本。
|
|
20
|
+
- 统一模型容量解析,按当前 Provider 计算压缩阈值,更新模型与价格数据;修正压缩后用量,增加手动压缩进度通知。
|
|
21
|
+
- ecagent 支持只读访问入站附件并校验真实路径;非法工具参数转为可恢复错误,摘要失败不再自动重试。
|
|
22
|
+
- Trigger 跟随 Agent 当前基座,支持静默结果和自定义闲置提示;完善取消与子进程清理,输入已提交但结果不明时避免重复提交。
|
|
23
|
+
|
|
24
|
+
### 消息、服务与事件
|
|
25
|
+
|
|
26
|
+
- 新增 ecmsg 统一发送入口,统一话题路由、复查和加密选项,支持非 AUN 既有会话及话题内投递给本端自己,回执显示实际目标。
|
|
27
|
+
- AUN Menu 使用独立 control 消息流并强制加密响应;异步分批读取话题摘要,完善响应重试、Codex 话题派生和批量查询的逐项结果。
|
|
28
|
+
- 新增 ec services 服务路由,支持 services.* 请求、服务包匹配、准入、限流、幂等、脚本执行和结构化应答;服务结果与普通模型消息分别处理。
|
|
29
|
+
- 新增 ec events 事件中心,支持事件注册、发布、订阅、白名单及事件包脚本处理;事件为 TTL 内在线通知,不提供持久历史或业务应答。
|
|
30
|
+
- 服务包与事件包支持运行时校验、台账、沙箱执行及状态诊断,索引按配置注入上下文。
|
|
31
|
+
- 完善 Fullaccess 委托核验、授权审计及跨 Shell 参数解析,停止观察通道转发 thought.put 返回结果,过滤空消息占位输出。
|
|
32
|
+
|
|
33
|
+
### 能力插件与团队工作区
|
|
34
|
+
|
|
35
|
+
- 新增按 Agent 或主机 AID 管理的能力插件平台,支持开发、构建、安装、授权、发布、升级及回滚;能力发现和管理技能合并为 ability。
|
|
36
|
+
- 完善多运行时、设备路由、请求关联、契约校验和重放保护,资源代理支持批量存储与工作区读取。
|
|
37
|
+
- 新增 ec team 团队工作区及成员、导航管理,使用稳定入口 ID 增量更新;支持 Owner 私聊 Menu 管理和并发版本校验。
|
|
38
|
+
- 每个 Agent 使用独立产物目录,迁移旧工作区文件与导航引用;保留路径、符号链接和既有目标的冲突保护,任务图片保存为不可变资源。
|
|
39
|
+
|
|
40
|
+
### Provider、启动与运行管理
|
|
41
|
+
|
|
42
|
+
- Provider 使用域名稳定 ID,支持本机配置导入、引用迁移、接口风格保存和冲突诊断;冲突时保留原配置,环境变量地址需声明有效域名。
|
|
43
|
+
- 修复 Codex 切换 Provider 后原会话续接:备份并同步线程元数据和索引,保留原线程及历史;冲突或无法释放旧运行时时停止恢复。
|
|
44
|
+
- Runner 按需加载,启动仅预载恢复任务需要的主用后端;合并首次并发加载,协调配置重载、中断与停机,状态查询不触发加载。
|
|
45
|
+
- 启动按 Agent 完成恢复分类后逐步放行渠道,前台连接优先;构建身份诊断和 CLI 版本探测后台执行,区分控制面、任务就绪及后台审计。
|
|
46
|
+
- 完善受管服务与 EC Web 的实例身份、健康检查、恢复计数和优雅退出;服务清理继承的任务授权环境,状态区分进程存活与端点健康。
|
|
47
|
+
- 完善异步进程探测、重启监控、并行停机和 Windows 安装、自启动诊断;统一上下线通知开关,下线通知完成准入后再释放 Owner 共识。
|
|
48
|
+
- 移除 EC Web 内置 PA 看板导航入口,看板服务需单独部署。
|
|
49
|
+
|
|
50
|
+
### 依赖与兼容性
|
|
51
|
+
|
|
52
|
+
- Node.js 要求 >=22.16.0,AUN SDK 最低兼容版本为 0.5.33,配套 ec-web@0.0.43-test.7。
|
|
53
|
+
- Agent Schema 升至 v20,Relation、Role Schema 为 v12、v2;内部联系人默认角色使用 internalContact,旧 paactive 配置需改为 interactive 或 proactive。
|
|
54
|
+
- Invoke 保留为未完成功能,本次按要求不执行相关测试,不作为可用功能验收。
|
|
55
|
+
|
|
8
56
|
## 0.0.43-test.6 (2026-11-08)
|
|
9
57
|
|
|
10
58
|
### 身份、Owner 与联系人
|
package/bin/ecmsg.js
CHANGED
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
* 参数解析与下游 argv 构造在 `dist/cli/ecmsg-gateway.js`(纯函数,可单测)。
|
|
26
26
|
*/
|
|
27
27
|
import net from 'node:net';
|
|
28
|
+
import fs from 'node:fs';
|
|
28
29
|
import path from 'node:path';
|
|
29
30
|
import crypto from 'node:crypto';
|
|
30
31
|
import { fileURLToPath, pathToFileURL } from 'node:url';
|
|
@@ -47,7 +48,8 @@ const HELP = `用法: ecmsg send '<正文>' [选项]
|
|
|
47
48
|
(省略) 回复当前会话的对端/群
|
|
48
49
|
--thread <话题id> 发到指定话题;只接受 thread-… 或 main:<aidA>:<aidB>
|
|
49
50
|
--to <对端ID> 发到指定对端(群 AID 或对方 AID,按本地关系判定类型)
|
|
50
|
-
--from <本端AID>
|
|
51
|
+
--from <本端AID> 托管会话可省略(恒等于会话本端);非托管必填
|
|
52
|
+
--to <本端AID> 话题内投给自己(self-address):本机直接入队处理
|
|
51
53
|
|
|
52
54
|
复查:
|
|
53
55
|
跨话题(对端或话题与会话不同)自动创建复查 Trigger,默认 20m;
|
|
@@ -185,21 +187,23 @@ async function loadDist(relative) {
|
|
|
185
187
|
* 第 3 条同时覆盖"首次联系一个人":这时关系记录还不存在,按私聊发出,
|
|
186
188
|
* 会话随首条消息建立。
|
|
187
189
|
*/
|
|
188
|
-
async function resolveTargetPeerKind(runtime, targetId) {
|
|
189
|
-
|
|
190
|
-
|
|
190
|
+
async function resolveTargetPeerKind(runtime, targetId, selfAidOverride) {
|
|
191
|
+
// 非托管没有会话上下文:渠道恒为 aun,当前对端未知,只按关系证据判类型。
|
|
192
|
+
const currentKind = !runtime ? 'private' : (runtime.chatType === 'group' ? 'group' : 'private');
|
|
193
|
+
const selfAid = selfAidOverride ?? runtime?.selfAid;
|
|
194
|
+
if (runtime && runtime.channel !== 'aun') return currentKind;
|
|
191
195
|
|
|
192
196
|
const normalize = value => String(value ?? '').trim().replace(/^@/, '').toLowerCase();
|
|
193
|
-
const currentPeerId = currentPeerIdOf(runtime);
|
|
194
|
-
if (normalize(targetId) === normalize(currentPeerId)) return currentKind;
|
|
197
|
+
const currentPeerId = runtime ? currentPeerIdOf(runtime) : '';
|
|
198
|
+
if (currentPeerId && normalize(targetId) === normalize(currentPeerId)) return currentKind;
|
|
195
199
|
|
|
196
200
|
const peerIdentity = await loadDist('core/relation/peer-identity.js');
|
|
197
201
|
try {
|
|
198
|
-
const local = peerIdentity?.readAunPeerKind?.(
|
|
202
|
+
const local = peerIdentity?.readAunPeerKind?.(selfAid, targetId)?.kind;
|
|
199
203
|
if (local === 'private' || local === 'group') return local;
|
|
200
204
|
} catch { /* 本地证据不可用不算错误,继续往下判 */ }
|
|
201
205
|
try {
|
|
202
|
-
const remote = await peerIdentity?.resolveAunPeerKind?.(
|
|
206
|
+
const remote = await peerIdentity?.resolveAunPeerKind?.(selfAid, targetId);
|
|
203
207
|
if (remote?.kind === 'private' || remote?.kind === 'group') return remote.kind;
|
|
204
208
|
} catch { /* 网络不可用时不阻塞发送,按私聊兜底 */ }
|
|
205
209
|
return 'private';
|
|
@@ -285,18 +289,32 @@ async function main() {
|
|
|
285
289
|
const sessionId = process.env[ENV_SESSION_ID]?.trim();
|
|
286
290
|
const delegationToken = process.env[ENV_DELEGATION_TOKEN]?.trim()
|
|
287
291
|
|| process.env[ENV_CODEX_SESSION_TOKEN]?.trim();
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
292
|
+
// 非托管(宿主终端):没有会话运行时,本端由 `--from` 显式给出,话题由 `--thread` 给出,
|
|
293
|
+
// 对端与 chatType 从话题索引反查。这条路径走本机 controlToken,不走委托链。
|
|
294
|
+
const nonManaged = !sessionId;
|
|
295
|
+
if (nonManaged && !delegationToken) {
|
|
296
|
+
if (!routeOpts.from || !String(routeOpts.from).trim()) {
|
|
297
|
+
fail('非托管使用需要 --from <本端AID> 指定发送方', 'FROM_REQUIRED',
|
|
298
|
+
{ hint: 'ecmsg send \'<正文>\' --from <本端AID> --thread <话题id> --to <对端或本端AID>' });
|
|
299
|
+
}
|
|
300
|
+
if (!routeOpts.thread || !String(routeOpts.thread).trim()) {
|
|
301
|
+
fail('非托管使用需要 --thread <话题id> 定位会话', 'THREAD_REQUIRED',
|
|
302
|
+
{ hint: "ec msg send '<正文>' --self <本端AID> --thread <话题id> 也可以" });
|
|
303
|
+
}
|
|
304
|
+
if (passthrough.length > 0) {
|
|
305
|
+
fail(`非托管发送目前只支持纯文本,不支持的选项:${passthrough.join(' ')}`, 'UNSUPPORTED_OPTION');
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
if (sessionId && !delegationToken) {
|
|
309
|
+
fail('ecmsg 需要会话委托凭证(缺少 EVOLCORE_DELEGATION_TOKEN)。', 'DELEGATION_REQUIRED');
|
|
291
310
|
}
|
|
292
|
-
if (!delegationToken) fail('ecmsg 需要会话委托凭证(缺少 EVOLCORE_DELEGATION_TOKEN)。', 'DELEGATION_REQUIRED');
|
|
293
311
|
|
|
294
312
|
const runtime = (() => {
|
|
295
313
|
const raw = process.env[ENV_TASK_RUNTIME_CONTEXT];
|
|
296
314
|
if (!raw) return undefined;
|
|
297
315
|
try { return JSON.parse(raw); } catch { return undefined; }
|
|
298
316
|
})();
|
|
299
|
-
if (!runtime?.selfAid || !runtime?.channel || !runtime?.chatType) {
|
|
317
|
+
if (!nonManaged && (!runtime?.selfAid || !runtime?.channel || !runtime?.chatType)) {
|
|
300
318
|
fail('运行时上下文不完整(缺少 selfAid/channel/chatType),无法确定本端与对端',
|
|
301
319
|
'CONTEXT_INCOMPLETE');
|
|
302
320
|
}
|
|
@@ -310,12 +328,29 @@ async function main() {
|
|
|
310
328
|
// 其余情况零 IO。
|
|
311
329
|
const deps = {};
|
|
312
330
|
|
|
331
|
+
// 本端 AID:托管取运行时,非托管取 `--from`。
|
|
332
|
+
const selfAid = nonManaged ? String(routeOpts.from).trim().replace(/^@/, '') : runtime.selfAid;
|
|
333
|
+
|
|
334
|
+
// 群 AID 归一:`g-18127` 这类裸 base 必须在判定目标之前展开成完整 AID,
|
|
335
|
+
// 否则既判不出它是群,也拼不出主话题。展开逻辑见 `ecmsg-gateway.ts` 的
|
|
336
|
+
// `expandGroupBase`(纯函数,有单测)。
|
|
337
|
+
let groupIdentity;
|
|
338
|
+
const resolveGroupId = async id => {
|
|
339
|
+
groupIdentity ??= await loadDist('aun/group/identity.js');
|
|
340
|
+
return gateway.expandGroupBase(selfAid, id, groupIdentity?.normalizeGroupAid);
|
|
341
|
+
};
|
|
342
|
+
|
|
313
343
|
// --to 的目标类型:下游按它选 msg send / group send,必须解析而不是沿用
|
|
314
344
|
// 当前会话的类型——否则"在私聊会话里给群发"会走成私聊,"在群会话里给个人发"
|
|
315
345
|
// 会走成群消息。
|
|
346
|
+
//
|
|
347
|
+
// 群 AID 的 base 简写(`g-18127`)必须先展开成完整 AID,再做类型判定与路由:
|
|
348
|
+
// 否则它既不像群也拼不出主话题,`--to g-18127` 会直接 TOPIC_REQUIRED。
|
|
316
349
|
if (routeOpts.to !== undefined && String(routeOpts.to).trim()) {
|
|
317
|
-
|
|
318
|
-
|
|
350
|
+
// 归一后写回 routeOpts:下游 argv 与回执都必须用展开后的完整 AID。
|
|
351
|
+
routeOpts.to = await resolveGroupId(String(routeOpts.to).trim());
|
|
352
|
+
const peerKind = await resolveTargetPeerKind(runtime, routeOpts.to, selfAid);
|
|
353
|
+
deps.resolveTarget = id => ({ channelType: runtime?.channel ?? 'aun', peerKind, id });
|
|
319
354
|
}
|
|
320
355
|
// `--thread main:<a>:<b>` 的对端类型:主话题 id 里只有两个 AID,群的主话题同样写成
|
|
321
356
|
// main:<self>:<群AID>。类型按关系证据解析(与 --to 同一套),再同步注入给纯函数;
|
|
@@ -324,15 +359,17 @@ async function main() {
|
|
|
324
359
|
const topicIds = await loadDist('core/thread/topic-id.js');
|
|
325
360
|
const threadValue = routeOpts.thread.trim();
|
|
326
361
|
const mainPeer = topicIds?.isMainTopicId?.(threadValue)
|
|
327
|
-
? topicIds.mainTopicPeer(threadValue,
|
|
362
|
+
? topicIds.mainTopicPeer(threadValue, selfAid)
|
|
328
363
|
: undefined;
|
|
329
364
|
if (mainPeer) {
|
|
330
|
-
const mainPeerKind = await resolveTargetPeerKind(runtime, mainPeer);
|
|
365
|
+
const mainPeerKind = await resolveTargetPeerKind(runtime, mainPeer, selfAid);
|
|
331
366
|
deps.resolvePeerKind = () => mainPeerKind;
|
|
332
367
|
}
|
|
333
368
|
}
|
|
334
369
|
const needsThreadModule = gateway.needsThreadIndexLookup(routeOpts.thread)
|
|
335
370
|
|| routeOpts.to !== undefined;
|
|
371
|
+
// 话题条目:非托管下它就是「当前会话」的全部来源(对端 / chatType / channelType)。
|
|
372
|
+
let threadEntry;
|
|
336
373
|
if (needsThreadModule) {
|
|
337
374
|
const threadModule = await loadDist('core/thread/thread-service.js');
|
|
338
375
|
if (!threadModule && gateway.needsThreadIndexLookup(routeOpts.thread)) {
|
|
@@ -341,15 +378,16 @@ async function main() {
|
|
|
341
378
|
if (threadModule) {
|
|
342
379
|
let entry;
|
|
343
380
|
try {
|
|
344
|
-
entry = threadModule.ThreadService.findThreadById(
|
|
381
|
+
entry = threadModule.ThreadService.findThreadById(selfAid, routeOpts.thread);
|
|
345
382
|
} catch {
|
|
346
383
|
entry = undefined;
|
|
347
384
|
}
|
|
385
|
+
threadEntry = entry;
|
|
348
386
|
deps.resolveThread = threadId => {
|
|
349
387
|
if (!entry || entry.threadId !== threadId) return undefined;
|
|
350
388
|
return {
|
|
351
389
|
threadId: entry.threadId,
|
|
352
|
-
selfAid
|
|
390
|
+
selfAid,
|
|
353
391
|
peer: {
|
|
354
392
|
channelType: entry.channelType ?? 'aun',
|
|
355
393
|
peerKind: entry.peerKind,
|
|
@@ -361,14 +399,55 @@ async function main() {
|
|
|
361
399
|
// 判定权仍归下游。
|
|
362
400
|
deps.mainSessionExists = peer => {
|
|
363
401
|
try {
|
|
364
|
-
return !!threadModule.ThreadService.findMainSessionEntry(
|
|
402
|
+
return !!threadModule.ThreadService.findMainSessionEntry(selfAid, peer.id);
|
|
365
403
|
} catch {
|
|
366
404
|
return true;
|
|
367
405
|
}
|
|
368
406
|
};
|
|
407
|
+
|
|
408
|
+
// 自发(`--to <本端AID>`)的 `--encrypt auto` 跟随话题上一条消息的加密态。
|
|
409
|
+
// 只读该话题所在 chatDir 的 messages.jsonl 末条,读不到/异常一律按明文。
|
|
410
|
+
const sessionFs = await loadDist('core/session/session-fs-store.js');
|
|
411
|
+
const paths = await loadDist('paths.js');
|
|
412
|
+
deps.resolveLastTopicEncrypt = threadId => {
|
|
413
|
+
if (!entry || entry.threadId !== threadId || !sessionFs?.readAllJsonlLines || !paths?.agentDir) {
|
|
414
|
+
return undefined;
|
|
415
|
+
}
|
|
416
|
+
try {
|
|
417
|
+
const agentsRoot = path.dirname(paths.agentDir(selfAid));
|
|
418
|
+
const chatDir = sessionFs.chatDirPath(agentsRoot, entry.channelType ?? 'aun', entry.peer, selfAid);
|
|
419
|
+
const lines = sessionFs.readAllJsonlLines(path.join(chatDir, 'messages.jsonl'));
|
|
420
|
+
for (let index = lines.length - 1; index >= 0; index--) {
|
|
421
|
+
const line = lines[index];
|
|
422
|
+
if (!line || line.threadId !== threadId) continue;
|
|
423
|
+
return line.encrypt === true;
|
|
424
|
+
}
|
|
425
|
+
return undefined;
|
|
426
|
+
} catch {
|
|
427
|
+
return undefined;
|
|
428
|
+
}
|
|
429
|
+
};
|
|
369
430
|
}
|
|
370
431
|
}
|
|
371
432
|
|
|
433
|
+
// 非托管:没有会话上下文,本端来自 --from,对端/类型来自话题索引条目。
|
|
434
|
+
// chatType 按条目判(群话题 = group),peerId 用条目里的对端。
|
|
435
|
+
const sessionContext = nonManaged
|
|
436
|
+
? {
|
|
437
|
+
selfAid,
|
|
438
|
+
channelType: threadEntry?.channelType ?? 'aun',
|
|
439
|
+
chatType: threadEntry?.peerKind === 'group' ? 'group' : 'private',
|
|
440
|
+
peerId: threadEntry?.peer ?? '',
|
|
441
|
+
threadId: routing.isThreadTopicId(routeOpts.thread) ? routeOpts.thread : undefined,
|
|
442
|
+
}
|
|
443
|
+
: {
|
|
444
|
+
selfAid: runtime.selfAid,
|
|
445
|
+
channelType: runtime.channel,
|
|
446
|
+
chatType: runtime.chatType === 'group' ? 'group' : 'private',
|
|
447
|
+
peerId: currentPeerIdOf(runtime),
|
|
448
|
+
threadId: routing.isThreadTopicId(runtime.threadId) ? runtime.threadId : undefined,
|
|
449
|
+
};
|
|
450
|
+
|
|
372
451
|
const outcome = routing.resolveSendRoute(
|
|
373
452
|
{
|
|
374
453
|
thread: routeOpts.thread,
|
|
@@ -379,62 +458,80 @@ async function main() {
|
|
|
379
458
|
noEncrypt: routeOpts.noEncrypt === true,
|
|
380
459
|
// auto 的判据:本轮是否带着入站消息的加密态。有该状态说明是回复对端消息,
|
|
381
460
|
// 沿用它的加密方式;没有(如 trigger 唤醒发起)则明文。
|
|
382
|
-
inboundTriggered: runtime
|
|
383
|
-
inboundEncrypted: runtime
|
|
384
|
-
},
|
|
385
|
-
{
|
|
386
|
-
selfAid: runtime.selfAid,
|
|
387
|
-
channelType: runtime.channel,
|
|
388
|
-
chatType: runtime.chatType === 'group' ? 'group' : 'private',
|
|
389
|
-
peerId: currentPeerIdOf(runtime),
|
|
390
|
-
threadId: routing.isThreadTopicId(runtime.threadId) ? runtime.threadId : undefined,
|
|
461
|
+
inboundTriggered: runtime?.inboundEncrypted !== undefined,
|
|
462
|
+
inboundEncrypted: runtime?.inboundEncrypted === true,
|
|
391
463
|
},
|
|
464
|
+
sessionContext,
|
|
392
465
|
deps,
|
|
393
466
|
);
|
|
394
467
|
|
|
395
468
|
if (!outcome.ok) fail(outcome.message, outcome.code, outcome.hint ? { hint: outcome.hint } : {});
|
|
396
469
|
|
|
397
470
|
// ── 分派 ──
|
|
398
|
-
const dispatch = gateway.decideDispatch(outcome, text, passthrough,
|
|
471
|
+
const dispatch = gateway.decideDispatch(outcome, text, passthrough, sessionContext.channelType);
|
|
399
472
|
if (dispatch.kind === 'reject') {
|
|
400
473
|
fail(dispatch.message, dispatch.code, dispatch.hint ? { hint: dispatch.hint } : {});
|
|
401
474
|
}
|
|
402
475
|
if (dispatch.kind === 'session') {
|
|
476
|
+
if (nonManaged) {
|
|
477
|
+
fail('非托管没有会话级发送通道,请用 --thread 指定话题', 'SESSION_CHANNEL_UNAVAILABLE');
|
|
478
|
+
}
|
|
403
479
|
await dispatchSessionChannel(outcome, text, runtime, sessionId, delegationToken, routing, argv);
|
|
404
480
|
return;
|
|
405
481
|
}
|
|
406
482
|
|
|
407
483
|
const daemonArgv = dispatch.argv;
|
|
408
484
|
|
|
409
|
-
// 委托哈希必须覆盖**实际下发的 argv**:daemon 在 `aun-msg-send` 带 argv 时按
|
|
410
|
-
// `['ec', ...cmd.argv]` 重算并比对(ipc.ts 的 DELEGATED_ARGV_ENDPOINTS 闸门)。
|
|
411
|
-
// 网关下发的 argv 与调用方写的简化式不同(补了 from/to 与加密二态),
|
|
412
|
-
// 拿简化式算哈希必然 command_hash_mismatch。
|
|
413
|
-
if (readDelegatedExecutionSpec([MAIN_CLI_BIN, ...daemonArgv], process.env)) {
|
|
414
|
-
// 被安全输出 helper 包过的调用带执行规格,daemon 侧无对应字段可比对,这里无法绑定。
|
|
415
|
-
fail('ecmsg 不支持在安全输出包装内调用', 'UNSUPPORTED_WRAPPER');
|
|
416
|
-
}
|
|
417
|
-
const delegationCommandHash = hashDelegatedCommandArgv([MAIN_CLI_BIN, ...daemonArgv]);
|
|
418
|
-
|
|
419
485
|
let socketPath;
|
|
486
|
+
let paths;
|
|
420
487
|
try {
|
|
421
|
-
|
|
488
|
+
paths = await loadDist('paths.js');
|
|
422
489
|
socketPath = paths.resolvePaths().socket;
|
|
423
490
|
} catch {
|
|
424
491
|
fail(BUILD_HINT, 'BUILD_REQUIRED');
|
|
425
492
|
}
|
|
426
493
|
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
:
|
|
437
|
-
|
|
494
|
+
// 非托管:不走 argv(argv 路径必须带委托哈希),改用显式参数 + controlToken。
|
|
495
|
+
// 只有自发(--to 本端)允许走这条,其它目标仍须委托链,由 daemon 侧判定。
|
|
496
|
+
let request;
|
|
497
|
+
if (nonManaged) {
|
|
498
|
+
let controlToken;
|
|
499
|
+
try { controlToken = fs.readFileSync(paths.resolvePaths().controlToken, 'utf8').trim(); } catch { /* 交给 daemon 报错 */ }
|
|
500
|
+
const body = text.join(' ').trim();
|
|
501
|
+
request = {
|
|
502
|
+
type: 'aun-msg-send',
|
|
503
|
+
aid: outcome.self,
|
|
504
|
+
to: outcome.recipientId,
|
|
505
|
+
scope: 'msg',
|
|
506
|
+
thread: outcome.threadId || undefined,
|
|
507
|
+
payload: { type: 'text', text: body },
|
|
508
|
+
encrypt: outcome.encryptResolved,
|
|
509
|
+
controlToken,
|
|
510
|
+
};
|
|
511
|
+
} else {
|
|
512
|
+
// 委托哈希必须覆盖**实际下发的 argv**:daemon 在 `aun-msg-send` 带 argv 时按
|
|
513
|
+
// `['ec', ...cmd.argv]` 重算并比对(ipc.ts 的 DELEGATED_ARGV_ENDPOINTS 闸门)。
|
|
514
|
+
// 网关下发的 argv 与调用方写的简化式不同(补了 from/to 与加密二态),
|
|
515
|
+
// 拿简化式算哈希必然 command_hash_mismatch。
|
|
516
|
+
if (readDelegatedExecutionSpec([MAIN_CLI_BIN, ...daemonArgv], process.env)) {
|
|
517
|
+
// 被安全输出 helper 包过的调用带执行规格,daemon 侧无对应字段可比对,这里无法绑定。
|
|
518
|
+
fail('ecmsg 不支持在安全输出包装内调用', 'UNSUPPORTED_WRAPPER');
|
|
519
|
+
}
|
|
520
|
+
const delegationCommandHash = hashDelegatedCommandArgv([MAIN_CLI_BIN, ...daemonArgv]);
|
|
521
|
+
request = {
|
|
522
|
+
type: 'aun-msg-send',
|
|
523
|
+
argv: daemonArgv,
|
|
524
|
+
delegationToken,
|
|
525
|
+
...(delegationCommandHash ? { delegationCommandHash } : {}),
|
|
526
|
+
originSessionId: sessionId,
|
|
527
|
+
...(runtime.messageId ? { originMessageId: runtime.messageId } : {}),
|
|
528
|
+
...(process.env.EVOLCORE_DAEMON_RUNTIME_EPOCH
|
|
529
|
+
? { daemonRuntimeEpoch: process.env.EVOLCORE_DAEMON_RUNTIME_EPOCH }
|
|
530
|
+
: {}),
|
|
531
|
+
};
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
const result = await queryDaemonOnce(socketPath, request);
|
|
438
535
|
|
|
439
536
|
if (!result) fail('无法连接 EvolCore daemon(AUN_DAEMON_UNAVAILABLE)', 'DAEMON_UNAVAILABLE');
|
|
440
537
|
if (!result.ok) {
|
|
@@ -458,12 +555,16 @@ async function main() {
|
|
|
458
555
|
*/
|
|
459
556
|
function renderReceipt(route, result, routing, gateway) {
|
|
460
557
|
const routeLine = routing.formatRouteReceipt(route);
|
|
558
|
+
// 自发(self-address):收件人是本端,`peer` 只是话题归属方,不能当 `to` 回显。
|
|
559
|
+
const selfAddressed = route.recipient === 'self';
|
|
461
560
|
|
|
462
561
|
if (jsonOutput) {
|
|
463
562
|
process.stdout.write(`${JSON.stringify({
|
|
464
563
|
ok: true,
|
|
465
564
|
from: route.self,
|
|
466
|
-
to: route.peer.id,
|
|
565
|
+
to: selfAddressed ? route.recipientId : route.peer.id,
|
|
566
|
+
recipient: route.recipient,
|
|
567
|
+
...(selfAddressed ? { topicPeer: route.peer.id } : {}),
|
|
467
568
|
thread: route.threadId,
|
|
468
569
|
chatType: route.peer.peerKind,
|
|
469
570
|
crossTopic: route.crossTopic,
|
|
@@ -476,7 +577,10 @@ function renderReceipt(route, result, routing, gateway) {
|
|
|
476
577
|
message_id: result.message_id,
|
|
477
578
|
seq: result.seq,
|
|
478
579
|
status: result.status,
|
|
479
|
-
|
|
580
|
+
...(selfAddressed ? {
|
|
581
|
+
self_session_id: result.self_session_id,
|
|
582
|
+
self_delivery_error: result.self_delivery_error,
|
|
583
|
+
} : { trigger_id: result.trigger_id }),
|
|
480
584
|
})}\n`);
|
|
481
585
|
return;
|
|
482
586
|
}
|
|
@@ -494,6 +598,19 @@ function renderReceipt(route, result, routing, gateway) {
|
|
|
494
598
|
`✓ 已发送 ${routeLine} message_id=${result.message_id ?? '-'} seq=${seq} status=${result.status ?? '-'}\n`,
|
|
495
599
|
);
|
|
496
600
|
|
|
601
|
+
if (selfAddressed) {
|
|
602
|
+
// 自发不建复查(D13),也不该按跨话题的口径提示「已建复查」。
|
|
603
|
+
if (result.self_delivery_error) {
|
|
604
|
+
process.stderr.write(`⚠ 本地投递未完成: ${result.self_delivery_error}\n`);
|
|
605
|
+
process.stderr.write(' AUN 消息已发出(其它设备可见),但本机队列没拿到这条任务。\n');
|
|
606
|
+
} else if (result.self_session_id) {
|
|
607
|
+
process.stdout.write(`✓ 已投给本端队列 session=${result.self_session_id}\n`);
|
|
608
|
+
} else {
|
|
609
|
+
process.stderr.write('⚠ 未返回本地投递结果(self_session_id 缺失)\n');
|
|
610
|
+
}
|
|
611
|
+
return;
|
|
612
|
+
}
|
|
613
|
+
|
|
497
614
|
if (route.firstContact) {
|
|
498
615
|
process.stdout.write('· 首次联系:目标会话随本条建立,本次不建复查\n');
|
|
499
616
|
} else if (route.crossTopic) {
|
|
@@ -82,7 +82,7 @@ function baseagentDetails(codexAvailability, claude, claudeVersion, gemini) {
|
|
|
82
82
|
},
|
|
83
83
|
];
|
|
84
84
|
}
|
|
85
|
-
/**
|
|
85
|
+
/** Currently loaded runners only; configured on-demand choices are provided separately. */
|
|
86
86
|
export function loadedBaseagentIds(keys, owner) {
|
|
87
87
|
const result = new Set();
|
|
88
88
|
for (const key of keys) {
|
|
@@ -227,6 +227,28 @@ export class CodexAppServerClient {
|
|
|
227
227
|
async threadRead(threadId, includeTurns = true, timeoutMs) {
|
|
228
228
|
return this.request('thread/read', { threadId, includeTurns }, timeoutMs);
|
|
229
229
|
}
|
|
230
|
+
getModelProvider() {
|
|
231
|
+
return this.runtimeModelProvider();
|
|
232
|
+
}
|
|
233
|
+
isRunning() {
|
|
234
|
+
return this.proc !== null;
|
|
235
|
+
}
|
|
236
|
+
async threadLoadedList() {
|
|
237
|
+
const data = new Set();
|
|
238
|
+
const cursors = new Set();
|
|
239
|
+
let cursor;
|
|
240
|
+
do {
|
|
241
|
+
const page = await this.request('thread/loaded/list', cursor ? { cursor } : {}, 5000);
|
|
242
|
+
for (const id of page.data)
|
|
243
|
+
data.add(id);
|
|
244
|
+
cursor = page.nextCursor || undefined;
|
|
245
|
+
if (cursor && cursors.has(cursor))
|
|
246
|
+
throw new Error('Codex loaded thread pagination repeated a cursor');
|
|
247
|
+
if (cursor)
|
|
248
|
+
cursors.add(cursor);
|
|
249
|
+
} while (cursor);
|
|
250
|
+
return { data: [...data] };
|
|
251
|
+
}
|
|
230
252
|
async threadRollback(threadId, numTurns) {
|
|
231
253
|
return this.request('thread/rollback', { threadId, numTurns });
|
|
232
254
|
}
|
|
@@ -31,6 +31,7 @@ import { CODEX_HOOK_TOKEN_ENV, MAIN_CLI_BIN } from '../product.js';
|
|
|
31
31
|
import { ensureSessionRuntimeDir, getManagedTaskTempDir } from '../cli/task-context.js';
|
|
32
32
|
import { buildTranscriptTurns } from '../core/session/session-transcript.js';
|
|
33
33
|
import { CodexSessionFileAdapter } from '../core/session/adapters/codex-session-file-adapter.js';
|
|
34
|
+
import { repairCodexSessionProvider } from '../core/session/session-file-health.js';
|
|
34
35
|
import { execFileSync } from 'child_process';
|
|
35
36
|
import { probeCli, probeCliSync, CODEX_CLI_PROBE_TIMEOUT_MS, CODEX_CLI_PROBE_RETRY_TIMEOUT_MS } from '../utils/cross-platform.js';
|
|
36
37
|
import { createHash, randomBytes } from 'crypto';
|
|
@@ -767,6 +768,65 @@ export class CodexRunner {
|
|
|
767
768
|
}
|
|
768
769
|
return existing.client;
|
|
769
770
|
}
|
|
771
|
+
/** Called under the existing thread lock, before resume or input submission. */
|
|
772
|
+
async prepareSessionProvider(client, threadId, signal) {
|
|
773
|
+
signal?.throwIfAborted();
|
|
774
|
+
const provider = client.getModelProvider?.();
|
|
775
|
+
if (!provider || !/^evolcore_registry_[a-f0-9]{20}$/.test(provider))
|
|
776
|
+
return;
|
|
777
|
+
const sessionFile = this.findCodexSessionFile(threadId);
|
|
778
|
+
if (!sessionFile)
|
|
779
|
+
return; // Preserve the existing missing-rollout recovery behavior.
|
|
780
|
+
const repaired = await repairCodexSessionProvider({
|
|
781
|
+
codexHome: this.codexHomeDir(), threadId, sessionFile, provider,
|
|
782
|
+
releaseThread: async () => {
|
|
783
|
+
signal?.throwIfAborted();
|
|
784
|
+
if ([...this.activeSubagentTurns.values()].some(turn => turn.parentThreadId === threadId)) {
|
|
785
|
+
throw new Error('Codex Provider repair requires all descendant turns to finish');
|
|
786
|
+
}
|
|
787
|
+
const clients = new Set([
|
|
788
|
+
client, this.appServerClient, this.fullAccessAppServerClient,
|
|
789
|
+
this.threadSubscriptions.get(threadId)?.client, ...this.retiredProviderClients,
|
|
790
|
+
]);
|
|
791
|
+
for (const owner of clients) {
|
|
792
|
+
if (!owner || owner !== client && owner.isRunning?.() === false)
|
|
793
|
+
continue;
|
|
794
|
+
if (!(await owner.threadLoadedList()).data.includes(threadId))
|
|
795
|
+
continue;
|
|
796
|
+
const thread = (await owner.threadRead(threadId, false)).thread;
|
|
797
|
+
if (!['idle', 'systemError'].includes(thread?.status?.type ?? '')) {
|
|
798
|
+
throw new Error('Codex Provider repair requires an idle thread');
|
|
799
|
+
}
|
|
800
|
+
try {
|
|
801
|
+
await owner.threadUnsubscribeAndWait(threadId, CODEX_THREAD_HANDOFF_TIMEOUT_MS);
|
|
802
|
+
}
|
|
803
|
+
catch (error) {
|
|
804
|
+
if (error.code !== 'CODEX_THREAD_CLOSE_TIMEOUT')
|
|
805
|
+
throw error;
|
|
806
|
+
}
|
|
807
|
+
if ((await owner.threadLoadedList()).data.includes(threadId)) {
|
|
808
|
+
// Codex can keep an unsubscribed writer alive. Its per-thread archive
|
|
809
|
+
// tears down that runtime synchronously; unarchive preserves the UUID.
|
|
810
|
+
await this.archiveThreadForHandoff(owner, owner, threadId);
|
|
811
|
+
}
|
|
812
|
+
if ((await owner.threadLoadedList()).data.includes(threadId)) {
|
|
813
|
+
throw new Error('Codex Provider repair could not release the thread writer');
|
|
814
|
+
}
|
|
815
|
+
}
|
|
816
|
+
signal?.throwIfAborted();
|
|
817
|
+
this.threadSubscriptions.delete(threadId);
|
|
818
|
+
},
|
|
819
|
+
});
|
|
820
|
+
if (repaired)
|
|
821
|
+
this.threadProjectPaths.delete(threadId);
|
|
822
|
+
}
|
|
823
|
+
assertResumedProvider(client, response, threadId) {
|
|
824
|
+
const provider = client.getModelProvider?.();
|
|
825
|
+
if (provider && /^evolcore_registry_[a-f0-9]{20}$/.test(provider)
|
|
826
|
+
&& (response.thread?.id !== threadId || response.thread?.modelProvider !== provider)) {
|
|
827
|
+
throw new Error('Codex resume did not preserve the bound thread and current Provider');
|
|
828
|
+
}
|
|
829
|
+
}
|
|
770
830
|
async archiveThreadForHandoff(sourceClient, targetClient, threadId) {
|
|
771
831
|
const existing = this.threadSubscriptions.get(threadId);
|
|
772
832
|
if (existing && existing.client !== sourceClient) {
|
|
@@ -2294,6 +2354,7 @@ export class CodexRunner {
|
|
|
2294
2354
|
let previousAppServer;
|
|
2295
2355
|
const openThread = async () => {
|
|
2296
2356
|
if (agentSessionId) {
|
|
2357
|
+
await this.prepareSessionProvider(appServer, agentSessionId, operationController?.signal);
|
|
2297
2358
|
// A thread may have been loaded by the other permission-mode client.
|
|
2298
2359
|
// Release that one thread before asking this client to resume it.
|
|
2299
2360
|
previousAppServer = await this.prepareThreadSubscription(appServer, agentSessionId);
|
|
@@ -2398,6 +2459,8 @@ export class CodexRunner {
|
|
|
2398
2459
|
threadOptions = buildThreadOptions(true);
|
|
2399
2460
|
threadResponse = await openThread();
|
|
2400
2461
|
}
|
|
2462
|
+
if (agentSessionId)
|
|
2463
|
+
this.assertResumedProvider(appServer, threadResponse, agentSessionId);
|
|
2401
2464
|
let threadId = threadResponse.thread?.id || agentSessionId;
|
|
2402
2465
|
if (!threadId)
|
|
2403
2466
|
throw new Error('Codex app-server did not return a thread id');
|
|
@@ -3001,8 +3064,9 @@ export class CodexRunner {
|
|
|
3001
3064
|
let compactAppServer;
|
|
3002
3065
|
try {
|
|
3003
3066
|
const compactMode = normalizeExecutionPermissionMode(modelOverride?.permissionMode ?? this.chatModes.get(_sessionId) ?? this.currentMode);
|
|
3004
|
-
const appServer = this.getAppServerClient(compactMode === 'fullaccess');
|
|
3067
|
+
const appServer = this.getAppServerClient(compactMode === 'fullaccess', modelOverride?.provider);
|
|
3005
3068
|
compactAppServer = appServer;
|
|
3069
|
+
await this.prepareSessionProvider(appServer, agentSessionId);
|
|
3006
3070
|
await this.prepareThreadSubscription(appServer, agentSessionId);
|
|
3007
3071
|
this.onCompactStart?.(_sessionId);
|
|
3008
3072
|
try {
|
|
@@ -3028,7 +3092,7 @@ export class CodexRunner {
|
|
|
3028
3092
|
const compactSessionToken = this.ensureThreadCredential(agentSessionId);
|
|
3029
3093
|
if (!compactSessionToken)
|
|
3030
3094
|
throw new Error('Codex thread session credential is unavailable');
|
|
3031
|
-
await appServer.threadResume(agentSessionId, _projectPath, {
|
|
3095
|
+
const resumed = await appServer.threadResume(agentSessionId, _projectPath, {
|
|
3032
3096
|
model: compactModel,
|
|
3033
3097
|
effort: compactEffort,
|
|
3034
3098
|
approvalPolicy: compactPolicy,
|
|
@@ -3036,6 +3100,7 @@ export class CodexRunner {
|
|
|
3036
3100
|
...(executionSandbox.sandbox ? { sandbox: executionSandbox.sandbox } : {}),
|
|
3037
3101
|
config: this.sanitizeThreadEnvironmentConfig(this.mergeThreadConfig(executionSandbox.permissionProfileConfig, capabilityConfig, externalToolConfig, this.buildEvolcoreShellEnvironmentConfig(_sessionId, compactSessionToken), this.buildLifecycleLockdownConfig(compactMode)), compactMode),
|
|
3038
3102
|
});
|
|
3103
|
+
this.assertResumedProvider(appServer, resumed, agentSessionId);
|
|
3039
3104
|
this.markThreadSubscribed(appServer, agentSessionId);
|
|
3040
3105
|
this.threadProjectPaths.set(agentSessionId, path.resolve(_projectPath));
|
|
3041
3106
|
this.bindExternalToolBoundary(agentSessionId, externalToolConfig);
|
|
@@ -4961,6 +5026,7 @@ export class CodexRunner {
|
|
|
4961
5026
|
if (numTurns < 1)
|
|
4962
5027
|
return true;
|
|
4963
5028
|
const appServer = this.getAppServerClientForThread(agentSessionId);
|
|
5029
|
+
await this.prepareSessionProvider(appServer, agentSessionId);
|
|
4964
5030
|
const previousAppServer = await this.prepareThreadSubscription(appServer, agentSessionId);
|
|
4965
5031
|
let resumed = false;
|
|
4966
5032
|
try {
|
|
@@ -4977,6 +5043,7 @@ export class CodexRunner {
|
|
|
4977
5043
|
throw error;
|
|
4978
5044
|
}
|
|
4979
5045
|
}
|
|
5046
|
+
this.assertResumedProvider(appServer, resumeResponse, agentSessionId);
|
|
4980
5047
|
this.markThreadSubscribed(appServer, agentSessionId);
|
|
4981
5048
|
this.threadProjectPaths.set(agentSessionId, path.resolve(projectPath));
|
|
4982
5049
|
resumed = true;
|
package/dist/aun/msg/p2p.js
CHANGED
|
@@ -203,7 +203,12 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
|
|
|
203
203
|
request_diagnostics: daemonResult.request_diagnostics,
|
|
204
204
|
transport_error: daemonResult.transport_error,
|
|
205
205
|
};
|
|
206
|
-
|
|
206
|
+
// 自发(`--to <本端AID>`)不写出站日志:chatDir 会算成「我↔我」目录,
|
|
207
|
+
// daemon 侧 `sendDaemonMsg` 同样跳过;这里是对「daemon 未写日志」的兜底,
|
|
208
|
+
// 不跳过就会在 CLI 侧把那个目录补造出来。
|
|
209
|
+
const selfAddressed = String(args.to ?? '').replace(/^@/, '').toLowerCase()
|
|
210
|
+
=== String(args.from ?? '').replace(/^@/, '').toLowerCase();
|
|
211
|
+
if (!selfAddressed && sent.message_id && !daemonResult.handoff_id && !daemonResult.log_written) {
|
|
207
212
|
await appendMsgSendOutboundLog(args, sent, {
|
|
208
213
|
payload,
|
|
209
214
|
runtimeContext,
|