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.
Files changed (226) hide show
  1. package/CHANGELOG.md +94 -1
  2. package/bin/codex-managed-hook.mjs +11 -0
  3. package/bin/ec-safe-output.js +11 -1
  4. package/dist/agents/baseagent-availability.js +1 -1
  5. package/dist/agents/baseagent.js +20 -43
  6. package/dist/agents/claude-runner.js +197 -197
  7. package/dist/agents/codex-runner.js +535 -259
  8. package/dist/agents/ecagent-runner.js +31 -12
  9. package/dist/agents/gemini-runner.js +27 -7
  10. package/dist/agents/runner-types.js +11 -3
  11. package/dist/aun/ability-device-routing.js +26 -0
  12. package/dist/aun/aid/client.js +1 -1
  13. package/dist/aun/group/fs-download.js +39 -0
  14. package/dist/aun/group/identity.js +36 -13
  15. package/dist/aun/group/operations.js +5 -0
  16. package/dist/aun/msg/managed-operation.js +72 -11
  17. package/dist/aun/msg/p2p.js +32 -7
  18. package/dist/aun/service-proxy.js +36 -12
  19. package/dist/aun/storage/download.js +30 -0
  20. package/dist/aun/storage/index.js +14 -6
  21. package/dist/channels/aun.js +367 -24
  22. package/dist/channels/daemon.js +39 -5
  23. package/dist/cli/agent-command.js +2 -0
  24. package/dist/cli/agent-create.js +98 -19
  25. package/dist/cli/agent.js +10 -3
  26. package/dist/cli/aun-commands.js +85 -41
  27. package/dist/cli/daemon-commands.js +678 -688
  28. package/dist/cli/fs-command.js +64 -2
  29. package/dist/cli/index.js +48 -4
  30. package/dist/cli/managed-command-guard.js +4 -0
  31. package/dist/cli/model.js +40 -40
  32. package/dist/cli/proxy-command.js +92 -0
  33. package/dist/cli/restart-monitor.js +17 -0
  34. package/dist/cli/role.js +85 -0
  35. package/dist/cli/session-command.js +128 -13
  36. package/dist/cli/stats.js +60 -4
  37. package/dist/cli/trigger-command.js +2 -2
  38. package/dist/config/access-policy.js +8 -1
  39. package/dist/config/boot-log.js +38 -1
  40. package/dist/config/config-field-policy.js +5 -32
  41. package/dist/config/config-manager.js +46 -39
  42. package/dist/config/config-operation-service.js +8 -11
  43. package/dist/config/contact-book-store.js +47 -21
  44. package/dist/config/contact-book.js +18 -12
  45. package/dist/config/contact-operation-service.js +3 -4
  46. package/dist/config/contact-request-service.js +11 -0
  47. package/dist/config/daemon-services.js +11 -0
  48. package/dist/config/gateway-config.js +89 -595
  49. package/dist/config/peer-role-resolver.js +15 -11
  50. package/dist/config/providers-config.js +12 -7
  51. package/dist/config/providers-import.js +3 -21
  52. package/dist/config/resolved-config-op.js +3 -0
  53. package/dist/config/role-command-service.js +166 -0
  54. package/dist/config/role-request-service.js +193 -0
  55. package/dist/config/schema-migration.js +686 -25
  56. package/dist/config-store.js +79 -3
  57. package/dist/contracts/ecweb-instance.js +41 -0
  58. package/dist/contracts/ecweb-service-protocol.js +3 -1
  59. package/dist/core/agent-application-service.js +11 -1
  60. package/dist/core/agent-ipc-registration.js +4 -0
  61. package/dist/core/agent-runtime.js +1 -1
  62. package/dist/core/auth/agent-delegation.js +82 -6
  63. package/dist/core/auth/auth-gateway.js +1 -1
  64. package/dist/core/auth/authorization-audit.js +37 -9
  65. package/dist/core/auth/delegation-authorization.js +3 -1
  66. package/dist/core/auth/operation-authorizer.js +15 -0
  67. package/dist/core/auth/operation-catalog.js +39 -6
  68. package/dist/core/command/agent-control.js +94 -19
  69. package/dist/core/command/agent-storage-menu.js +5 -3
  70. package/dist/core/command/cli-intent-parser.js +2 -1
  71. package/dist/core/command/command-handler.js +105 -145
  72. package/dist/core/command/connect-menu.js +31 -2
  73. package/dist/core/command/data-root-resolver.js +5 -4
  74. package/dist/core/command/memory-slash.js +16 -8
  75. package/dist/core/command/menu-catalog.js +6 -6
  76. package/dist/core/command/menu-handler.js +87 -163
  77. package/dist/core/command/menu-protocol.js +9 -2
  78. package/dist/core/command/role-menu.js +148 -30
  79. package/dist/core/command/slash-gate.js +13 -10
  80. package/dist/core/command/slash-handler.js +157 -352
  81. package/dist/core/daemon-control.js +8 -14
  82. package/dist/core/event-catalog.js +15 -0
  83. package/dist/core/evolagent-registry.js +4 -4
  84. package/dist/core/evolagent.js +2 -2
  85. package/dist/core/inference/text-inference.js +31 -40
  86. package/dist/core/ipc-registration.js +24 -3
  87. package/dist/core/memory/consolidation-context.js +51 -5
  88. package/dist/core/memory/consolidation-ops-records.js +1 -1
  89. package/dist/core/memory/consolidation-trigger.js +190 -190
  90. package/dist/core/memory/consolidation.js +316 -29
  91. package/dist/core/memory/forget-log.js +96 -0
  92. package/dist/core/memory/index-manager.js +27 -5
  93. package/dist/core/memory/memory-admin.js +45 -5
  94. package/dist/core/memory/memory-writer.js +163 -18
  95. package/dist/core/memory/relation-idle-monitor.js +119 -58
  96. package/dist/core/memory/relation-sweep.js +44 -39
  97. package/dist/core/message/aun-ipc-sender.js +34 -7
  98. package/dist/core/message/aun-request-registry.js +97 -3
  99. package/dist/core/message/im-renderer.js +11 -4
  100. package/dist/core/message/message-admission.js +97 -8
  101. package/dist/core/message/message-bridge.js +71 -24
  102. package/dist/core/message/message-log.js +55 -0
  103. package/dist/core/message/message-queue.js +5 -5
  104. package/dist/core/message/response-engine.js +387 -144
  105. package/dist/core/model/catalog-service.js +4 -2
  106. package/dist/core/model/config-scope.js +24 -64
  107. package/dist/core/model/field-scope.js +1 -1
  108. package/dist/core/model/model-catalog.js +37 -47
  109. package/dist/core/model/model-diagnostics.js +4 -3
  110. package/dist/core/model/model-fallback.js +10 -7
  111. package/dist/core/model/model-permission.js +3 -2
  112. package/dist/core/ownership/owner-resolver.js +25 -23
  113. package/dist/core/permission/ec-command-parser.js +138 -5
  114. package/dist/core/permission/sandbox-runtime.js +18 -1
  115. package/dist/core/permission/tool-policy.js +42 -10
  116. package/dist/core/relation/peer-identity.js +64 -1
  117. package/dist/core/role/runtime-policy.js +72 -13
  118. package/dist/core/session/session-capsule.js +197 -0
  119. package/dist/core/session/session-idle-monitor.js +1 -1
  120. package/dist/core/session/session-manager.js +168 -14
  121. package/dist/core/session/session-mapper.js +2 -0
  122. package/dist/core/session/session-renew.js +3 -3
  123. package/dist/core/skill/index-generator.js +15 -5
  124. package/dist/core/system-session/memory.js +6 -1
  125. package/dist/core/thread/thread-service.js +19 -6
  126. package/dist/directory/owner-directory-admission.js +95 -0
  127. package/dist/directory/owner-directory-authorization.js +309 -0
  128. package/dist/directory/owner-directory-cache.js +635 -0
  129. package/dist/eck/kit-renderer.js +2 -2
  130. package/dist/ecweb/basic-settings-service.js +33 -40
  131. package/dist/ecweb/message-context-service.js +110 -0
  132. package/dist/index.js +79 -17
  133. package/dist/ipc.js +189 -17
  134. package/dist/paths.js +4 -0
  135. package/dist/proxy/command.js +122 -0
  136. package/dist/proxy/ipc-service.js +68 -0
  137. package/dist/proxy/manager.js +485 -0
  138. package/dist/proxy/service-supervisor.js +603 -0
  139. package/dist/response-system/engines/v1/proactive-flow.js +16 -6
  140. package/dist/stats/budget.js +1 -1
  141. package/dist/stats/db.js +15 -0
  142. package/dist/stats/index.js +2 -2
  143. package/dist/stats/price-resolver.js +304 -5
  144. package/dist/stats/query.js +82 -3
  145. package/dist/stats/writer.js +38 -5
  146. package/dist/trigger/feedback.js +18 -7
  147. package/dist/trigger/manager.js +20 -3
  148. package/dist/trigger/parser.js +6 -3
  149. package/dist/trigger/patch.js +1 -1
  150. package/dist/trigger/system-definitions.js +43 -7
  151. package/dist/trigger/validation.js +13 -5
  152. package/dist/utils/cross-platform.js +14 -0
  153. package/dist/utils/ecweb-supervisor.js +258 -83
  154. package/dist/utils/error-utils.js +16 -2
  155. package/dist/utils/logger.js +24 -5
  156. package/dist/utils/npm-ops.js +2 -1
  157. package/dist/utils/package-version-info.js +5 -3
  158. package/dist/utils/upgrade-jobs.js +45 -5
  159. package/kits/docs/INDEX.md +1 -1
  160. package/kits/docs/aun/ABILITY_CALLING.md +20 -2
  161. package/kits/docs/channels/aun.md +9 -0
  162. package/kits/docs/evolcore/INDEX.md +2 -1
  163. package/kits/docs/evolcore/agent-create.md +3 -2
  164. package/kits/docs/evolcore/agent.md +1 -1
  165. package/kits/docs/evolcore/config.md +18 -7
  166. package/kits/docs/evolcore/contact.md +3 -0
  167. package/kits/docs/evolcore/event.md +1 -0
  168. package/kits/docs/evolcore/fs.md +16 -0
  169. package/kits/docs/evolcore/memory-architecture.md +2 -2
  170. package/kits/docs/evolcore/memory-consolidation.md +32 -8
  171. package/kits/docs/evolcore/memory.md +1 -1
  172. package/kits/docs/evolcore/menu-protocol.md +36 -0
  173. package/kits/docs/evolcore/model.md +23 -20
  174. package/kits/docs/evolcore/msg.md +21 -8
  175. package/kits/docs/evolcore/session.md +14 -0
  176. package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
  177. package/kits/schemas/_meta.json +37 -4
  178. package/kits/schemas/agent-config.schema.13.json +23 -3
  179. package/kits/schemas/agent-config.schema.16.json +891 -0
  180. package/kits/schemas/daemon.schema.9.json +366 -0
  181. package/kits/schemas/defaults.schema.5.json +406 -127
  182. package/kits/schemas/relation-config.schema.11.json +260 -0
  183. package/kits/schemas/role-config.schema.1.json +7 -7
  184. package/kits/skills/.switches.json +3 -7
  185. package/kits/skills/aid-ability/SKILL.md +35 -6
  186. package/kits/skills/ec-service-proxy/SKILL.md +118 -0
  187. package/kits/skills/ec-trigger/SKILL.md +13 -5
  188. package/kits/skills/personal-assistant/SKILL.md +176 -0
  189. package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
  190. package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
  191. package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
  192. package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
  193. package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
  194. package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
  195. package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
  196. package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
  197. package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
  198. package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
  199. package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
  200. package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
  201. package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
  202. package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
  203. package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
  204. package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
  205. package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
  206. package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
  207. package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
  208. package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
  209. package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
  210. package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
  211. package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
  212. package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
  213. package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
  214. package/kits/templates/memory-consolidation/forget.md +19 -6
  215. package/kits/templates/memory-consolidation/notes.md +1 -1
  216. package/kits/templates/memory-consolidation/profile.md +2 -2
  217. package/kits/templates/memory-consolidation/promote.md +20 -3
  218. package/kits/templates/roles/member.json +8 -1
  219. package/kits/templates/session-capsule/recovery.md +5 -0
  220. package/kits/templates/session-capsule/renew.md +5 -0
  221. package/kits/templates/system-fragments/baseagent.md +2 -2
  222. package/kits/templates/system-fragments/bootstrap.md +6 -6
  223. package/kits/templates/system-fragments/channel.md +1 -1
  224. package/kits/templates/system-fragments/memory.md +4 -4
  225. package/package.json +7 -3
  226. package/dist/stats/billing.js +0 -215
