evolcore 0.0.40 → 0.0.41-test.1
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 +94 -1
- package/bin/codex-managed-hook.mjs +11 -0
- package/bin/ec-safe-output.js +11 -1
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +20 -43
- package/dist/agents/claude-runner.js +197 -197
- package/dist/agents/codex-runner.js +535 -259
- package/dist/agents/ecagent-runner.js +31 -12
- package/dist/agents/gemini-runner.js +27 -7
- package/dist/agents/runner-types.js +11 -3
- package/dist/aun/ability-device-routing.js +26 -0
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/group/fs-download.js +39 -0
- package/dist/aun/group/identity.js +36 -13
- package/dist/aun/group/operations.js +5 -0
- package/dist/aun/msg/managed-operation.js +72 -11
- package/dist/aun/msg/p2p.js +32 -7
- package/dist/aun/service-proxy.js +36 -12
- package/dist/aun/storage/download.js +30 -0
- package/dist/aun/storage/index.js +14 -6
- package/dist/channels/aun.js +367 -24
- package/dist/channels/daemon.js +39 -5
- package/dist/cli/agent-command.js +2 -0
- package/dist/cli/agent-create.js +98 -19
- package/dist/cli/agent.js +10 -3
- package/dist/cli/aun-commands.js +85 -41
- package/dist/cli/daemon-commands.js +678 -688
- package/dist/cli/fs-command.js +64 -2
- package/dist/cli/index.js +48 -4
- package/dist/cli/managed-command-guard.js +4 -0
- package/dist/cli/model.js +40 -40
- package/dist/cli/proxy-command.js +92 -0
- package/dist/cli/restart-monitor.js +17 -0
- package/dist/cli/role.js +85 -0
- package/dist/cli/session-command.js +128 -13
- package/dist/cli/stats.js +60 -4
- package/dist/cli/trigger-command.js +2 -2
- package/dist/config/access-policy.js +8 -1
- package/dist/config/boot-log.js +38 -1
- package/dist/config/config-field-policy.js +5 -32
- package/dist/config/config-manager.js +46 -39
- package/dist/config/config-operation-service.js +8 -11
- package/dist/config/contact-book-store.js +47 -21
- package/dist/config/contact-book.js +18 -12
- package/dist/config/contact-operation-service.js +3 -4
- package/dist/config/contact-request-service.js +11 -0
- package/dist/config/daemon-services.js +11 -0
- package/dist/config/gateway-config.js +89 -595
- package/dist/config/peer-role-resolver.js +15 -11
- package/dist/config/providers-config.js +12 -7
- package/dist/config/providers-import.js +3 -21
- package/dist/config/resolved-config-op.js +3 -0
- package/dist/config/role-command-service.js +166 -0
- package/dist/config/role-request-service.js +193 -0
- package/dist/config/schema-migration.js +686 -25
- package/dist/config-store.js +79 -3
- package/dist/contracts/ecweb-instance.js +41 -0
- package/dist/contracts/ecweb-service-protocol.js +3 -1
- package/dist/core/agent-application-service.js +11 -1
- package/dist/core/agent-ipc-registration.js +4 -0
- package/dist/core/agent-runtime.js +1 -1
- package/dist/core/auth/agent-delegation.js +82 -6
- package/dist/core/auth/auth-gateway.js +1 -1
- package/dist/core/auth/authorization-audit.js +37 -9
- package/dist/core/auth/delegation-authorization.js +3 -1
- package/dist/core/auth/operation-authorizer.js +15 -0
- package/dist/core/auth/operation-catalog.js +39 -6
- package/dist/core/command/agent-control.js +94 -19
- package/dist/core/command/agent-storage-menu.js +5 -3
- package/dist/core/command/cli-intent-parser.js +2 -1
- package/dist/core/command/command-handler.js +105 -145
- package/dist/core/command/connect-menu.js +31 -2
- package/dist/core/command/data-root-resolver.js +5 -4
- package/dist/core/command/memory-slash.js +16 -8
- package/dist/core/command/menu-catalog.js +6 -6
- package/dist/core/command/menu-handler.js +87 -163
- package/dist/core/command/menu-protocol.js +9 -2
- package/dist/core/command/role-menu.js +148 -30
- package/dist/core/command/slash-gate.js +13 -10
- package/dist/core/command/slash-handler.js +157 -352
- package/dist/core/daemon-control.js +8 -14
- package/dist/core/event-catalog.js +15 -0
- package/dist/core/evolagent-registry.js +4 -4
- package/dist/core/evolagent.js +2 -2
- package/dist/core/inference/text-inference.js +31 -40
- package/dist/core/ipc-registration.js +24 -3
- package/dist/core/memory/consolidation-context.js +51 -5
- package/dist/core/memory/consolidation-ops-records.js +1 -1
- package/dist/core/memory/consolidation-trigger.js +190 -190
- package/dist/core/memory/consolidation.js +316 -29
- package/dist/core/memory/forget-log.js +96 -0
- package/dist/core/memory/index-manager.js +27 -5
- package/dist/core/memory/memory-admin.js +45 -5
- package/dist/core/memory/memory-writer.js +163 -18
- package/dist/core/memory/relation-idle-monitor.js +119 -58
- package/dist/core/memory/relation-sweep.js +44 -39
- package/dist/core/message/aun-ipc-sender.js +34 -7
- package/dist/core/message/aun-request-registry.js +97 -3
- package/dist/core/message/im-renderer.js +11 -4
- package/dist/core/message/message-admission.js +97 -8
- package/dist/core/message/message-bridge.js +71 -24
- package/dist/core/message/message-log.js +55 -0
- package/dist/core/message/message-queue.js +5 -5
- package/dist/core/message/response-engine.js +387 -144
- package/dist/core/model/catalog-service.js +4 -2
- package/dist/core/model/config-scope.js +24 -64
- package/dist/core/model/field-scope.js +1 -1
- package/dist/core/model/model-catalog.js +37 -47
- package/dist/core/model/model-diagnostics.js +4 -3
- package/dist/core/model/model-fallback.js +10 -7
- package/dist/core/model/model-permission.js +3 -2
- package/dist/core/ownership/owner-resolver.js +25 -23
- package/dist/core/permission/ec-command-parser.js +138 -5
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +42 -10
- package/dist/core/relation/peer-identity.js +64 -1
- package/dist/core/role/runtime-policy.js +72 -13
- package/dist/core/session/session-capsule.js +197 -0
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +168 -14
- package/dist/core/session/session-mapper.js +2 -0
- package/dist/core/session/session-renew.js +3 -3
- package/dist/core/skill/index-generator.js +15 -5
- package/dist/core/system-session/memory.js +6 -1
- package/dist/core/thread/thread-service.js +19 -6
- package/dist/directory/owner-directory-admission.js +95 -0
- package/dist/directory/owner-directory-authorization.js +309 -0
- package/dist/directory/owner-directory-cache.js +635 -0
- package/dist/eck/kit-renderer.js +2 -2
- package/dist/ecweb/basic-settings-service.js +33 -40
- package/dist/ecweb/message-context-service.js +110 -0
- package/dist/index.js +79 -17
- package/dist/ipc.js +189 -17
- package/dist/paths.js +4 -0
- package/dist/proxy/command.js +122 -0
- package/dist/proxy/ipc-service.js +68 -0
- package/dist/proxy/manager.js +485 -0
- package/dist/proxy/service-supervisor.js +603 -0
- package/dist/response-system/engines/v1/proactive-flow.js +16 -6
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +15 -0
- package/dist/stats/index.js +2 -2
- package/dist/stats/price-resolver.js +304 -5
- package/dist/stats/query.js +82 -3
- package/dist/stats/writer.js +38 -5
- package/dist/trigger/feedback.js +18 -7
- package/dist/trigger/manager.js +20 -3
- package/dist/trigger/parser.js +6 -3
- package/dist/trigger/patch.js +1 -1
- package/dist/trigger/system-definitions.js +43 -7
- package/dist/trigger/validation.js +13 -5
- package/dist/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +16 -2
- package/dist/utils/logger.js +24 -5
- package/dist/utils/npm-ops.js +2 -1
- package/dist/utils/package-version-info.js +5 -3
- package/dist/utils/upgrade-jobs.js +45 -5
- package/kits/docs/INDEX.md +1 -1
- package/kits/docs/aun/ABILITY_CALLING.md +20 -2
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/INDEX.md +2 -1
- package/kits/docs/evolcore/agent-create.md +3 -2
- package/kits/docs/evolcore/agent.md +1 -1
- package/kits/docs/evolcore/config.md +18 -7
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/event.md +1 -0
- package/kits/docs/evolcore/fs.md +16 -0
- package/kits/docs/evolcore/memory-architecture.md +2 -2
- package/kits/docs/evolcore/memory-consolidation.md +32 -8
- package/kits/docs/evolcore/memory.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +36 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +21 -8
- package/kits/docs/evolcore/session.md +14 -0
- package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
- package/kits/schemas/_meta.json +37 -4
- package/kits/schemas/agent-config.schema.13.json +23 -3
- package/kits/schemas/agent-config.schema.16.json +891 -0
- package/kits/schemas/daemon.schema.9.json +366 -0
- package/kits/schemas/defaults.schema.5.json +406 -127
- package/kits/schemas/relation-config.schema.11.json +260 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +3 -7
- package/kits/skills/aid-ability/SKILL.md +35 -6
- package/kits/skills/ec-service-proxy/SKILL.md +118 -0
- package/kits/skills/ec-trigger/SKILL.md +13 -5
- package/kits/skills/personal-assistant/SKILL.md +176 -0
- package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
- package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
- package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
- package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
- package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
- package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
- package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
- package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
- package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
- package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
- package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
- package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
- package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
- package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
- package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
- package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
- package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
- package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
- package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
- package/kits/templates/memory-consolidation/forget.md +19 -6
- package/kits/templates/memory-consolidation/notes.md +1 -1
- package/kits/templates/memory-consolidation/profile.md +2 -2
- package/kits/templates/memory-consolidation/promote.md +20 -3
- package/kits/templates/roles/member.json +8 -1
- package/kits/templates/session-capsule/recovery.md +5 -0
- package/kits/templates/session-capsule/renew.md +5 -0
- package/kits/templates/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/bootstrap.md +6 -6
- package/kits/templates/system-fragments/channel.md +1 -1
- package/kits/templates/system-fragments/memory.md +4 -4
- package/package.json +7 -3
- package/dist/stats/billing.js +0 -215
package/CHANGELOG.md
CHANGED
|
@@ -5,12 +5,105 @@
|
|
|
5
5
|
|
|
6
6
|
## Unreleased
|
|
7
7
|
|
|
8
|
+
## 0.0.41 (2026-10-29)
|
|
9
|
+
|
|
10
|
+
### 服务代理与 EC Web
|
|
11
|
+
|
|
12
|
+
- 新增 ServiceProxy 服务定义、配置校验和 `ec proxy` 管理命令,支持受管服务与外部服务的启动、停止、健康检查和自动恢复。
|
|
13
|
+
- 支持 ServiceProxy Gateway 登记与配置热应用,完善服务代理的权限控制和 IPC 管理。
|
|
14
|
+
- EC Web 支持独立实例登记、健康校验和协议协商,降低与父包内部实现的耦合。
|
|
15
|
+
- 完善 EC Web 的 IPC、Menu、消息上下文、会话任务和启动恢复处理。
|
|
16
|
+
- 修正 EC Web 角色定义选项展示,清理失效的 Provider 服务类型配置字段。
|
|
17
|
+
|
|
18
|
+
### Agent、模型与配置
|
|
19
|
+
|
|
20
|
+
- 将模型配置迁移到 Agent 级作用域,恢复全局 Base Agent 默认配置和用途级服务模型默认值。
|
|
21
|
+
- 完善默认配置、Provider 目录和服务配置的迁移与校验,移除默认配置中的 API Key 明文读取接口。
|
|
22
|
+
- 删除未注册的配置 schema 版本,补充新版本 schema 的迁移和运行时校验。
|
|
23
|
+
- 模型目录摘要与 Provider 配置保持同步,并按模型维度聚合用量统计。
|
|
24
|
+
- 修复文本 Provider 目录的推理强度适配,保持目录查询、预览和备用模型选择一致。
|
|
25
|
+
|
|
26
|
+
### 个人助理与数据处理
|
|
27
|
+
|
|
28
|
+
- 新增个人助理技能,补充目录同步、数据 ingest、帖子、授权和协作流程。
|
|
29
|
+
- 增加渲染配置文档和前端契约,统一个人助理数据展示与配置读取。
|
|
30
|
+
- 完善记忆整理、关系空闲巡检和迁移脚本,支持更细的关系级任务状态维护。
|
|
31
|
+
|
|
32
|
+
### 权限、身份与 Owner 管理
|
|
33
|
+
|
|
34
|
+
- 新增 Owner 名录缓存、主动授权和角色提升申请审批流程。
|
|
35
|
+
- 统一基于已验证身份资料判定 AID 类型;类型未知时不再授予角色或管理权限。
|
|
36
|
+
- 完善联系人准入、外部联系限制、自动添加联系人和旧联系人迁移兼容。
|
|
37
|
+
- 统一 Agent 全局 Fullaccess 与会话局部开关的继承优先级,持久化主会话授权并显示生效来源。
|
|
38
|
+
- 收紧共识校验范围,只在实际依赖 Owner 权限的操作中要求 Owner 共识。
|
|
39
|
+
|
|
40
|
+
### 沙箱、权限与审计
|
|
41
|
+
|
|
42
|
+
- Codex 内层沙箱失败时支持外层隔离重试,Claude 沙箱故障时可通过 H 类隔离继续执行。
|
|
43
|
+
- 区分内层沙箱、外层隔离和启动故障,记录沙箱降级审计事件并改进错误提示。
|
|
44
|
+
- 修正 Codex Shell wrapper 下 L 级只读命令的误拒绝,并补充拒绝原因码。
|
|
45
|
+
- 按模型轮次结算主动模式违规次数,避免同一轮批量工具调用重复触发熔断。
|
|
46
|
+
- 完善受管任务会话身份、控制面操作和 Fullaccess 权限模式的审计关联。
|
|
47
|
+
- 修复重启确认超时后无法继续执行的问题,并显示当前对话中待查看的后台结果。
|
|
48
|
+
|
|
49
|
+
### 消息、身份与运维
|
|
50
|
+
|
|
51
|
+
- 统一 AUN 出站消息的 `ext` 注入,覆盖托管私聊、群聊和重发路径。
|
|
52
|
+
- 同步出站消息中的最新话题名称与版本信息。
|
|
53
|
+
- 统一 `ec status` 文本和 JSON 状态快照,补充渠道、Agent、服务代理、用量和费用概览。
|
|
54
|
+
- 修正 Windows 本地路径规范化和多项跨平台运行诊断。
|
|
55
|
+
- 固定 AUN SDK 版本检查使用 `latest` 标签,避免开发或测试标签影响依赖版本判断。
|
|
56
|
+
|
|
57
|
+
## 0.0.41 (2026-10-27)
|
|
58
|
+
|
|
59
|
+
### 会话与上下文
|
|
60
|
+
|
|
61
|
+
- 改进自动精简与话题 `/renew` 的上下文交接,保留目标、约束、已确认结果和待办。
|
|
62
|
+
- 完善 Claude Code、Codex、Gemini 和 ecagent 历史失效后的恢复;启动失败时保留交接摘要,避免重试时丢失上下文。
|
|
63
|
+
- 支持查询会话来源、交接摘要和底层会话关联。
|
|
64
|
+
- 调整 `/baseagent` 为设置新会话的默认基座,已有会话继续使用原基座。
|
|
65
|
+
- 修正非 GPT 模型的上下文占用计算,纳入输出及缓存用量。
|
|
66
|
+
|
|
67
|
+
### 模型与费用
|
|
68
|
+
|
|
69
|
+
- Claude Code、Codex、Gemini 和 ecagent 统一使用网关提供的官方价格、实际价格和汇率。
|
|
70
|
+
- 模型调用明细增加官方费用、网关费用及任务汇总,支持回填历史调用费用。
|
|
71
|
+
- 修正部分 Provider 的模型目录处理;模型菜单标注未验证模型,并避免重复选择当前模型。
|
|
72
|
+
|
|
73
|
+
### Agent 与联系人
|
|
74
|
+
|
|
75
|
+
- 补齐 App 创建与初始化 Agent 的入口,支持指定模型和推理强度。
|
|
76
|
+
- 支持原发起者恢复失败的初始化,并完善初始化进度和可用状态反馈。
|
|
77
|
+
- 新增外部联系开关和指定 AID 允许名单。
|
|
78
|
+
- 修复数字 AID 被误判为群而影响私聊角色识别的问题。
|
|
79
|
+
|
|
80
|
+
### AUN 消息与文件
|
|
81
|
+
|
|
82
|
+
- 能力调用支持指定目标设备,设备状态查询可收集多个在线设备的结果,并完善响应匹配与超时诊断。
|
|
83
|
+
- 保留原始消息明确指定的话题路由;跨话题复查创建失败时明确反馈,避免静默遗漏。
|
|
84
|
+
- 支持下载通过 AUN 分享的文件。
|
|
85
|
+
- 根据已验证的主体类型选择个人或群文件空间,并完善托管文件访问范围校验。
|
|
86
|
+
|
|
87
|
+
### 任务、权限与错误反馈
|
|
88
|
+
|
|
89
|
+
- 修复中断和任务收尾的竞态,避免旧任务的取消、超时或清理影响后续任务。
|
|
90
|
+
- 恢复 `/fa <任务>` 单次 Fullaccess 任务执行。
|
|
91
|
+
- 统一托管命令的解析与授权校验,完善受控输出和临时文件操作的处理。
|
|
92
|
+
- 完善 Trigger 超时重试、重试次数校验和旧配置迁移。
|
|
93
|
+
- 改进任务失败时的进度收尾与错误反馈,减少重复或遗漏通知;上游安全策略拒绝后不再自动重试。
|
|
94
|
+
|
|
95
|
+
### 升级与运维
|
|
96
|
+
|
|
97
|
+
- 完善 stable 自动升级检查,固定已确认的升级目标,并在执行和重启前检查自动升级开关。
|
|
98
|
+
- 改进 `ec status` 在 daemon 在线时的状态读取;会话状态补充 Fullaccess 开启状态和巡检周期。
|
|
99
|
+
- 修复 EC Web 被 npm 提升安装到全局目录后的包定位问题。
|
|
100
|
+
|
|
8
101
|
## 0.0.40 (2026-10-26)
|
|
9
102
|
|
|
10
103
|
### Ownership 与绑定
|
|
11
104
|
|
|
12
105
|
- 改进 AUN `/bind` 发起前的状态检查,已绑定、已有待处理请求或状态未确认时避免重复提交。
|
|
13
|
-
- 升级 AUN SDK 最低兼容版本至 `0.5.
|
|
106
|
+
- 升级 AUN SDK 最低兼容版本至 `0.5.26`,并使用 SDK 恢复和管理 Ownership 请求状态。
|
|
14
107
|
- 支持宿主 CLI 通过短连接查询、接受和拒绝 Ownership 邀约,并完善本机双身份绑定与共识校验。
|
|
15
108
|
- 修复 Agent 初始化期间 Owner 绑定竞态,并在初始化运行时补充 Owner 授权校验。
|
|
16
109
|
- Owner 状态暂时无法刷新时按暂态故障处理;绑定类敏感操作继续要求严格共识校验并提供刷新诊断。
|
|
@@ -204,6 +204,17 @@ async function main() {
|
|
|
204
204
|
}
|
|
205
205
|
if (result.ok === true && result.applicable === true && result.decision === 'allow') {
|
|
206
206
|
diagnostic('decision', { decision: 'allow' });
|
|
207
|
+
const updatedInput = result.updatedInput && typeof result.updatedInput === 'object'
|
|
208
|
+
? result.updatedInput : undefined;
|
|
209
|
+
if (updatedInput) {
|
|
210
|
+
process.stdout.write(JSON.stringify({
|
|
211
|
+
hookSpecificOutput: {
|
|
212
|
+
hookEventName: 'PreToolUse',
|
|
213
|
+
permissionDecision: 'allow',
|
|
214
|
+
updatedInput,
|
|
215
|
+
},
|
|
216
|
+
}));
|
|
217
|
+
}
|
|
207
218
|
return;
|
|
208
219
|
}
|
|
209
220
|
deny(result.reason || 'EvolCore policy did not explicitly allow this tool call.', 'policy_denied');
|
package/bin/ec-safe-output.js
CHANGED
|
@@ -9,6 +9,9 @@ const EC_EXECUTABLES = new Set(['ec']);
|
|
|
9
9
|
const HOST_PROCESS_EXECUTABLES = new Set(['ps', 'pgrep', 'pidof', 'kill', 'pkill', 'killall']);
|
|
10
10
|
const IS_WINDOWS = process.platform === 'win32';
|
|
11
11
|
const HELPER_DIR = path.dirname(fileURLToPath(import.meta.url));
|
|
12
|
+
const EXECUTION_SPEC_ENV = 'EVOLCORE_DELEGATED_EXECUTION_SPEC';
|
|
13
|
+
const TASK_DELEGATION_ENV = 'EVOLCORE_DELEGATION_TOKEN';
|
|
14
|
+
const CODEX_SESSION_TOKEN_ENV = 'EVOLCORE_CODEX_SESSION_TOKEN';
|
|
12
15
|
|
|
13
16
|
/**
|
|
14
17
|
* stdout filters this helper will spawn. This repeats the policy allowlist in
|
|
@@ -203,6 +206,7 @@ function decodePayload(encoded) {
|
|
|
203
206
|
// the filter's arguments and v2 carried a single `filterArgv`, so both are
|
|
204
207
|
// rejected rather than misread.
|
|
205
208
|
if (!value || value.v !== 3 || !Array.isArray(value.argv) || value.argv.some(arg => typeof arg !== 'string')) return null;
|
|
209
|
+
if (value.executionSpec !== undefined && (typeof value.executionSpec !== 'string' || value.executionSpec.length > 16 * 1024)) return null;
|
|
206
210
|
return value;
|
|
207
211
|
} catch {
|
|
208
212
|
return null;
|
|
@@ -432,7 +436,13 @@ if (filterProcess) filterProcess.stdout.on('data', writeLimited);
|
|
|
432
436
|
|
|
433
437
|
const child = spawn(childCommand.file, childCommand.args, {
|
|
434
438
|
cwd: paths.cwd,
|
|
435
|
-
env:
|
|
439
|
+
env: payload.executionSpec
|
|
440
|
+
? {
|
|
441
|
+
...process.env,
|
|
442
|
+
[EXECUTION_SPEC_ENV]: payload.executionSpec,
|
|
443
|
+
[CODEX_SESSION_TOKEN_ENV]: process.env[TASK_DELEGATION_ENV] || process.env[CODEX_SESSION_TOKEN_ENV] || '',
|
|
444
|
+
}
|
|
445
|
+
: process.env,
|
|
436
446
|
stdio: ['ignore', 'pipe', payload.mergeStderr ? 'pipe' : 'inherit'],
|
|
437
447
|
windowsHide: IS_WINDOWS,
|
|
438
448
|
});
|
|
@@ -128,7 +128,7 @@ export async function getBaseagentSnapshot(options = {}) {
|
|
|
128
128
|
let config = options.config;
|
|
129
129
|
if (config === undefined) {
|
|
130
130
|
const { read, ConfigTarget } = await import('../config/config-manager.js');
|
|
131
|
-
config = read(ConfigTarget.Defaults, undefined, { cache: false
|
|
131
|
+
config = read(ConfigTarget.Defaults, undefined, { cache: false }) ?? {};
|
|
132
132
|
}
|
|
133
133
|
const detections = options.probe === false
|
|
134
134
|
? null
|
package/dist/agents/baseagent.js
CHANGED
|
@@ -192,25 +192,21 @@ export function resolveAnthropicConfig(config, override, runtime) {
|
|
|
192
192
|
return name ? readRuntimeEnvironmentVariable(name, runtime?.agentAid, runtime?.projectPath).value : value;
|
|
193
193
|
};
|
|
194
194
|
const overrideApiKey = resolveGatewayReference(override?.apiKey);
|
|
195
|
-
const globalApiKey = resolveGatewayReference(config.agents?.claude?.apiKey);
|
|
196
195
|
const runtimeAuthToken = readRuntimeEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', runtime?.agentAid, runtime?.projectPath).value;
|
|
197
196
|
const runtimeApiKey = readRuntimeEnvironmentVariable('ANTHROPIC_API_KEY', runtime?.agentAid, runtime?.projectPath).value;
|
|
198
|
-
const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey,
|
|
197
|
+
const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey, undefined, runtimeAuthToken, runtimeApiKey, settings.env?.ANTHROPIC_AUTH_TOKEN, settings.env?.ANTHROPIC_API_KEY);
|
|
199
198
|
if (!apiKey) {
|
|
200
|
-
throw new Error('No API key found for Claude.
|
|
199
|
+
throw new Error('No API key found for Claude. Select a Provider via baseagents.claude.provider, or set env ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY.');
|
|
201
200
|
}
|
|
202
201
|
const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
|
|
203
202
|
const overrideBaseUrlValue = resolveGatewayReference(override?.baseUrl);
|
|
204
|
-
const globalBaseUrlValue = resolveGatewayReference(config.agents?.claude?.baseUrl);
|
|
205
203
|
const overrideBaseUrl = isPlaceholderUrl(overrideBaseUrlValue) ? undefined : overrideBaseUrlValue;
|
|
206
|
-
const globalBaseUrl = isPlaceholderUrl(globalBaseUrlValue) ? undefined : globalBaseUrlValue;
|
|
207
204
|
const runtimeBaseUrl = readRuntimeEnvironmentVariable('ANTHROPIC_BASE_URL', runtime?.agentAid, runtime?.projectPath).value;
|
|
208
205
|
const baseUrl = overrideBaseUrl
|
|
209
|
-
|| globalBaseUrl
|
|
210
206
|
|| runtimeBaseUrl
|
|
211
207
|
|| settings.env?.ANTHROPIC_BASE_URL;
|
|
212
|
-
const headers = normalizeStringMap(override?.headers
|
|
213
|
-
const queryParams = normalizeStringMap(override?.queryParams
|
|
208
|
+
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
209
|
+
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
214
210
|
const model = override?.model
|
|
215
211
|
|| config.agents?.claude?.model
|
|
216
212
|
|| settings.model
|
|
@@ -356,14 +352,12 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
356
352
|
model: override?.model || config.agents?.codex?.model || codexSettings.model || 'gpt-5.2-codex',
|
|
357
353
|
effort: override?.effort || override?.reasoning || config.agents?.codex?.effort || undefined,
|
|
358
354
|
enableRequestUserInput: override?.enableRequestUserInput ?? config.agents?.codex?.enableRequestUserInput ?? true,
|
|
359
|
-
approvalsReviewer: override?.approvalsReviewer ?? config.agents?.codex?.approvalsReviewer,
|
|
360
355
|
agentAid: runtime?.agentAid,
|
|
361
356
|
agentConfig: runtime?.agentConfig,
|
|
362
357
|
};
|
|
363
358
|
}
|
|
364
359
|
const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
|
|
365
360
|
const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
|
|
366
|
-
const globalApiKey = isPlaceholder(config.agents?.codex?.apiKey) ? undefined : config.agents?.codex?.apiKey;
|
|
367
361
|
const environmentApiKey = [process.env.OPENAI_API_KEY, process.env.CODEX_API_KEY]
|
|
368
362
|
.map(value => isPlaceholder(value) ? undefined : value)
|
|
369
363
|
.find((value) => !!value);
|
|
@@ -375,31 +369,27 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
375
369
|
// different credentials.
|
|
376
370
|
const credential = overrideApiKey
|
|
377
371
|
? { apiKey: overrideApiKey, authType: 'apiKey', authSource: 'agent-config' }
|
|
378
|
-
:
|
|
379
|
-
? { apiKey:
|
|
380
|
-
:
|
|
381
|
-
? { apiKey:
|
|
382
|
-
:
|
|
383
|
-
? { apiKey:
|
|
384
|
-
:
|
|
385
|
-
? { apiKey: storedApiKey, authType: 'apiKey', authSource: 'auth.json' }
|
|
386
|
-
: undefined;
|
|
372
|
+
: configuredBearer
|
|
373
|
+
? { apiKey: configuredBearer, authType: 'bearerToken', authSource: 'config.toml' }
|
|
374
|
+
: environmentApiKey
|
|
375
|
+
? { apiKey: environmentApiKey, authType: 'apiKey', authSource: 'environment' }
|
|
376
|
+
: storedApiKey
|
|
377
|
+
? { apiKey: storedApiKey, authType: 'apiKey', authSource: 'auth.json' }
|
|
378
|
+
: undefined;
|
|
387
379
|
const apiKey = credential?.apiKey;
|
|
388
380
|
const authType = credential?.authType;
|
|
389
381
|
const authSource = credential?.authSource;
|
|
390
382
|
if (!apiKey) {
|
|
391
|
-
throw new Error('No Codex credential found.
|
|
383
|
+
throw new Error('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.');
|
|
392
384
|
}
|
|
393
385
|
const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
|
|
394
386
|
const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
|
|
395
|
-
const globalBaseUrl = isPlaceholderUrl(config.agents?.codex?.baseUrl) ? undefined : config.agents?.codex?.baseUrl;
|
|
396
387
|
const baseUrl = overrideBaseUrl
|
|
397
|
-
|| globalBaseUrl
|
|
398
388
|
|| process.env.OPENAI_BASE_URL
|
|
399
389
|
|| codexSettings.baseUrl
|
|
400
390
|
|| undefined;
|
|
401
|
-
const headers = normalizeStringMap(override?.headers
|
|
402
|
-
const queryParams = normalizeStringMap(override?.queryParams
|
|
391
|
+
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
392
|
+
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
403
393
|
const model = override?.model
|
|
404
394
|
|| config.agents?.codex?.model
|
|
405
395
|
|| codexSettings.model
|
|
@@ -412,9 +402,6 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
412
402
|
const enableRequestUserInput = override?.enableRequestUserInput
|
|
413
403
|
?? config.agents?.codex?.enableRequestUserInput
|
|
414
404
|
?? true;
|
|
415
|
-
const approvalsReviewer = override?.approvalsReviewer
|
|
416
|
-
?? config.agents?.codex?.approvalsReviewer
|
|
417
|
-
?? undefined;
|
|
418
405
|
return {
|
|
419
406
|
apiKey,
|
|
420
407
|
authType,
|
|
@@ -426,7 +413,6 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
426
413
|
model,
|
|
427
414
|
effort,
|
|
428
415
|
enableRequestUserInput,
|
|
429
|
-
approvalsReviewer,
|
|
430
416
|
agentAid: runtime?.agentAid,
|
|
431
417
|
agentConfig: runtime?.agentConfig,
|
|
432
418
|
};
|
|
@@ -448,20 +434,14 @@ export function resolveGoogleConfig(config, override) {
|
|
|
448
434
|
throw new Error(`Provider ${providerId} gemini service queryParams are unsupported by the Gemini CLI runtime`);
|
|
449
435
|
}
|
|
450
436
|
return { cliPath, model, apiKey: provider.apiKey, providerId, baseUrl: provider.baseUrl, headers: provider.headers,
|
|
451
|
-
queryParams: provider.queryParams
|
|
437
|
+
queryParams: provider.queryParams };
|
|
452
438
|
}
|
|
453
439
|
const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
|
|
454
|
-
const globalApiKey = isPlaceholder(googleCfg?.apiKey) ? undefined : googleCfg?.apiKey;
|
|
455
440
|
const apiKey = overrideApiKey
|
|
456
|
-
|| globalApiKey
|
|
457
441
|
|| process.env.GEMINI_API_KEY
|
|
458
442
|
|| process.env.GOOGLE_API_KEY
|
|
459
443
|
|| undefined;
|
|
460
|
-
|
|
461
|
-
const useVertex = override?.useVertex ?? googleCfg?.useVertex ?? false;
|
|
462
|
-
const project = override?.project || googleCfg?.project || process.env.GOOGLE_CLOUD_PROJECT || undefined;
|
|
463
|
-
const location = override?.location || googleCfg?.location || process.env.GOOGLE_CLOUD_LOCATION || 'us-central1';
|
|
464
|
-
return { cliPath, model, apiKey, mode, useVertex, project, location };
|
|
444
|
+
return { cliPath, model, apiKey };
|
|
465
445
|
}
|
|
466
446
|
// ── EvolCore bundled ecagent ──────────────────────────────────────────
|
|
467
447
|
export const DEFAULT_ECAGENT_BASE_URL = 'https://mg-new.evolai.cn/openclaw-proxy/v1';
|
|
@@ -473,8 +453,7 @@ export function resolveEcagentConfig(config, override) {
|
|
|
473
453
|
const configured = config.agents?.ecagent;
|
|
474
454
|
const providerId = override?.provider ?? configured?.provider;
|
|
475
455
|
if (providerId !== undefined) {
|
|
476
|
-
const
|
|
477
|
-
const provider = resolveProviderServiceForBaseagent(providerId, 'ecagent', providerServiceType);
|
|
456
|
+
const provider = resolveProviderServiceForBaseagent(providerId, 'ecagent');
|
|
478
457
|
if (provider.style !== 'openai-compatible') {
|
|
479
458
|
throw new Error(`Provider ${providerId} uses unsupported ecagent style: ${provider.style}`);
|
|
480
459
|
}
|
|
@@ -501,19 +480,17 @@ export function resolveEcagentConfig(config, override) {
|
|
|
501
480
|
|| value.includes('your-')
|
|
502
481
|
|| value.includes('placeholder');
|
|
503
482
|
const apiKey = (isPlaceholder(override?.apiKey) ? undefined : override?.apiKey)
|
|
504
|
-
|| (isPlaceholder(configured?.apiKey) ? undefined : configured?.apiKey)
|
|
505
483
|
|| process.env.ECAGENT_API_KEY
|
|
506
484
|
|| process.env.OPENAI_API_KEY;
|
|
507
485
|
if (!apiKey) {
|
|
508
|
-
throw new Error('No ecagent API key found.
|
|
486
|
+
throw new Error('No ecagent API key found. Select a Provider via baseagents.ecagent.provider, or set env ECAGENT_API_KEY / OPENAI_API_KEY.');
|
|
509
487
|
}
|
|
510
488
|
const baseUrl = (override?.baseUrl && !override.baseUrl.includes('placeholder') ? override.baseUrl : undefined)
|
|
511
|
-
|| (configured?.baseUrl && !configured.baseUrl.includes('placeholder') ? configured.baseUrl : undefined)
|
|
512
489
|
|| process.env.ECAGENT_BASE_URL
|
|
513
490
|
|| DEFAULT_ECAGENT_BASE_URL;
|
|
514
491
|
const model = override?.model || configured?.model || DEFAULT_ECAGENT_MODEL;
|
|
515
|
-
const headers = normalizeStringMap(override?.headers
|
|
516
|
-
const queryParams = normalizeStringMap(override?.queryParams
|
|
492
|
+
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
493
|
+
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
517
494
|
const effort = override?.effort ?? configured?.effort;
|
|
518
495
|
const numberOr = (value, fallback) => (typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : fallback);
|
|
519
496
|
return {
|