evolcore 0.0.41-test.0 → 0.0.41-test.2
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 +62 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +88 -49
- package/dist/agents/claude-runner.js +177 -92
- package/dist/agents/codex-runner.js +146 -71
- package/dist/agents/ecagent-runner.js +1 -1
- package/dist/agents/gemini-runner.js +1 -1
- package/dist/aun/aid/agentmd.js +98 -11
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +26 -2
- package/dist/aun/aid/identity.js +91 -0
- package/dist/aun/aid/index.js +1 -1
- package/dist/aun/aid/managed-operation.js +1 -1
- package/dist/aun/aid/ownership-operation.js +23 -22
- package/dist/aun/group/fs-download.js +39 -0
- package/dist/aun/group/identity.js +36 -21
- package/dist/aun/group/operations.js +5 -0
- package/dist/aun/menu/client.js +27 -0
- package/dist/aun/msg/managed-operation.js +68 -7
- package/dist/aun/msg/p2p.js +8 -8
- package/dist/aun/service-proxy.js +53 -12
- package/dist/channels/aun.js +633 -32
- package/dist/channels/daemon.js +15 -1
- package/dist/cli/agent-command.js +5 -2
- package/dist/cli/agent-create.js +991 -233
- package/dist/cli/agent.js +49 -10
- package/dist/cli/aid-bind-command.js +48 -19
- package/dist/cli/aun-commands.js +48 -36
- package/dist/cli/daemon-commands.js +679 -697
- package/dist/cli/fs-command.js +64 -2
- package/dist/cli/index.js +72 -5
- package/dist/cli/init-channel.js +1 -1
- package/dist/cli/init.js +75 -1
- package/dist/cli/managed-command-guard.js +17 -1
- package/dist/cli/model.js +40 -40
- package/dist/cli/provider-command.js +57 -0
- package/dist/cli/proxy-command.js +92 -0
- package/dist/cli/restart-monitor.js +4 -2
- package/dist/cli/role.js +85 -0
- package/dist/cli/stats.js +10 -3
- package/dist/cli/task-context.js +19 -0
- package/dist/config/access-policy.js +7 -2
- package/dist/config/boot-log.js +39 -1
- package/dist/config/config-field-policy.js +17 -39
- package/dist/config/config-manager.js +183 -44
- package/dist/config/config-operation-service.js +5 -19
- 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 +88 -594
- package/dist/config/owner-config.js +2 -2
- package/dist/config/peer-role-resolver.js +15 -12
- package/dist/config/provider-ipc-service.js +132 -0
- package/dist/config/provider-menu-request.js +58 -0
- package/dist/config/providers-config.js +12 -7
- package/dist/config/providers-import.js +3 -21
- package/dist/config/providers-management.js +78 -5
- package/dist/config/resolved-config-op.js +11 -1
- package/dist/config/role-command-service.js +166 -0
- package/dist/config/role-request-service.js +193 -0
- package/dist/config/schema-migration.js +1000 -25
- package/dist/config-store.js +89 -4
- package/dist/contracts/ecweb-instance.js +41 -0
- package/dist/contracts/ecweb-service-protocol.js +4 -1
- package/dist/core/agent-application-service.js +60 -11
- package/dist/core/agent-create-status.js +203 -0
- package/dist/core/agent-creation-claim.js +177 -0
- package/dist/core/agent-ipc-registration.js +39 -18
- package/dist/core/agent-runtime.js +194 -24
- package/dist/core/auth/agent-delegation.js +6 -3
- package/dist/core/auth/auth-gateway.js +67 -2
- package/dist/core/auth/authorization-audit.js +58 -11
- package/dist/core/auth/delegation-authorization.js +5 -2
- package/dist/core/auth/operation-authorizer.js +43 -6
- package/dist/core/auth/operation-catalog.js +45 -7
- package/dist/core/channel-loader.js +2 -0
- package/dist/core/command/agent-control.js +260 -21
- package/dist/core/command/agent-storage-menu.js +5 -3
- package/dist/core/command/cli-intent-parser.js +8 -3
- package/dist/core/command/command-handler.js +112 -154
- package/dist/core/command/connect-menu.js +11 -3
- 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 +10 -6
- package/dist/core/command/menu-handler.js +106 -73
- package/dist/core/command/menu-protocol.js +15 -1
- package/dist/core/command/provider-menu.js +46 -0
- package/dist/core/command/role-menu.js +147 -30
- package/dist/core/command/slash-handler.js +125 -255
- package/dist/core/daemon-control.js +26 -27
- package/dist/core/event-catalog.js +10 -0
- package/dist/core/evolagent-registry.js +7 -5
- package/dist/core/evolagent.js +10 -8
- package/dist/core/file-integrity/store.js +11 -0
- package/dist/core/handoff/ipc-registration.js +3 -0
- package/dist/core/inference/text-inference.js +31 -40
- package/dist/core/initialization/service.js +491 -0
- package/dist/core/ipc-registration.js +40 -24
- package/dist/core/memory/consolidation-context.js +51 -5
- package/dist/core/memory/consolidation-ops-records.js +96 -1
- package/dist/core/memory/consolidation-trigger.js +208 -191
- package/dist/core/memory/consolidation.js +333 -35
- 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 +55 -45
- package/dist/core/message/aun-ipc-sender.js +81 -69
- package/dist/core/message/im-renderer.js +25 -4
- package/dist/core/message/message-admission.js +89 -4
- package/dist/core/message/message-bridge.js +66 -21
- package/dist/core/message/response-engine.js +108 -35
- package/dist/core/model/catalog-service.js +5 -3
- package/dist/core/model/config-scope.js +29 -71
- package/dist/core/model/field-scope.js +1 -1
- package/dist/core/model/model-catalog.js +30 -41
- 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 +772 -158
- package/dist/core/permission/approval-gateway.js +103 -403
- package/dist/core/permission/ec-command-parser.js +62 -6
- package/dist/core/permission/index.js +1 -0
- package/dist/core/permission/permission-result.js +78 -0
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +21 -46
- 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 +1 -1
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +20 -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 +43 -8
- 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/init-menu.js +32 -0
- package/dist/ecweb/message-context-service.js +110 -0
- package/dist/index.js +93 -19
- package/dist/ipc.js +247 -29
- package/dist/paths.js +7 -0
- package/dist/proxy/command.js +122 -0
- package/dist/proxy/ipc-service.js +68 -0
- package/dist/proxy/manager.js +484 -0
- package/dist/proxy/service-supervisor.js +603 -0
- package/dist/response-system/engines/v1/proactive-flow.js +16 -6
- package/dist/trigger/authorization.js +27 -17
- package/dist/trigger/feedback.js +2 -3
- package/dist/trigger/ipc-service.js +105 -78
- package/dist/trigger/local-files.js +2 -1
- package/dist/trigger/manager.js +5 -3
- package/dist/trigger/scheduler.js +88 -6
- package/dist/utils/atomic-write.js +28 -0
- package/dist/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +26 -2
- package/dist/utils/logger.js +92 -6
- package/dist/utils/package-version-info.js +4 -2
- package/dist/utils/welcome.js +1 -1
- package/kits/docs/INDEX.md +1 -0
- package/kits/docs/aun/SDK.md +4 -1
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/INDEX.md +1 -0
- package/kits/docs/evolcore/agent.md +8 -1
- package/kits/docs/evolcore/aid.md +67 -17
- package/kits/docs/evolcore/config.md +28 -7
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/fs.md +11 -0
- package/kits/docs/evolcore/group.md +1 -1
- 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 +4 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +4 -7
- package/kits/docs/evolcore/provider.md +50 -0
- package/kits/docs/identity/AID_PROFILE_SPEC.md +52 -17
- package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
- package/kits/rules/01-overview.md +3 -0
- package/kits/rules/04-relation.md +1 -1
- package/kits/schemas/_meta.json +37 -4
- package/kits/schemas/agent-config.schema.13.json +8 -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 +277 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ec-agent-create/SKILL.md +3 -0
- package/kits/skills/ec-identity/SKILL.md +2 -2
- package/kits/skills/ec-service-proxy/SKILL.md +118 -0
- package/kits/skills/ec-skill/scripts/skill.mjs +6 -0
- 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/skills/thread-ops/SKILL.md +5 -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/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/memory.md +4 -4
- package/kits/templates/system-fragments/venue.md +1 -1
- package/package.json +7 -3
- package/dist/core/message/create-status.js +0 -96
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,68 @@
|
|
|
5
5
|
|
|
6
6
|
## Unreleased
|
|
7
7
|
|
|
8
|
+
## 0.0.41-test.2 (2026-10-31)
|
|
9
|
+
|
|
10
|
+
### Agent 创建、初始化与身份
|
|
11
|
+
|
|
12
|
+
- 完善 App 一步创建、初始化进度、Owner 绑定、失败恢复和取消流程,补充 creationId、operationId、请求主体及绑定关系诊断。
|
|
13
|
+
- 修复初始化状态损坏、目标配置变化和已激活 Agent 重绑时的错误归因,保留可恢复与不可恢复状态边界。
|
|
14
|
+
- 支持初始化阶段头像上传、Provider 导入、Agent 名片校验和配置冲突检查。
|
|
15
|
+
- 合并创建状态、初始化进度、初始化 Owner 投影和删除清理逻辑,修复 npm 包运行时缺失模块的问题。
|
|
16
|
+
|
|
17
|
+
### Ownership、Owner 目录与权限
|
|
18
|
+
|
|
19
|
+
- 将 Ownership 2.1 核验收口到实际依赖 Owner 权限的操作,增加结构化刷新来源、失败代码和暂态诊断。
|
|
20
|
+
- 保留已验证关系,阻止已激活 Agent 按遗留配置自动重绑;Owner 不匹配时撤销授权并要求重新核验。
|
|
21
|
+
- 新增 Owner Agent 名录授权、缓存、快照同步、过期处理、拒绝持久化和连接代次保护。
|
|
22
|
+
- Owner 目录刷新增加强制新鲜度校验、退避重试和私聊/群聊准入边界。
|
|
23
|
+
- 补充角色提升申请与审批服务、角色命令和权限结果诊断。
|
|
24
|
+
|
|
25
|
+
### AUN 消息、Bootstrap 与命令安全
|
|
26
|
+
|
|
27
|
+
- 修复 Bootstrap 欢迎消息在历史群路由上的恢复逻辑,统一修复为 Owner 私聊并避免重复投递。
|
|
28
|
+
- 完善 AUN 出站消息路由、加密默认值、设备目标和话题元数据处理。
|
|
29
|
+
- 扩展受管命令解析对 thread summary 文本和 `$TMPDIR` 字面量的识别,保留不安全展开的 fail-closed 行为。
|
|
30
|
+
- 改进命令授权、跨会话权限、工具输入和策略拒绝诊断,保留原始错误归因。
|
|
31
|
+
|
|
32
|
+
### 会话、任务、Trigger 与记忆
|
|
33
|
+
|
|
34
|
+
- 完善 session capsule、renew、任务恢复、Trigger 重试和权限诊断,补充请求关联审计元数据。
|
|
35
|
+
- Trigger 列表改为带最近刷新时间的手动刷新模式。
|
|
36
|
+
- 合并记忆遗忘审计与整理操作记录,保留遗忘原因、范围和结果。
|
|
37
|
+
- 完善费用、用量、网关价格和历史调用成本聚合。
|
|
38
|
+
|
|
39
|
+
### Provider、ServiceProxy 与运行时兼容
|
|
40
|
+
|
|
41
|
+
- 新增 Provider CLI、Provider Menu 和 ServiceProxy 管理能力,完善配置并发校验、引用删除保护和服务生命周期。
|
|
42
|
+
- 增加 personal-assistant 技能及其工作区、数据流、渲染配置和自动化脚本。
|
|
43
|
+
- 更新 Agent、daemon、relation schema 和运行时文档。
|
|
44
|
+
- AUN SDK 最低兼容版本提升至 `0.5.28`;EC Web 协议同步至 1.4;Node.js 要求为 `>=22.16.0`。
|
|
45
|
+
|
|
46
|
+
## 0.0.41 (2026-10-30)
|
|
47
|
+
|
|
48
|
+
### Ownership、权限与 Agent 初始化
|
|
49
|
+
|
|
50
|
+
- 统一 Ownership 2.1 协议共识与 Owner 角色判定;绑定关系建立后不再回退到配置中的兼容 Owner。
|
|
51
|
+
- 收紧 Ownership IPC 的委派与本地控制认证边界,支持状态查询强制刷新,并记录脱敏的 Ownership 业务事件。
|
|
52
|
+
- 完善 Agent 创建、Owner 绑定、初始化恢复和身份冲突诊断,保留未绑定 Agent 的兼容绑定目标。
|
|
53
|
+
- 启用 Agent 前校验模型配置;模型或推理强度仅从 Agent/defaults 配置读取,缺失时返回明确错误。
|
|
54
|
+
- 完善旧关系模型配置迁移,清理关系级模型字段并补齐缺失的 Agent Base Agent 配置。
|
|
55
|
+
|
|
56
|
+
### Provider 与菜单控制
|
|
57
|
+
|
|
58
|
+
- 新增 Provider CLI 和 Provider Menu 进程级管理,支持配置创建、更新、删除、JSON 导入和并发校验。
|
|
59
|
+
- 删除被 Provider 引用时提供保护,强化 Provider IPC、Menu 权限边界和错误码映射。
|
|
60
|
+
- 统一 Trigger 详情查询语义,并补充 Provider 管理文档。
|
|
61
|
+
- 升级 AUN SDK 至 `0.5.28`。
|
|
62
|
+
|
|
63
|
+
### AUN 消息与配置
|
|
64
|
+
|
|
65
|
+
- 修复 AUN payload 的话题路由一致性。
|
|
66
|
+
- 增强 Agent、AUN 命令和初始化参数的校验与提示。
|
|
67
|
+
- 完善模型目录和默认模型选择,避免配置读取失败时静默使用隐式 runner 默认值。
|
|
68
|
+
- 更新 AID、联系人和群关系文档,明确 Ownership 2.1 共识与兼容绑定目标的权限边界。
|
|
69
|
+
|
|
8
70
|
## 0.0.41 (2026-10-27)
|
|
9
71
|
|
|
10
72
|
### 会话与上下文
|
|
@@ -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
|
@@ -66,6 +66,9 @@ const BASEAGENT_ALIASES = {
|
|
|
66
66
|
'ec-agent': { canonical: 'ecagent', displayName: 'ecagent' },
|
|
67
67
|
};
|
|
68
68
|
const SUPPORTED_BASEAGENTS = new Set(['claude', 'codex', 'gemini', 'ecagent']);
|
|
69
|
+
export const DEFAULT_CLAUDE_MODEL = 'sonnet';
|
|
70
|
+
export const DEFAULT_CODEX_MODEL = 'gpt-5.2-codex';
|
|
71
|
+
export const DEFAULT_GEMINI_MODEL = 'gemini-2.5-flash';
|
|
69
72
|
export function normalizeBaseagent(input) {
|
|
70
73
|
const key = String(input || '').trim().toLowerCase().replace(/_/g, '-');
|
|
71
74
|
return BASEAGENT_ALIASES[key] || { canonical: 'unknown', displayName: input ? String(input) : 'Unknown' };
|
|
@@ -74,6 +77,61 @@ export function isSupportedBaseagent(input) {
|
|
|
74
77
|
const key = String(input || '').trim().toLowerCase();
|
|
75
78
|
return SUPPORTED_BASEAGENTS.has(key);
|
|
76
79
|
}
|
|
80
|
+
function readLegacyJson(file) {
|
|
81
|
+
try {
|
|
82
|
+
if (!fs.existsSync(file))
|
|
83
|
+
return undefined;
|
|
84
|
+
const value = JSON.parse(fs.readFileSync(file, 'utf8'));
|
|
85
|
+
return value && typeof value === 'object' && !Array.isArray(value)
|
|
86
|
+
? value
|
|
87
|
+
: undefined;
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Read a pre-agent-config runner selection for the one-time schema migration.
|
|
95
|
+
* Mirror the runner's historical file/default model fallback without loading
|
|
96
|
+
* credentials, resolving providers, connecting, or changing runtime selection.
|
|
97
|
+
*/
|
|
98
|
+
export function resolveLegacyBaseagentModelSelection(baseagent, options = {}) {
|
|
99
|
+
const canonical = normalizeBaseagent(baseagent).canonical;
|
|
100
|
+
const home = options.home ? path.resolve(options.home) : os.homedir();
|
|
101
|
+
if (canonical === 'claude') {
|
|
102
|
+
const file = path.join(home, '.claude', 'settings.json');
|
|
103
|
+
const settings = readLegacyJson(file);
|
|
104
|
+
const model = nonEmptyString(settings?.model);
|
|
105
|
+
const effort = nonEmptyString(settings?.effortLevel);
|
|
106
|
+
return { model: model ?? 'sonnet', ...(effort ? { effort } : {}), source: model || effort ? file : 'runner-default' };
|
|
107
|
+
}
|
|
108
|
+
if (canonical === 'codex') {
|
|
109
|
+
const codexHome = options.codexHome
|
|
110
|
+
? path.resolve(options.codexHome)
|
|
111
|
+
: process.env.CODEX_HOME?.trim()
|
|
112
|
+
? path.resolve(process.env.CODEX_HOME)
|
|
113
|
+
: path.join(home, '.codex');
|
|
114
|
+
const file = path.join(codexHome, 'config.toml');
|
|
115
|
+
try {
|
|
116
|
+
const parsed = fs.existsSync(file)
|
|
117
|
+
? recordValue(parseToml(fs.readFileSync(file, 'utf8')))
|
|
118
|
+
: undefined;
|
|
119
|
+
const model = nonEmptyString(parsed?.model);
|
|
120
|
+
const effort = nonEmptyString(parsed?.model_reasoning_effort);
|
|
121
|
+
return { model: model ?? 'gpt-5.2-codex', ...(effort ? { effort } : {}), source: model || effort ? file : 'runner-default' };
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
return { model: 'gpt-5.2-codex', source: 'runner-default' };
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
if (canonical === 'gemini') {
|
|
128
|
+
return { model: 'gemini-2.5-flash', source: 'runner-default' };
|
|
129
|
+
}
|
|
130
|
+
if (canonical === 'ecagent') {
|
|
131
|
+
return { model: DEFAULT_ECAGENT_MODEL, source: 'runner-default' };
|
|
132
|
+
}
|
|
133
|
+
return undefined;
|
|
134
|
+
}
|
|
77
135
|
function directInferencePair(apiKey, baseUrl) {
|
|
78
136
|
const normalizedApiKey = directInferenceValue(apiKey);
|
|
79
137
|
const normalizedBaseUrl = directInferenceValue(baseUrl);
|
|
@@ -181,7 +239,7 @@ export function resolveAnthropicConfig(config, override, runtime) {
|
|
|
181
239
|
providerId,
|
|
182
240
|
headers: provider.headers,
|
|
183
241
|
queryParams: provider.queryParams,
|
|
184
|
-
model: override?.model || config.agents?.claude?.model || settings.model ||
|
|
242
|
+
model: override?.model || config.agents?.claude?.model || settings.model || DEFAULT_CLAUDE_MODEL,
|
|
185
243
|
effort: override?.effort || config.agents?.claude?.effort || settings.effortLevel || undefined,
|
|
186
244
|
pathToClaudeCodeExecutable: override?.pathToClaudeCodeExecutable || config.agents?.claude?.pathToClaudeCodeExecutable,
|
|
187
245
|
};
|
|
@@ -192,29 +250,25 @@ export function resolveAnthropicConfig(config, override, runtime) {
|
|
|
192
250
|
return name ? readRuntimeEnvironmentVariable(name, runtime?.agentAid, runtime?.projectPath).value : value;
|
|
193
251
|
};
|
|
194
252
|
const overrideApiKey = resolveGatewayReference(override?.apiKey);
|
|
195
|
-
const globalApiKey = resolveGatewayReference(config.agents?.claude?.apiKey);
|
|
196
253
|
const runtimeAuthToken = readRuntimeEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', runtime?.agentAid, runtime?.projectPath).value;
|
|
197
254
|
const runtimeApiKey = readRuntimeEnvironmentVariable('ANTHROPIC_API_KEY', runtime?.agentAid, runtime?.projectPath).value;
|
|
198
|
-
const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey,
|
|
255
|
+
const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey, undefined, runtimeAuthToken, runtimeApiKey, settings.env?.ANTHROPIC_AUTH_TOKEN, settings.env?.ANTHROPIC_API_KEY);
|
|
199
256
|
if (!apiKey) {
|
|
200
|
-
throw new Error('No API key found for Claude.
|
|
257
|
+
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
258
|
}
|
|
202
259
|
const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
|
|
203
260
|
const overrideBaseUrlValue = resolveGatewayReference(override?.baseUrl);
|
|
204
|
-
const globalBaseUrlValue = resolveGatewayReference(config.agents?.claude?.baseUrl);
|
|
205
261
|
const overrideBaseUrl = isPlaceholderUrl(overrideBaseUrlValue) ? undefined : overrideBaseUrlValue;
|
|
206
|
-
const globalBaseUrl = isPlaceholderUrl(globalBaseUrlValue) ? undefined : globalBaseUrlValue;
|
|
207
262
|
const runtimeBaseUrl = readRuntimeEnvironmentVariable('ANTHROPIC_BASE_URL', runtime?.agentAid, runtime?.projectPath).value;
|
|
208
263
|
const baseUrl = overrideBaseUrl
|
|
209
|
-
|| globalBaseUrl
|
|
210
264
|
|| runtimeBaseUrl
|
|
211
265
|
|| settings.env?.ANTHROPIC_BASE_URL;
|
|
212
|
-
const headers = normalizeStringMap(override?.headers
|
|
213
|
-
const queryParams = normalizeStringMap(override?.queryParams
|
|
266
|
+
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
267
|
+
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
214
268
|
const model = override?.model
|
|
215
269
|
|| config.agents?.claude?.model
|
|
216
270
|
|| settings.model
|
|
217
|
-
||
|
|
271
|
+
|| DEFAULT_CLAUDE_MODEL;
|
|
218
272
|
const effort = override?.effort
|
|
219
273
|
|| config.agents?.claude?.effort
|
|
220
274
|
|| settings.effortLevel
|
|
@@ -248,6 +302,7 @@ export function loadCodexSettings() {
|
|
|
248
302
|
// A corrupt auth.json must not prevent the provider config from loading.
|
|
249
303
|
}
|
|
250
304
|
let model;
|
|
305
|
+
let effort;
|
|
251
306
|
let baseUrl;
|
|
252
307
|
let provider;
|
|
253
308
|
let bearerToken;
|
|
@@ -256,6 +311,7 @@ export function loadCodexSettings() {
|
|
|
256
311
|
if (fs.existsSync(configPath)) {
|
|
257
312
|
const parsed = recordValue(parseToml(fs.readFileSync(configPath, 'utf-8')));
|
|
258
313
|
model = nonEmptyString(parsed?.model);
|
|
314
|
+
effort = nonEmptyString(parsed?.model_reasoning_effort);
|
|
259
315
|
provider = nonEmptyString(parsed?.model_provider);
|
|
260
316
|
const providers = recordValue(parsed?.model_providers);
|
|
261
317
|
const selectedProvider = provider ? recordValue(providers?.[provider]) : undefined;
|
|
@@ -276,6 +332,7 @@ export function loadCodexSettings() {
|
|
|
276
332
|
authSource: 'config.toml',
|
|
277
333
|
baseUrl,
|
|
278
334
|
model,
|
|
335
|
+
effort,
|
|
279
336
|
provider,
|
|
280
337
|
requiresOpenaiAuth,
|
|
281
338
|
};
|
|
@@ -287,11 +344,12 @@ export function loadCodexSettings() {
|
|
|
287
344
|
authSource: 'auth.json',
|
|
288
345
|
baseUrl,
|
|
289
346
|
model,
|
|
347
|
+
effort,
|
|
290
348
|
provider,
|
|
291
349
|
requiresOpenaiAuth,
|
|
292
350
|
};
|
|
293
351
|
}
|
|
294
|
-
return { baseUrl, model, provider, requiresOpenaiAuth };
|
|
352
|
+
return { baseUrl, model, effort, provider, requiresOpenaiAuth };
|
|
295
353
|
}
|
|
296
354
|
/**
|
|
297
355
|
* Resolve a complete credential/endpoint pair for direct OpenAI HTTP calls.
|
|
@@ -353,17 +411,15 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
353
411
|
providerId,
|
|
354
412
|
headers: provider.headers,
|
|
355
413
|
queryParams: provider.queryParams,
|
|
356
|
-
model: override?.model || config.agents?.codex?.model || codexSettings.model ||
|
|
414
|
+
model: override?.model || config.agents?.codex?.model || codexSettings.model || DEFAULT_CODEX_MODEL,
|
|
357
415
|
effort: override?.effort || override?.reasoning || config.agents?.codex?.effort || undefined,
|
|
358
416
|
enableRequestUserInput: override?.enableRequestUserInput ?? config.agents?.codex?.enableRequestUserInput ?? true,
|
|
359
|
-
approvalsReviewer: override?.approvalsReviewer ?? config.agents?.codex?.approvalsReviewer,
|
|
360
417
|
agentAid: runtime?.agentAid,
|
|
361
418
|
agentConfig: runtime?.agentConfig,
|
|
362
419
|
};
|
|
363
420
|
}
|
|
364
421
|
const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
|
|
365
422
|
const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
|
|
366
|
-
const globalApiKey = isPlaceholder(config.agents?.codex?.apiKey) ? undefined : config.agents?.codex?.apiKey;
|
|
367
423
|
const environmentApiKey = [process.env.OPENAI_API_KEY, process.env.CODEX_API_KEY]
|
|
368
424
|
.map(value => isPlaceholder(value) ? undefined : value)
|
|
369
425
|
.find((value) => !!value);
|
|
@@ -375,35 +431,31 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
375
431
|
// different credentials.
|
|
376
432
|
const credential = overrideApiKey
|
|
377
433
|
? { 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;
|
|
434
|
+
: configuredBearer
|
|
435
|
+
? { apiKey: configuredBearer, authType: 'bearerToken', authSource: 'config.toml' }
|
|
436
|
+
: environmentApiKey
|
|
437
|
+
? { apiKey: environmentApiKey, authType: 'apiKey', authSource: 'environment' }
|
|
438
|
+
: storedApiKey
|
|
439
|
+
? { apiKey: storedApiKey, authType: 'apiKey', authSource: 'auth.json' }
|
|
440
|
+
: undefined;
|
|
387
441
|
const apiKey = credential?.apiKey;
|
|
388
442
|
const authType = credential?.authType;
|
|
389
443
|
const authSource = credential?.authSource;
|
|
390
444
|
if (!apiKey) {
|
|
391
|
-
throw new Error('No Codex credential found.
|
|
445
|
+
throw new Error('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.');
|
|
392
446
|
}
|
|
393
447
|
const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
|
|
394
448
|
const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
|
|
395
|
-
const globalBaseUrl = isPlaceholderUrl(config.agents?.codex?.baseUrl) ? undefined : config.agents?.codex?.baseUrl;
|
|
396
449
|
const baseUrl = overrideBaseUrl
|
|
397
|
-
|| globalBaseUrl
|
|
398
450
|
|| process.env.OPENAI_BASE_URL
|
|
399
451
|
|| codexSettings.baseUrl
|
|
400
452
|
|| undefined;
|
|
401
|
-
const headers = normalizeStringMap(override?.headers
|
|
402
|
-
const queryParams = normalizeStringMap(override?.queryParams
|
|
453
|
+
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
454
|
+
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
403
455
|
const model = override?.model
|
|
404
456
|
|| config.agents?.codex?.model
|
|
405
457
|
|| codexSettings.model
|
|
406
|
-
||
|
|
458
|
+
|| DEFAULT_CODEX_MODEL;
|
|
407
459
|
const effort = override?.effort
|
|
408
460
|
|| override?.reasoning
|
|
409
461
|
|| config.agents?.codex?.effort
|
|
@@ -412,9 +464,6 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
412
464
|
const enableRequestUserInput = override?.enableRequestUserInput
|
|
413
465
|
?? config.agents?.codex?.enableRequestUserInput
|
|
414
466
|
?? true;
|
|
415
|
-
const approvalsReviewer = override?.approvalsReviewer
|
|
416
|
-
?? config.agents?.codex?.approvalsReviewer
|
|
417
|
-
?? undefined;
|
|
418
467
|
return {
|
|
419
468
|
apiKey,
|
|
420
469
|
authType,
|
|
@@ -426,7 +475,6 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
426
475
|
model,
|
|
427
476
|
effort,
|
|
428
477
|
enableRequestUserInput,
|
|
429
|
-
approvalsReviewer,
|
|
430
478
|
agentAid: runtime?.agentAid,
|
|
431
479
|
agentConfig: runtime?.agentConfig,
|
|
432
480
|
};
|
|
@@ -438,7 +486,7 @@ export function resolveGoogleConfig(config, override) {
|
|
|
438
486
|
if (!cliPath) {
|
|
439
487
|
cliPath = commandExists('gemini') ? 'gemini' : '';
|
|
440
488
|
}
|
|
441
|
-
const model = override?.model || googleCfg?.model ||
|
|
489
|
+
const model = override?.model || googleCfg?.model || DEFAULT_GEMINI_MODEL;
|
|
442
490
|
const providerId = override?.provider ?? googleCfg?.provider;
|
|
443
491
|
if (providerId !== undefined) {
|
|
444
492
|
const provider = resolveProviderService(providerId, 'gemini');
|
|
@@ -448,20 +496,14 @@ export function resolveGoogleConfig(config, override) {
|
|
|
448
496
|
throw new Error(`Provider ${providerId} gemini service queryParams are unsupported by the Gemini CLI runtime`);
|
|
449
497
|
}
|
|
450
498
|
return { cliPath, model, apiKey: provider.apiKey, providerId, baseUrl: provider.baseUrl, headers: provider.headers,
|
|
451
|
-
queryParams: provider.queryParams
|
|
499
|
+
queryParams: provider.queryParams };
|
|
452
500
|
}
|
|
453
501
|
const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
|
|
454
|
-
const globalApiKey = isPlaceholder(googleCfg?.apiKey) ? undefined : googleCfg?.apiKey;
|
|
455
502
|
const apiKey = overrideApiKey
|
|
456
|
-
|| globalApiKey
|
|
457
503
|
|| process.env.GEMINI_API_KEY
|
|
458
504
|
|| process.env.GOOGLE_API_KEY
|
|
459
505
|
|| 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 };
|
|
506
|
+
return { cliPath, model, apiKey };
|
|
465
507
|
}
|
|
466
508
|
// ── EvolCore bundled ecagent ──────────────────────────────────────────
|
|
467
509
|
export const DEFAULT_ECAGENT_BASE_URL = 'https://mg-new.evolai.cn/openclaw-proxy/v1';
|
|
@@ -473,8 +515,7 @@ export function resolveEcagentConfig(config, override) {
|
|
|
473
515
|
const configured = config.agents?.ecagent;
|
|
474
516
|
const providerId = override?.provider ?? configured?.provider;
|
|
475
517
|
if (providerId !== undefined) {
|
|
476
|
-
const
|
|
477
|
-
const provider = resolveProviderServiceForBaseagent(providerId, 'ecagent', providerServiceType);
|
|
518
|
+
const provider = resolveProviderServiceForBaseagent(providerId, 'ecagent');
|
|
478
519
|
if (provider.style !== 'openai-compatible') {
|
|
479
520
|
throw new Error(`Provider ${providerId} uses unsupported ecagent style: ${provider.style}`);
|
|
480
521
|
}
|
|
@@ -501,19 +542,17 @@ export function resolveEcagentConfig(config, override) {
|
|
|
501
542
|
|| value.includes('your-')
|
|
502
543
|
|| value.includes('placeholder');
|
|
503
544
|
const apiKey = (isPlaceholder(override?.apiKey) ? undefined : override?.apiKey)
|
|
504
|
-
|| (isPlaceholder(configured?.apiKey) ? undefined : configured?.apiKey)
|
|
505
545
|
|| process.env.ECAGENT_API_KEY
|
|
506
546
|
|| process.env.OPENAI_API_KEY;
|
|
507
547
|
if (!apiKey) {
|
|
508
|
-
throw new Error('No ecagent API key found.
|
|
548
|
+
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
549
|
}
|
|
510
550
|
const baseUrl = (override?.baseUrl && !override.baseUrl.includes('placeholder') ? override.baseUrl : undefined)
|
|
511
|
-
|| (configured?.baseUrl && !configured.baseUrl.includes('placeholder') ? configured.baseUrl : undefined)
|
|
512
551
|
|| process.env.ECAGENT_BASE_URL
|
|
513
552
|
|| DEFAULT_ECAGENT_BASE_URL;
|
|
514
553
|
const model = override?.model || configured?.model || DEFAULT_ECAGENT_MODEL;
|
|
515
|
-
const headers = normalizeStringMap(override?.headers
|
|
516
|
-
const queryParams = normalizeStringMap(override?.queryParams
|
|
554
|
+
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
555
|
+
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
517
556
|
const effort = override?.effort ?? configured?.effort;
|
|
518
557
|
const numberOr = (value, fallback) => (typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : fallback);
|
|
519
558
|
return {
|