@@ -33,8 +33,8 @@ import { buildClaudeUnixSocketAllowlist } from '../core/permission/unix-socket-p
33
33
  import { auditToolInfrastructureFailure, auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
34
34
  import { getManagedTaskTempDir, isManagedSessionRuntimeDir } from '../cli/task-context.js';
35
35
  import { unsettledInterruptError, withInterruptDeadline, hasTrustedFullAccessContext } from './runner-types.js';
36
- import { resolveModelSpec } from '../stats/billing.js';
37
- import { contextTokensForUsage, usageForContext, isClaudeContextUsageModel, realContextWindowForModel, autoCompactWindowForModel, sdkAutoCompactWindowForModel } from './runner-types.js';
36
+ import { getGatewayPricing as getSharedGatewayPricing, resolveModelSpec } from '../stats/price-resolver.js';
37
+ import { contextTokensForUsage, usageForContext, realContextWindowForModel, autoCompactWindowForModel, sdkAutoCompactWindowForModel } from './runner-types.js';
38
38
  import { hasContextWindowSuffix, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
39
39
  const resolveModule = createRequire(import.meta.url);
40
40
  const CLAUDE_INTERRUPT_TIMEOUT_MS = 5_000;
@@ -438,80 +438,9 @@ async function assertClaudeSettingSourcesHaveLiteralSandboxPaths(cwd, settingSou
438
438
  }
439
439
  }
440
440
  }
