evolcore 0.0.41-test.0 → 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 +49 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +20 -43
- package/dist/agents/claude-runner.js +177 -92
- package/dist/agents/codex-runner.js +84 -28
- package/dist/agents/ecagent-runner.js +1 -1
- package/dist/agents/gemini-runner.js +1 -1
- 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/msg/managed-operation.js +68 -7
- package/dist/aun/msg/p2p.js +5 -0
- package/dist/aun/service-proxy.js +36 -12
- package/dist/channels/aun.js +334 -20
- package/dist/channels/daemon.js +15 -1
- package/dist/cli/aun-commands.js +4 -20
- package/dist/cli/daemon-commands.js +678 -697
- 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/role.js +85 -0
- package/dist/config/access-policy.js +7 -2
- 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 +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/peer-role-resolver.js +13 -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-runtime.js +1 -1
- package/dist/core/auth/agent-delegation.js +2 -1
- package/dist/core/auth/auth-gateway.js +1 -1
- package/dist/core/auth/authorization-audit.js +17 -6
- 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 +31 -6
- package/dist/core/command/agent-control.js +3 -7
- 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 +48 -99
- 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 +5 -6
- package/dist/core/command/menu-handler.js +49 -62
- package/dist/core/command/role-menu.js +147 -30
- package/dist/core/command/slash-handler.js +123 -254
- package/dist/core/daemon-control.js +8 -14
- 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 +6 -2
- 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 +189 -189
- 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 +8 -2
- package/dist/core/message/im-renderer.js +7 -4
- package/dist/core/message/message-admission.js +89 -4
- package/dist/core/message/message-bridge.js +31 -18
- package/dist/core/message/response-engine.js +77 -8
- 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 +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 +23 -21
- package/dist/core/permission/ec-command-parser.js +30 -2
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +14 -3
- 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 +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 +76 -14
- package/dist/ipc.js +170 -12
- 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/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +2 -2
- package/dist/utils/logger.js +24 -5
- package/dist/utils/package-version-info.js +4 -2
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/agent.md +1 -1
- package/kits/docs/evolcore/config.md +17 -6
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/fs.md +11 -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 +4 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +4 -7
- 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 +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 +260 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +3 -7
- 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/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/memory.md +4 -4
- package/package.json +6 -2
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,55 @@
|
|
|
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
|
+
|
|
8
57
|
## 0.0.41 (2026-10-27)
|
|
9
58
|
|
|
10
59
|
### 会话与上下文
|
|
@@ -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 {
|
|
@@ -662,7 +662,7 @@ export class AgentRunner {
|
|
|
662
662
|
if (!this.agentAid)
|
|
663
663
|
return this.config;
|
|
664
664
|
try {
|
|
665
|
-
const raw = resolveEffective({ self: this.agentAid }, { cache: true
|
|
665
|
+
const raw = resolveEffective({ self: this.agentAid }, { cache: true });
|
|
666
666
|
return { agents: { claude: raw.baseagents?.claude ?? this.config?.agents?.claude } };
|
|
667
667
|
}
|
|
668
668
|
catch {
|
|
@@ -733,7 +733,7 @@ export class AgentRunner {
|
|
|
733
733
|
let agentConfig = this.agentConfig;
|
|
734
734
|
if (this.agentAid) {
|
|
735
735
|
try {
|
|
736
|
-
agentConfig = resolveEffective({ self: this.agentAid }, { cache: true
|
|
736
|
+
agentConfig = resolveEffective({ self: this.agentAid }, { cache: true });
|
|
737
737
|
}
|
|
738
738
|
catch { }
|
|
739
739
|
}
|
|
@@ -2174,51 +2174,59 @@ export class AgentRunner {
|
|
|
2174
2174
|
}
|
|
2175
2175
|
: resolvePhaseOneExecutionSandbox(callPermissionMode, runPermissionContext?.role);
|
|
2176
2176
|
const inputId = modelOverride?.turn?.inputId ?? crypto.randomUUID();
|
|
2177
|
-
|
|
2178
|
-
|
|
2179
|
-
|
|
2180
|
-
|
|
2181
|
-
|
|
2182
|
-
|
|
2183
|
-
|
|
2184
|
-
|
|
2185
|
-
|
|
2186
|
-
|
|
2187
|
-
|
|
2188
|
-
|
|
2189
|
-
|
|
2190
|
-
|
|
2191
|
-
|
|
2192
|
-
|
|
2193
|
-
|
|
2194
|
-
|
|
2195
|
-
|
|
2196
|
-
|
|
2197
|
-
|
|
2198
|
-
|
|
2199
|
-
|
|
2200
|
-
|
|
2201
|
-
|
|
2202
|
-
|
|
2203
|
-
|
|
2204
|
-
|
|
2205
|
-
|
|
2206
|
-
|
|
2207
|
-
|
|
2208
|
-
|
|
2209
|
-
|
|
2210
|
-
|
|
2211
|
-
|
|
2212
|
-
|
|
2213
|
-
|
|
2214
|
-
|
|
2215
|
-
|
|
2216
|
-
|
|
2217
|
-
|
|
2218
|
-
|
|
2219
|
-
|
|
2220
|
-
|
|
2221
|
-
|
|
2177
|
+
const activeSandboxFailure = executionSandbox.state !== 'off'
|
|
2178
|
+
? getActiveSandboxInitializationFailure(undefined, undefined, sessionId)
|
|
2179
|
+
: undefined;
|
|
2180
|
+
let sandboxFallback = !!activeSandboxFailure && process.platform === 'linux';
|
|
2181
|
+
if (activeSandboxFailure) {
|
|
2182
|
+
const detail = createSandboxInitializationError(new Error(`sandbox bootstrap circuit open; firstObservedAt=${activeSandboxFailure.openedAt} ` +
|
|
2183
|
+
`occurrences=${activeSandboxFailure.occurrences}; ${activeSandboxFailure.detail}`));
|
|
2184
|
+
const context = this.permissionContexts.get(sessionId);
|
|
2185
|
+
auditToolInfrastructureFailure({
|
|
2186
|
+
toolName: 'Bash',
|
|
2187
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
2188
|
+
reason: detail.message.slice(0, 512),
|
|
2189
|
+
sessionId,
|
|
2190
|
+
agentAid: context?.selfAid,
|
|
2191
|
+
agentName: context?.agentName,
|
|
2192
|
+
permissionMode: callPermissionMode,
|
|
2193
|
+
role: context?.role,
|
|
2194
|
+
callId: inputId,
|
|
2195
|
+
taskId: context?.taskId,
|
|
2196
|
+
occurrences: activeSandboxFailure.occurrences,
|
|
2197
|
+
fallback: sandboxFallback,
|
|
2198
|
+
sandboxFailure: {
|
|
2199
|
+
kind: activeSandboxFailure.kind,
|
|
2200
|
+
observation: sandboxFallback ? 'fallback' : 'circuit_open',
|
|
2201
|
+
counters: getSandboxInitializationFailureCounters(),
|
|
2202
|
+
},
|
|
2203
|
+
});
|
|
2204
|
+
await context?.recordExecutionAnomaly?.({
|
|
2205
|
+
code: 'capability_unavailable',
|
|
2206
|
+
severity: 'warning',
|
|
2207
|
+
phase: 'execution',
|
|
2208
|
+
occurredAt: Date.now(),
|
|
2209
|
+
correlationId: inputId,
|
|
2210
|
+
requestId: inputId,
|
|
2211
|
+
sessionId,
|
|
2212
|
+
toolName: 'Bash',
|
|
2213
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
2214
|
+
decisionSource: 'infrastructure',
|
|
2215
|
+
agentAid: context?.selfAid,
|
|
2216
|
+
agentName: context?.agentName,
|
|
2217
|
+
permissionMode: callPermissionMode,
|
|
2218
|
+
summary: detail.message.slice(0, 512),
|
|
2219
|
+
effect: sandboxFallback ? 'fallback_used' : 'operation_skipped',
|
|
2220
|
+
});
|
|
2221
|
+
if (sandboxFallback) {
|
|
2222
|
+
logger.warn(`[ClaudeSandbox] inner sandbox circuit open; continuing with outer H-class guard ` +
|
|
2223
|
+
`cooldownMs=${SANDBOX_INITIALIZATION_COOLDOWN_MS} occurrences=${activeSandboxFailure.occurrences}`);
|
|
2224
|
+
}
|
|
2225
|
+
else if (shouldLogSandboxCircuitNotice()) {
|
|
2226
|
+
logger.warn(`[ClaudeSandbox] bootstrap circuit open; skipping subprocess spawn ` +
|
|
2227
|
+
`cooldownMs=${SANDBOX_INITIALIZATION_COOLDOWN_MS} occurrences=${activeSandboxFailure.occurrences}`);
|
|
2228
|
+
}
|
|
2229
|
+
if (!sandboxFallback)
|
|
2222
2230
|
return (async function* () {
|
|
2223
2231
|
yield {
|
|
2224
2232
|
type: 'complete',
|
|
@@ -2229,7 +2237,6 @@ export class AgentRunner {
|
|
|
2229
2237
|
queryFinal: true,
|
|
2230
2238
|
};
|
|
2231
2239
|
})();
|
|
2232
|
-
}
|
|
2233
2240
|
}
|
|
2234
2241
|
const permissionPrompt = runPermissionContext?.sendPrompt ?? this.sendPromptFn;
|
|
2235
2242
|
const permissionContext = (signal) => {
|
|
@@ -2707,7 +2714,7 @@ export class AgentRunner {
|
|
|
2707
2714
|
const excludeDynamic = this.config?.agents?.claude?.excludeDynamicSections === true;
|
|
2708
2715
|
// 公共 options(新旧模式共用)
|
|
2709
2716
|
const sdkPermissionMode = this.toSdkPermissionMode(requestedPermissionMode);
|
|
2710
|
-
// 本次调用使用的模型/强度:优先 modelOverride(
|
|
2717
|
+
// 本次调用使用的模型/强度:优先 modelOverride(response-engine 取 Agent 级配置后传入),
|
|
2711
2718
|
// 缺省回落 agent 级 this.model。作为 per-call 入参传入,无共享状态,多对端并发互不污染。
|
|
2712
2719
|
const callModel = modelOverride?.model || this.model;
|
|
2713
2720
|
const callEffort = (modelOverride?.effortMode === 'model_default'
|
|
@@ -2716,7 +2723,7 @@ export class AgentRunner {
|
|
|
2716
2723
|
const callSessionTitle = sanitizeSessionTitle(modelOverride?.sessionTitle);
|
|
2717
2724
|
logger.info(`[AgentRunner] runQuery model=${callModel} effort=${callEffort ?? 'auto'} ` +
|
|
2718
2725
|
`permMode=${requestedPermissionMode}->${callPermissionMode} role=${runPermissionContext?.role ?? 'none'} ` +
|
|
2719
|
-
`sandbox=${executionSandbox.state} sdkMode=${sdkPermissionMode}`);
|
|
2726
|
+
`sandbox=${sandboxFallback ? 'outer-guard-fallback' : executionSandbox.state} sdkMode=${sdkPermissionMode}`);
|
|
2720
2727
|
if (systemPromptAppend) {
|
|
2721
2728
|
logger.info(`[AgentRunner] systemPromptAppend: ${systemPromptAppend.length} chars`);
|
|
2722
2729
|
}
|
|
@@ -2726,14 +2733,16 @@ export class AgentRunner {
|
|
|
2726
2733
|
const catalogModel = resolveCatalogModel(runCatalog, callModel);
|
|
2727
2734
|
const { sdkModel, contextWindow } = resolveClaudeModelContext(catalogModel, runCatalog);
|
|
2728
2735
|
const agentEnv = this.getAgentEnv(runtimeEnv, sessionId, callPermissionMode, modelOverride?.provider);
|
|
2729
|
-
const dependencies = executionSandbox.state !== 'off'
|
|
2736
|
+
const dependencies = executionSandbox.state !== 'off' && !sandboxFallback
|
|
2737
|
+
? inspectClaudeSandboxDependencies(agentEnv)
|
|
2738
|
+
: undefined;
|
|
2730
2739
|
if (dependencies?.status === 'missing')
|
|
2731
2740
|
throw createClaudeSandboxDependencyError(dependencies);
|
|
2732
2741
|
const capabilityOptions = await this.resolveCapabilityRunOptions(projectPath);
|
|
2733
2742
|
const managedSettings = callPermissionMode === 'fullaccess'
|
|
2734
2743
|
? undefined
|
|
2735
2744
|
: buildClaudeManagedLockdownSettings(capabilityOptions, dependencies);
|
|
2736
|
-
|
|
2745
|
+
let sandboxOptions = executionSandbox.state === 'off' || sandboxFallback
|
|
2737
2746
|
? { enabled: false }
|
|
2738
2747
|
: await (async () => {
|
|
2739
2748
|
const sandboxProjectionStartedAt = Date.now();
|
|
@@ -2812,7 +2821,8 @@ export class AgentRunner {
|
|
|
2812
2821
|
...(managedSettings ? { managedSettings } : {}),
|
|
2813
2822
|
...(callEffort ? { effort: callEffort } : {}),
|
|
2814
2823
|
...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
|
|
2815
|
-
...(executionSandbox.state === 'off'
|
|
2824
|
+
...((executionSandbox.state === 'off' || sandboxFallback)
|
|
2825
|
+
&& callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
|
|
2816
2826
|
spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid),
|
|
2817
2827
|
} : {}),
|
|
2818
2828
|
autoCompactWindow: sdkAutoCompactWindowForModel(sdkModel, contextWindow),
|
|
@@ -2985,46 +2995,100 @@ export class AgentRunner {
|
|
|
2985
2995
|
}
|
|
2986
2996
|
}
|
|
2987
2997
|
let sdkStream;
|
|
2988
|
-
const
|
|
2989
|
-
|
|
2990
|
-
|
|
2991
|
-
|
|
2992
|
-
|
|
2993
|
-
|
|
2994
|
-
|
|
2995
|
-
|
|
2996
|
-
|
|
2997
|
-
|
|
2998
|
-
|
|
2999
|
-
|
|
3000
|
-
|
|
3001
|
-
|
|
3002
|
-
|
|
3003
|
-
|
|
3004
|
-
|
|
2998
|
+
const createMessageStream = () => {
|
|
2999
|
+
const stream = new MessageStream();
|
|
3000
|
+
stream.push(prompt, images && images.length > 0 ? images : undefined, inputId);
|
|
3001
|
+
return stream;
|
|
3002
|
+
};
|
|
3003
|
+
let msgStream = createMessageStream();
|
|
3004
|
+
const retryWithOuterGuard = async (error, stderr, failureAlreadyRecorded = false) => {
|
|
3005
|
+
if (process.platform !== 'linux' || executionSandbox.state === 'off' || sandboxFallback
|
|
3006
|
+
|| !isSandboxInitializationFailure(error, stderr))
|
|
3007
|
+
return false;
|
|
3008
|
+
const previousCircuit = failureAlreadyRecorded
|
|
3009
|
+
? getActiveSandboxInitializationFailure(undefined, undefined, sessionId)
|
|
3010
|
+
: undefined;
|
|
3011
|
+
const { detail, occurrences } = failureAlreadyRecorded
|
|
3012
|
+
? {
|
|
3013
|
+
detail: createSandboxInitializationError(error, stderr),
|
|
3014
|
+
occurrences: previousCircuit?.occurrences ?? 1,
|
|
3005
3015
|
}
|
|
3006
|
-
|
|
3016
|
+
: await this.recordSandboxInfrastructureFailure(sessionId, inputId, callPermissionMode, error, stderr);
|
|
3017
|
+
const context = this.permissionContexts.get(sessionId);
|
|
3018
|
+
const circuit = previousCircuit ?? getActiveSandboxInitializationFailure(undefined, undefined, sessionId);
|
|
3019
|
+
if (circuit) {
|
|
3020
|
+
auditToolInfrastructureFailure({
|
|
3021
|
+
toolName: 'Bash',
|
|
3022
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
3023
|
+
reason: detail.message.slice(0, 512),
|
|
3024
|
+
sessionId,
|
|
3025
|
+
agentAid: context?.selfAid,
|
|
3026
|
+
agentName: context?.agentName,
|
|
3027
|
+
permissionMode: callPermissionMode,
|
|
3028
|
+
role: context?.role,
|
|
3029
|
+
callId: inputId,
|
|
3030
|
+
taskId: context?.taskId,
|
|
3031
|
+
occurrences,
|
|
3032
|
+
fallback: true,
|
|
3033
|
+
sandboxFailure: {
|
|
3034
|
+
kind: circuit.kind,
|
|
3035
|
+
observation: 'fallback',
|
|
3036
|
+
counters: getSandboxInitializationFailureCounters(),
|
|
3037
|
+
},
|
|
3038
|
+
});
|
|
3007
3039
|
}
|
|
3008
|
-
|
|
3009
|
-
|
|
3010
|
-
|
|
3011
|
-
|
|
3012
|
-
|
|
3013
|
-
|
|
3040
|
+
await context?.recordExecutionAnomaly?.({
|
|
3041
|
+
code: 'capability_unavailable',
|
|
3042
|
+
severity: 'warning',
|
|
3043
|
+
phase: 'execution',
|
|
3044
|
+
occurredAt: Date.now(),
|
|
3045
|
+
correlationId: inputId,
|
|
3046
|
+
requestId: inputId,
|
|
3047
|
+
sessionId,
|
|
3048
|
+
toolName: 'Bash',
|
|
3049
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
3050
|
+
decisionSource: 'infrastructure',
|
|
3051
|
+
agentAid: context?.selfAid,
|
|
3052
|
+
agentName: context?.agentName,
|
|
3053
|
+
permissionMode: callPermissionMode,
|
|
3054
|
+
summary: `Claude inner sandbox unavailable; retrying with outer H-class guard: ${detail.message}`.slice(0, 512),
|
|
3055
|
+
effect: 'fallback_used',
|
|
3056
|
+
});
|
|
3057
|
+
sandboxFallback = true;
|
|
3058
|
+
sandboxOptions = { enabled: false };
|
|
3059
|
+
commonOptions.sandbox = sandboxOptions;
|
|
3060
|
+
if (callPermissionMode !== 'fullaccess') {
|
|
3061
|
+
commonOptions.spawnClaudeCodeProcess = (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid);
|
|
3014
3062
|
}
|
|
3015
|
-
|
|
3016
|
-
|
|
3017
|
-
|
|
3018
|
-
|
|
3019
|
-
|
|
3020
|
-
|
|
3021
|
-
|
|
3022
|
-
|
|
3023
|
-
|
|
3024
|
-
|
|
3025
|
-
|
|
3026
|
-
|
|
3063
|
+
logger.warn(`[ClaudeSandbox] inner sandbox initialization failed; retrying with outer H-class guard session=${sessionId}: ${detail.message}`);
|
|
3064
|
+
return true;
|
|
3065
|
+
};
|
|
3066
|
+
const createPushedQuery = () => {
|
|
3067
|
+
msgStream = createMessageStream();
|
|
3068
|
+
return createQuery(msgStream, agentSessionId, resumeAt);
|
|
3069
|
+
};
|
|
3070
|
+
try {
|
|
3071
|
+
if (images && images.length > 0) {
|
|
3072
|
+
logger.info('[AgentRunner] Creating query with images:', images.length, 'first image size:', images[0]?.data?.length ?? 0);
|
|
3073
|
+
}
|
|
3074
|
+
else {
|
|
3075
|
+
logger.debug('[AgentRunner] Creating query with text only, agentSessionId:', initialClaudeSessionId);
|
|
3027
3076
|
}
|
|
3077
|
+
sdkStream = createPushedQuery();
|
|
3078
|
+
}
|
|
3079
|
+
catch (error) {
|
|
3080
|
+
const stderr = this.recentStderr.get(sessionId) ?? [];
|
|
3081
|
+
if (isClaudeStartupArgumentsTooLong(error))
|
|
3082
|
+
throw createClaudeStartupArgumentsTooLongError(error);
|
|
3083
|
+
if (isClaudeCodeStartupProcessError(error))
|
|
3084
|
+
throw createClaudeCodeStartupError(error);
|
|
3085
|
+
if (await retryWithOuterGuard(error, stderr))
|
|
3086
|
+
sdkStream = createPushedQuery();
|
|
3087
|
+
else if (isSandboxInitializationFailure(error, stderr)) {
|
|
3088
|
+
throw createSandboxInitializationError(error, stderr);
|
|
3089
|
+
}
|
|
3090
|
+
else
|
|
3091
|
+
throw error;
|
|
3028
3092
|
}
|
|
3029
3093
|
this.activeMessageStreams.set(sessionId, msgStream);
|
|
3030
3094
|
this.activeQueries.set(sessionId, sdkStream);
|
|
@@ -3037,11 +3101,32 @@ export class AgentRunner {
|
|
|
3037
3101
|
this.interruptFns.set(sessionId, () => sdkStream.interrupt());
|
|
3038
3102
|
}
|
|
3039
3103
|
// 返回标准 AgentEvent 流(重试由 MessageProcessor 层负责)
|
|
3040
|
-
|
|
3104
|
+
let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
|
|
3041
3105
|
const self = this;
|
|
3042
3106
|
return (async function* () {
|
|
3043
3107
|
try {
|
|
3044
|
-
|
|
3108
|
+
let emittedAnyEvent = false;
|
|
3109
|
+
for await (const event of transformed) {
|
|
3110
|
+
if (!emittedAnyEvent && event.type === 'complete'
|
|
3111
|
+
&& event.terminalReason === SANDBOX_INITIALIZATION_FAILED
|
|
3112
|
+
&& await retryWithOuterGuard(new Error(event.errors?.[0] ?? SANDBOX_INITIALIZATION_FAILED), [], true)) {
|
|
3113
|
+
sdkStream = createPushedQuery();
|
|
3114
|
+
self.activeQueries.set(sessionId, sdkStream);
|
|
3115
|
+
self.activeMessageStreams.set(sessionId, msgStream);
|
|
3116
|
+
if ('interrupt' in sdkStream && typeof sdkStream.interrupt === 'function') {
|
|
3117
|
+
self.interruptFns.set(sessionId, () => sdkStream.interrupt());
|
|
3118
|
+
}
|
|
3119
|
+
else {
|
|
3120
|
+
self.interruptFns.delete(sessionId);
|
|
3121
|
+
}
|
|
3122
|
+
transformed = self.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, undefined, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
|
|
3123
|
+
emittedAnyEvent = false;
|
|
3124
|
+
yield* transformed;
|
|
3125
|
+
return;
|
|
3126
|
+
}
|
|
3127
|
+
emittedAnyEvent = true;
|
|
3128
|
+
yield event;
|
|
3129
|
+
}
|
|
3045
3130
|
}
|
|
3046
3131
|
finally {
|
|
3047
3132
|
self.cleanupSandboxSettingsFile(sessionId, sandboxSettingsFile);
|
|
@@ -3553,7 +3638,7 @@ export class ClaudeAgentPlugin {
|
|
|
3553
3638
|
}
|
|
3554
3639
|
createAgent(agent, callbacks) {
|
|
3555
3640
|
const override = agent.config.baseagents?.claude;
|
|
3556
|
-
const rawConfig = resolveEffective({ self: agent.aid }, { cache: true
|
|
3641
|
+
const rawConfig = resolveEffective({ self: agent.aid }, { cache: true });
|
|
3557
3642
|
const anthropic = resolveAnthropicConfig({ agents: { claude: rawConfig.baseagents?.claude } }, undefined, { agentAid: agent.aid, projectPath: agent.projectPath });
|
|
3558
3643
|
const merged = {
|
|
3559
3644
|
agents: { claude: { ...(override || {}) } },
|