441
- // ── 网关价格缓存(从 /v1/models 的 pricing/effective_pricing 提取)─────────────
442
- // 与别名刷新同范式:按 baseUrl 缓存,1h TTL,stale-while-revalidate(缺失/过期时
443
- // fire-and-forget 触发刷新,本轮先用旧值或回退,不阻塞查询)。
444
- const GATEWAY_PRICING_TTL_MS = 60 * 60 * 1000; // 1h
445
- const gatewayPricingCache = new Map(); // key: baseUrl
446
- const gatewayPricingInFlight = new Set(); // 去重并发刷新
447
- /** 把 /v1/models 单个 model 的价格对象转为 PriceQuad(与 gateway-control 的 apiPricingToQuad 等价)。
448
- * 单位假设:接口价与 model-prices.jsonl 同口径(USD per 1M token),不做换算。 */
449
- function apiPricingToQuad(p) {
450
- if (!p || typeof p !== 'object')
451
- return undefined;
452
- const n = (v) => (typeof v === 'number' && isFinite(v) ? v : undefined);
453
- const quad = {
454
- input: n(p.input),
455
- output: n(p.output),
456
- cache_read: n(p.cache_read),
457
- cache_write: n(p.cache_write),
458
- };
459
- // 全空则视为无价
460
- if (quad.input === undefined && quad.output === undefined
461
- && quad.cache_read === undefined && quad.cache_write === undefined)
462
- return undefined;
463
- return quad;
464
- }
465
- /** 拉取网关 /v1/models 的官方价(pricing) + 网关价(effective_pricing),写入 gatewayPricingCache。
466
- * 失败静默——保持回退到本地价表 / official。 */
467
- async function refreshGatewayPricing(baseUrl, apiKey, requestHeaders) {
468
- if (gatewayPricingInFlight.has(baseUrl))
469
- return;
470
- gatewayPricingInFlight.add(baseUrl);
471
- try {
472
- const url = `${baseUrl.replace(/\/+$/, '')}/v1/models`;
473
- const controller = new AbortController();
474
- const timer = setTimeout(() => controller.abort(), 5000);
475
- const resp = await fetch(url, {
476
- signal: controller.signal,
477
- headers: {
478
- ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
479
- ...requestHeaders,
480
- },
481
- });
482
- clearTimeout(timer);
483
- if (!resp.ok)
484
- return;
485
- const json = await resp.json();
486
- const arr = Array.isArray(json?.data) ? json.data
487
- : Array.isArray(json?.models) ? json.models : [];
488
- const official = new Map();
489
- const gateway = new Map();
490
- for (const m of arr) {
491
- const id = typeof m === 'string' ? m : (m?.id || m?.name || m?.model);
492
- if (!id || typeof m !== 'object')
493
- continue;
494
- const off = apiPricingToQuad(m.pricing);
495
- if (off)
496
- official.set(id, off);
497
- const gw = apiPricingToQuad(m.effective_pricing);
498
- if (gw)
499
- gateway.set(id, gw);
500
- }
501
- // 汇率:接口 usd_to_cny,缺失则留空(计费层默认用 7)
502
- const usdToCny = (typeof json?.usd_to_cny === 'number' && json.usd_to_cny > 0) ? json.usd_to_cny : undefined;
503
- if (official.size > 0 || gateway.size > 0) {
504
- gatewayPricingCache.set(baseUrl, { cache: { official, gateway, usdToCny }, fetchedAt: Date.now() });
505
- logger.info(`[AgentRunner] Refreshed gateway pricing from ${url}: official=${official.size} gateway=${gateway.size} usd_to_cny=${usdToCny ?? '(default 7)'}`);
506
- }
507
- }
508
- catch {
509
- // 网络/解析失败:保持回退,不打断查询
510
- }
511
- finally {
512
- gatewayPricingInFlight.delete(baseUrl);
513
- }
514
- }
441
+ // ── 网关价格缓存 ─────────────────────────────────────────────────────────────
442
+ // 价格获取、缓存与计费统一由 price-resolver.ts 管理,各基座共用一份缓存
443
+ // (按 baseUrl、1h TTL、stale-while-revalidate)。
515
444
  /**
516
445
  * 为支持 1M 上下文的模型追加 `[1m]` 后缀——仅在交给 SDK query() 时调用。
517
446
  *
@@ -733,7 +662,7 @@ export class AgentRunner {
733
662
  if (!this.agentAid)
734
663
  return this.config;
735
664
  try {
736
- const raw = resolveEffective({ self: this.agentAid }, { cache: true, expand: false });
665
+ const raw = resolveEffective({ self: this.agentAid }, { cache: true });
737
666
  return { agents: { claude: raw.baseagents?.claude ?? this.config?.agents?.claude } };
738
667
  }
739
668
  catch {
@@ -798,19 +727,13 @@ export class AgentRunner {
798
727
  /** 返回当前网关 /v1/models 的价格缓存(1h TTL,stale-while-revalidate)。
799
728
  * 缺失/过期时 fire-and-forget 触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
800
729
  getGatewayPricing() {
801
- if (!this.baseUrl)
802
- return undefined;
803
- const entry = gatewayPricingCache.get(this.baseUrl);
804
- if (!entry || Date.now() - entry.fetchedAt > GATEWAY_PRICING_TTL_MS) {
805
- refreshGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders); // 不 await,stale-while-revalidate
806
- }
807
- return entry?.cache;
730
+ return getSharedGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
808
731
  }
809
732
  async resolveCapabilityRunOptions(projectPath) {
810
733
  let agentConfig = this.agentConfig;
811
734
  if (this.agentAid) {
812
735
  try {
813
- agentConfig = resolveEffective({ self: this.agentAid }, { cache: true, expand: true });
736
+ agentConfig = resolveEffective({ self: this.agentAid }, { cache: true });
814
737
  }
815
738
  catch { }
816
739
  }
@@ -1912,10 +1835,8 @@ export class AgentRunner {
1912
1835
  const cleanResult = typeof event.result === 'string'
1913
1836
  ? event.result.replace(/<thinking>[\s\S]*?<\/thinking>\s*/g, '').trim()
1914
1837
  : event.result;
1915
- // 从 usage 求当前上下文占用。
1916
- // Claude:input_tokens 是净输入(不含 cache),三项求和 = 实际上下文长度。
1917
- // 非 Claude(DeepSeek/OpenAI 兼容):cache_read 是服务端 KV cache 不占上下文窗口,
1918
- // input_tokens 本身就是完整的上下文输入量。
1838
+ // 非 GPT 的上下文占用 = 输入 + 输出 + 缓存创建 + 缓存读取。
1839
+ // GPT 沿用原有的输入口径,避免重复计算已包含在输入中的缓存。
1919
1840
  const u = event.usage;
1920
1841
  // Claude Code represents transport/API failures as a fresh
1921
1842
  // `<synthetic>` assistant message. Its usage describes the failed
@@ -1930,8 +1851,7 @@ export class AgentRunner {
1930
1851
  };
1931
1852
  const terminalUsage = isSyntheticError ? syntheticUsage : u;
1932
1853
  const effectiveModel = callModel ?? this.model;
1933
- const isClaudeModel = isClaudeContextUsageModel(effectiveModel);
1934
- const totalTokens = contextTokensForUsage(u, !!isClaudeModel);
1854
+ const totalTokens = contextTokensForUsage(u, effectiveModel);
1935
1855
  const contextWindowTokens = resolvedContextWindow ?? realContextWindowForModel(sdkModel);
1936
1856
  const autoCompactTokens = autoCompactWindowForModel(sdkModel);
1937
1857
  const aggregateContextUsage = totalTokens > 0 ? {
@@ -1944,7 +1864,7 @@ export class AgentRunner {
1944
1864
  } : undefined;
1945
1865
  if (lastModelCall?.tokenUsage) {
1946
1866
  const lastUsageForContext = usageForContext(lastModelCall.tokenUsage);
1947
- const lastTotalTokens = contextTokensForUsage(lastUsageForContext, !!isClaudeModel);
1867
+ const lastTotalTokens = contextTokensForUsage(lastUsageForContext, effectiveModel);
1948
1868
  lastModelCall = {
1949
1869
  ...lastModelCall,
1950
1870
  contextUsage: lastTotalTokens > 0 ? {
@@ -1958,7 +1878,7 @@ export class AgentRunner {
1958
1878
  };
1959
1879
  }
1960
1880
  const contextUsageForCall = (usage) => {
1961
- const callTotalTokens = contextTokensForUsage(usageForContext(usage), !!isClaudeModel);
1881
+ const callTotalTokens = contextTokensForUsage(usageForContext(usage), effectiveModel);
1962
1882
  return callTotalTokens > 0 ? {
1963
1883
  totalTokens: callTotalTokens,
1964
1884
  maxTokens: contextWindowTokens,
@@ -2151,10 +2071,7 @@ export class AgentRunner {
2151
2071
  const runCatalog = await this.getModelCatalog();
2152
2072
  if (this.baseUrl) {
2153
2073
  // 顺带预热网关价格缓存(1h TTL),让本轮结束写库时已就绪
2154
- const pricing = gatewayPricingCache.get(this.baseUrl);
2155
- if (!pricing || (Date.now() - pricing.fetchedAt > GATEWAY_PRICING_TTL_MS)) {
2156
- refreshGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
2157
- }
2074
+ void getSharedGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
2158
2075
  }
2159
2076
  ensureDir(projectPath);
2160
2077
  ensureDir(path.join(projectPath, '.claude'));
@@ -2217,13 +2134,16 @@ export class AgentRunner {
2217
2134
  throw error;
2218
2135
  }
2219
2136
  logger.warn(`[AgentRunner] Invalid session file, starting new session`);
2137
+ if (modelOverride?.capsule) {
2138
+ const recovered = await modelOverride.capsule.recover(agentSessionId, prompt, systemPromptAppend);
2139
+ prompt = recovered.prompt;
2140
+ systemPromptAppend = recovered.systemPrompt;
2141
+ }
2142
+ else if (this.onSessionIdUpdate) {
2143
+ await this.onSessionIdUpdate(sessionId, '');
2144
+ }
2220
2145
  agentSessionId = undefined;
2221
2146
  this.activeSessions.delete(sessionId);
2222
- if (this.onSessionIdUpdate) {
2223
- void Promise.resolve(this.onSessionIdUpdate(sessionId, '')).catch(error => {
2224
- logger.debug(`[AgentRunner] ignored empty session binding callback failure: ${error instanceof Error ? error.message : String(error)}`);
2225
- });
2226
- }
2227
2147
  }
2228
2148
  }
2229
2149
  // PreCompact Hook - 在压缩开始时触发
@@ -2254,51 +2174,59 @@ export class AgentRunner {
2254
2174
  }
2255
2175
  : resolvePhaseOneExecutionSandbox(callPermissionMode, runPermissionContext?.role);
2256
2176
  const inputId = modelOverride?.turn?.inputId ?? crypto.randomUUID();
2257
- if (executionSandbox.state !== 'off') {
2258
- const activeSandboxFailure = getActiveSandboxInitializationFailure(undefined, undefined, sessionId);
2259
- if (activeSandboxFailure) {
2260
- const detail = createSandboxInitializationError(new Error(`sandbox bootstrap circuit open; firstObservedAt=${activeSandboxFailure.openedAt} ` +
2261
- `occurrences=${activeSandboxFailure.occurrences}; ${activeSandboxFailure.detail}`));
2262
- const context = this.permissionContexts.get(sessionId);
2263
- auditToolInfrastructureFailure({
2264
- toolName: 'Bash',
2265
- policyCode: SANDBOX_INITIALIZATION_FAILED,
2266
- reason: detail.message.slice(0, 512),
2267
- sessionId,
2268
- agentAid: context?.selfAid,
2269
- agentName: context?.agentName,
2270
- permissionMode: callPermissionMode,
2271
- role: context?.role,
2272
- callId: inputId,
2273
- taskId: context?.taskId,
2274
- occurrences: activeSandboxFailure.occurrences,
2275
- sandboxFailure: {
2276
- kind: activeSandboxFailure.kind,
2277
- observation: 'circuit_open',
2278
- counters: getSandboxInitializationFailureCounters(),
2279
- },
2280
- });
2281
- await context?.recordExecutionAnomaly?.({
2282
- code: 'capability_unavailable',
2283
- severity: 'warning',
2284
- phase: 'execution',
2285
- occurredAt: Date.now(),
2286
- correlationId: inputId,
2287
- requestId: inputId,
2288
- sessionId,
2289
- toolName: 'Bash',
2290
- policyCode: SANDBOX_INITIALIZATION_FAILED,
2291
- decisionSource: 'infrastructure',
2292
- agentAid: context?.selfAid,
2293
- agentName: context?.agentName,
2294
- permissionMode: callPermissionMode,
2295
- summary: detail.message.slice(0, 512),
2296
- effect: 'operation_skipped',
2297
- });
2298
- if (shouldLogSandboxCircuitNotice()) {
2299
- logger.warn(`[ClaudeSandbox] bootstrap circuit open; skipping subprocess spawn ` +
2300
- `cooldownMs=${SANDBOX_INITIALIZATION_COOLDOWN_MS} occurrences=${activeSandboxFailure.occurrences}`);
2301
- }
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)
2302
2230
  return (async function* () {
2303
2231
  yield {
2304
2232
  type: 'complete',
@@ -2309,7 +2237,6 @@ export class AgentRunner {
2309
2237
  queryFinal: true,
2310
2238
  };
2311
2239
  })();
2312
- }
2313
2240
  }
2314
2241
  const permissionPrompt = runPermissionContext?.sendPrompt ?? this.sendPromptFn;
2315
2242
  const permissionContext = (signal) => {
@@ -2787,7 +2714,7 @@ export class AgentRunner {
2787
2714
  const excludeDynamic = this.config?.agents?.claude?.excludeDynamicSections === true;
2788
2715
  // 公共 options(新旧模式共用)
2789
2716
  const sdkPermissionMode = this.toSdkPermissionMode(requestedPermissionMode);
2790
- // 本次调用使用的模型/强度:优先 modelOverride(message-processor 按 关系>agent>全局 解析后传入),
2717
+ // 本次调用使用的模型/强度:优先 modelOverride(response-engine 取 Agent 级配置后传入),
2791
2718
  // 缺省回落 agent 级 this.model。作为 per-call 入参传入,无共享状态,多对端并发互不污染。
2792
2719
  const callModel = modelOverride?.model || this.model;
2793
2720
  const callEffort = (modelOverride?.effortMode === 'model_default'
@@ -2796,7 +2723,7 @@ export class AgentRunner {
2796
2723
  const callSessionTitle = sanitizeSessionTitle(modelOverride?.sessionTitle);
2797
2724
  logger.info(`[AgentRunner] runQuery model=${callModel} effort=${callEffort ?? 'auto'} ` +
2798
2725
  `permMode=${requestedPermissionMode}->${callPermissionMode} role=${runPermissionContext?.role ?? 'none'} ` +
2799
- `sandbox=${executionSandbox.state} sdkMode=${sdkPermissionMode}`);
2726
+ `sandbox=${sandboxFallback ? 'outer-guard-fallback' : executionSandbox.state} sdkMode=${sdkPermissionMode}`);
2800
2727
  if (systemPromptAppend) {
2801
2728
  logger.info(`[AgentRunner] systemPromptAppend: ${systemPromptAppend.length} chars`);
2802
2729
  }
@@ -2806,14 +2733,16 @@ export class AgentRunner {
2806
2733
  const catalogModel = resolveCatalogModel(runCatalog, callModel);
2807
2734
  const { sdkModel, contextWindow } = resolveClaudeModelContext(catalogModel, runCatalog);
2808
2735
  const agentEnv = this.getAgentEnv(runtimeEnv, sessionId, callPermissionMode, modelOverride?.provider);
2809
- const dependencies = executionSandbox.state !== 'off' ? inspectClaudeSandboxDependencies(agentEnv) : undefined;
2736
+ const dependencies = executionSandbox.state !== 'off' && !sandboxFallback
2737
+ ? inspectClaudeSandboxDependencies(agentEnv)
2738
+ : undefined;
2810
2739
  if (dependencies?.status === 'missing')
2811
2740
  throw createClaudeSandboxDependencyError(dependencies);
2812
2741
  const capabilityOptions = await this.resolveCapabilityRunOptions(projectPath);
2813
2742
  const managedSettings = callPermissionMode === 'fullaccess'
2814
2743
  ? undefined
2815
2744
  : buildClaudeManagedLockdownSettings(capabilityOptions, dependencies);
2816
- const sandboxOptions = executionSandbox.state === 'off'
2745
+ let sandboxOptions = executionSandbox.state === 'off' || sandboxFallback
2817
2746
  ? { enabled: false }
2818
2747
  : await (async () => {
2819
2748
  const sandboxProjectionStartedAt = Date.now();
@@ -2892,7 +2821,8 @@ export class AgentRunner {
2892
2821
  ...(managedSettings ? { managedSettings } : {}),
2893
2822
  ...(callEffort ? { effort: callEffort } : {}),
2894
2823
  ...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
2895
- ...(executionSandbox.state === 'off' && callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
2824
+ ...((executionSandbox.state === 'off' || sandboxFallback)
2825
+ && callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
2896
2826
  spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid),
2897
2827
  } : {}),
2898
2828
  autoCompactWindow: sdkAutoCompactWindowForModel(sdkModel, contextWindow),
@@ -3065,51 +2995,100 @@ export class AgentRunner {
3065
2995
  }
3066
2996
  }
3067
2997
  let sdkStream;
3068
- const msgStream = new MessageStream();
3069
- if (images && images.length > 0) {
3070
- logger.info('[AgentRunner] Creating query with images:', images.length, 'first image size:', images[0]?.data?.length ?? 0);
3071
- msgStream.push(prompt, images, inputId);
3072
- try {
3073
- // Topic bindings are authoritative for every input shape. Starting
3074
- // an unresumed Claude query for a bound topic would discover a second
3075
- // backend and then fail activation with a binding conflict.
3076
- sdkStream = topicBinding || recoverySessionId
3077
- ? createQuery(msgStream, agentSessionId, resumeAt)
3078
- : createQuery(msgStream);
3079
- }
3080
- catch (error) {
3081
- this.cleanupSandboxSettingsFile(sessionId, sandboxSettingsFile);
3082
- const stderr = this.recentStderr.get(sessionId) ?? [];
3083
- if (isClaudeStartupArgumentsTooLong(error))
3084
- throw createClaudeStartupArgumentsTooLongError(error);
3085
- if (isClaudeCodeStartupProcessError(error))
3086
- throw createClaudeCodeStartupError(error);
3087
- if (isSandboxInitializationFailure(error, stderr)) {
3088
- const { detail } = await this.recordSandboxInfrastructureFailure(sessionId, inputId, callPermissionMode, error, stderr);
3089
- throw detail;
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,
3090
3015
  }
3091
- throw error;
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
+ });
3092
3039
  }
3093
- }
3094
- else {
3095
- logger.debug('[AgentRunner] Creating query with text only, agentSessionId:', initialClaudeSessionId);
3096
- msgStream.push(prompt, undefined, inputId);
3097
- try {
3098
- sdkStream = createQuery(msgStream, agentSessionId, resumeAt);
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);
3099
3062
  }
3100
- catch (error) {
3101
- this.cleanupSandboxSettingsFile(sessionId, sandboxSettingsFile);
3102
- const stderr = this.recentStderr.get(sessionId) ?? [];
3103
- if (isClaudeStartupArgumentsTooLong(error))
3104
- throw createClaudeStartupArgumentsTooLongError(error);
3105
- if (isClaudeCodeStartupProcessError(error))
3106
- throw createClaudeCodeStartupError(error);
3107
- if (isSandboxInitializationFailure(error, stderr)) {
3108
- const { detail } = await this.recordSandboxInfrastructureFailure(sessionId, inputId, callPermissionMode, error, stderr);
3109
- throw detail;
3110
- }
3111
- throw error;
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);
3112
3073
  }
3074
+ else {
3075
+ logger.debug('[AgentRunner] Creating query with text only, agentSessionId:', initialClaudeSessionId);
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;
3113
3092
  }
3114
3093
  this.activeMessageStreams.set(sessionId, msgStream);
3115
3094
  this.activeQueries.set(sessionId, sdkStream);
@@ -3122,11 +3101,32 @@ export class AgentRunner {
3122
3101
  this.interruptFns.set(sessionId, () => sdkStream.interrupt());
3123
3102
  }
3124
3103
  // 返回标准 AgentEvent 流(重试由 MessageProcessor 层负责)
3125
- const transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
3104
+ let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
3126
3105
  const self = this;
3127
3106
  return (async function* () {
3128
3107
  try {
3129
- yield* transformed;
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
+ }
3130
3130
  }
3131
3131
  finally {
3132
3132
  self.cleanupSandboxSettingsFile(sessionId, sandboxSettingsFile);
@@ -3638,7 +3638,7 @@ export class ClaudeAgentPlugin {
3638
3638
  }
3639
3639
  createAgent(agent, callbacks) {
3640
3640
  const override = agent.config.baseagents?.claude;
3641
- const rawConfig = resolveEffective({ self: agent.aid }, { cache: true, expand: false });
3641
+ const rawConfig = resolveEffective({ self: agent.aid }, { cache: true });
3642
3642
  const anthropic = resolveAnthropicConfig({ agents: { claude: rawConfig.baseagents?.claude } }, undefined, { agentAid: agent.aid, projectPath: agent.projectPath });
3643
3643
  const merged = {
3644
3644
  agents: { claude: { ...(override || {}) } },