evolcore 0.0.47 → 0.0.49

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 (266) hide show
  1. package/CHANGELOG.md +90 -1
  2. package/bin/ec-build.mjs +86 -0
  3. package/dist/agent-template/jobs.js +12 -4
  4. package/dist/agent-template/runtime.js +143 -40
  5. package/dist/agent-template/service.js +66 -13
  6. package/dist/agents/baseagent.js +60 -20
  7. package/dist/agents/claude-runner.js +34 -17
  8. package/dist/agents/codex-runner.js +36 -17
  9. package/dist/agents/ecagent-runner.js +7 -4
  10. package/dist/agents/gemini-runner.js +5 -2
  11. package/dist/agents/runner-types.js +5 -21
  12. package/dist/aun/aid/agentmd.js +5 -1
  13. package/dist/aun/msg/p2p.js +2 -1
  14. package/dist/aun/service-proxy.js +4 -2
  15. package/dist/build-identity.json +1 -0
  16. package/dist/channels/aun.js +722 -295
  17. package/dist/channels/daemon.js +9 -25
  18. package/dist/cli/aun-commands.js +86 -51
  19. package/dist/cli/code-stats.js +19 -8
  20. package/dist/cli/command-log.js +1 -1
  21. package/dist/cli/daemon-commands.js +44 -43
  22. package/dist/cli/directory.js +13 -2
  23. package/dist/cli/ecmsg-gateway.js +5 -2
  24. package/dist/cli/index.js +9 -9
  25. package/dist/cli/init-channel.js +4 -6
  26. package/dist/cli/init.js +72 -50
  27. package/dist/cli/invoke-command.js +1 -1
  28. package/dist/cli/managed-command-guard.js +2 -0
  29. package/dist/cli/model.js +20 -5
  30. package/dist/cli/provider-command.js +74 -13
  31. package/dist/cli/quota.js +89 -0
  32. package/dist/cli/role.js +62 -17
  33. package/dist/cli/services-command.js +1 -0
  34. package/dist/cli/stats.js +3 -3
  35. package/dist/cli/team-workspace-command.js +56 -2
  36. package/dist/cli/thread-command.js +16 -51
  37. package/dist/config/boot-log.js +3 -9
  38. package/dist/config/builtin-roles.js +5 -7
  39. package/dist/config/config-field-policy.js +71 -1
  40. package/dist/config/config-manager.js +13 -7
  41. package/dist/config/daemon-services.js +30 -3
  42. package/dist/config/gateway-config.js +2 -2
  43. package/dist/config/invoke-ipc-service.js +6 -4
  44. package/dist/config/peer-bind-code.js +3 -4
  45. package/dist/config/peer-book-store.js +62 -229
  46. package/dist/config/peer-book.js +26 -27
  47. package/dist/config/peer-role-resolver.js +16 -1
  48. package/dist/config/provider-identity-migration.js +4 -1
  49. package/dist/config/provider-ipc-service.js +56 -11
  50. package/dist/config/provider-menu-request.js +24 -5
  51. package/dist/config/provider-templates.js +127 -0
  52. package/dist/config/providers-config.js +67 -12
  53. package/dist/config/providers-management.js +477 -51
  54. package/dist/config/resolved-config-op.js +3 -2
  55. package/dist/config/role-command-service.js +248 -1
  56. package/dist/config/schema-migration.js +105 -4
  57. package/dist/core/agent-application-service.js +6 -1
  58. package/dist/core/agent-runtime.js +4 -0
  59. package/dist/core/auth/agent-delegation.js +2 -1
  60. package/dist/core/auth/auth-gateway.js +2 -1
  61. package/dist/core/auth/delegation-authorization.js +36 -26
  62. package/dist/core/auth/operation-authorizer.js +25 -0
  63. package/dist/core/auth/operation-catalog.js +37 -64
  64. package/dist/core/capability/providers/codex-capability-provider.js +7 -8
  65. package/dist/core/channel-loader.js +18 -0
  66. package/dist/core/command/agent-control.js +32 -0
  67. package/dist/core/command/cli-intent-parser.js +13 -0
  68. package/dist/core/command/command-handler.js +126 -87
  69. package/dist/core/command/menu-catalog.js +1 -0
  70. package/dist/core/command/menu-handler.js +67 -150
  71. package/dist/core/command/menu-protocol.js +31 -1
  72. package/dist/core/command/provider-menu.js +13 -3
  73. package/dist/core/command/remote-shell.js +565 -0
  74. package/dist/core/command/role-menu.js +47 -23
  75. package/dist/core/command/slash-handler.js +26 -43
  76. package/dist/core/command/team-workspace-items.js +81 -12
  77. package/dist/core/command/team-workspace-team.js +9 -71
  78. package/dist/core/command/topic-slash.js +9 -30
  79. package/dist/core/daemon-bootstrap.js +8 -1
  80. package/dist/core/daemon-control.js +64 -8
  81. package/dist/core/daemon-lifecycle.js +16 -2
  82. package/dist/core/evolagent-registry.js +20 -3
  83. package/dist/core/file-integrity/store.js +2 -0
  84. package/dist/core/handoff/runtime.js +37 -1
  85. package/dist/core/inference/text-inference.js +3 -1
  86. package/dist/core/initialization/service.js +11 -6
  87. package/dist/core/interaction-router.js +3 -0
  88. package/dist/core/invoke/executors/text.js +72 -19
  89. package/dist/core/ipc-registration.js +3 -1
  90. package/dist/core/message/aun-ipc-sender.js +279 -107
  91. package/dist/core/message/contact-admission.js +91 -6
  92. package/dist/core/message/contact-pending-inbound.js +113 -0
  93. package/dist/core/message/contact-thread-approval.js +212 -0
  94. package/dist/core/message/im-renderer.js +41 -2
  95. package/dist/core/message/message-admission.js +5 -39
  96. package/dist/core/message/message-bridge.js +140 -370
  97. package/dist/core/message/message-log.js +29 -0
  98. package/dist/core/message/message-queue.js +119 -15
  99. package/dist/core/message/message-utils.js +8 -0
  100. package/dist/core/message/response-engine.js +580 -134
  101. package/dist/core/message/send-routing.js +5 -1
  102. package/dist/core/model/catalog-service.js +31 -11
  103. package/dist/core/model/config-scope.js +6 -14
  104. package/dist/core/model/model-capabilities.js +22 -4
  105. package/dist/core/model/model-catalog.js +1 -0
  106. package/dist/core/model/model-diagnostics.js +19 -0
  107. package/dist/core/model/model-fallback.js +13 -2
  108. package/dist/core/ownership/owner-resolver.js +328 -50
  109. package/dist/core/pack-auth.js +3 -0
  110. package/dist/core/pack-install.js +1 -1
  111. package/dist/core/permission/ec-command-parser.js +106 -19
  112. package/dist/core/permission/protected-paths.js +6 -6
  113. package/dist/core/permission/services-path-acl.js +451 -0
  114. package/dist/core/permission/tool-policy.js +5 -1
  115. package/dist/core/relation/peer-identity.js +36 -1
  116. package/dist/core/relation/same-owner-proof.js +81 -112
  117. package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
  118. package/dist/core/session/session-file-health.js +13 -7
  119. package/dist/core/session/session-fs-store.js +91 -35
  120. package/dist/core/session/session-manager.js +68 -24
  121. package/dist/core/session/session-mapper.js +14 -34
  122. package/dist/core/session/session-transcript.js +5 -1
  123. package/dist/core/task/task-activity-store.js +84 -0
  124. package/dist/core/task/task-recovery-service.js +13 -0
  125. package/dist/core/thread/command-parser.js +7 -12
  126. package/dist/core/thread/thread-context-storage.js +3 -2
  127. package/dist/core/thread/thread-operation.js +2 -13
  128. package/dist/core/thread/thread-service.js +15 -46
  129. package/dist/core/thread/topic-id.js +15 -0
  130. package/dist/directory/owner-directory-admission.js +12 -9
  131. package/dist/directory/owner-directory-cache.js +64 -28
  132. package/dist/directory/owner-directory-markdown.js +14 -2
  133. package/dist/directory/owner-directory-policy.js +5 -30
  134. package/dist/directory/owner-directory-query-operation.js +29 -3
  135. package/dist/directory/owner-directory-remarks.js +11 -3
  136. package/dist/directory/owner-directory-request-operation.js +5 -2
  137. package/dist/eck/kit-renderer.js +1 -1
  138. package/dist/eck/message-renderer.js +112 -29
  139. package/dist/ecweb/basic-settings-service.js +3 -1
  140. package/dist/ecweb/message-context-service.js +1 -1
  141. package/dist/ecweb/pairing.js +4 -3
  142. package/dist/ecweb/providers-service.js +26 -1
  143. package/dist/ecweb/runtime/lifecycle.js +18 -8
  144. package/dist/ecweb/runtime/proxy-access.js +74 -0
  145. package/dist/ecweb/runtime/supervisor.js +36 -6
  146. package/dist/event-center/center-config.js +9 -5
  147. package/dist/event-center/dispatcher.js +10 -1
  148. package/dist/event-center/ipc-operation.js +19 -0
  149. package/dist/event-center/registry.js +29 -3
  150. package/dist/event-center/runtime.js +106 -11
  151. package/dist/event-center/script-runner.js +5 -5
  152. package/dist/index.js +96 -59
  153. package/dist/ipc.js +38 -3
  154. package/dist/outputs/authorization.js +16 -0
  155. package/dist/outputs/cards.js +336 -0
  156. package/dist/outputs/events.js +63 -0
  157. package/dist/outputs/protocol.js +103 -0
  158. package/dist/outputs/service.js +266 -0
  159. package/dist/paths.js +3 -0
  160. package/dist/proxy/manager.js +43 -13
  161. package/dist/services/index.js +114 -5
  162. package/dist/services/ipc-operation.js +88 -15
  163. package/dist/services/pack-manager.js +13 -1
  164. package/dist/services/router.js +21 -6
  165. package/dist/services/script-runner.js +5 -4
  166. package/dist/services/service-payload.js +13 -7
  167. package/dist/services/validation.js +1 -1
  168. package/dist/stats/budget.js +2 -2
  169. package/dist/stats/db.js +19 -0
  170. package/dist/stats/index.js +1 -1
  171. package/dist/stats/{price-resolver.js → model-resolver.js} +304 -23
  172. package/dist/stats/normalizer.js +2 -0
  173. package/dist/stats/query.js +35 -27
  174. package/dist/stats/quota-query.js +95 -0
  175. package/dist/stats/role-budget.js +5 -2
  176. package/dist/stats/writer.js +10 -6
  177. package/dist/trigger/audit.js +7 -0
  178. package/dist/trigger/authorization.js +105 -11
  179. package/dist/trigger/feedback.js +10 -0
  180. package/dist/trigger/history.js +37 -11
  181. package/dist/trigger/ipc-service.js +12 -1
  182. package/dist/trigger/manager.js +1 -0
  183. package/dist/trigger/scheduler.js +7 -5
  184. package/dist/trigger/script-executor.js +2 -1
  185. package/dist/trigger/script-sandbox.js +21 -3
  186. package/dist/trigger/validation.js +22 -0
  187. package/dist/utils/atomic-write.js +22 -8
  188. package/dist/utils/cross-platform.js +73 -26
  189. package/dist/utils/error-dict.json +94 -4
  190. package/dist/utils/error-utils.js +27 -4
  191. package/dist/utils/evolcore-version.js +36 -65
  192. package/dist/utils/host-info.js +100 -1
  193. package/dist/utils/msg-diag.js +1 -0
  194. package/dist/utils/npm-ops.js +43 -8
  195. package/dist/utils/process-introspect.js +12 -7
  196. package/dist/utils/process-tree.js +50 -2
  197. package/dist/utils/windows-shell-trust.js +2 -0
  198. package/dist/workbench/protocol.js +80 -0
  199. package/dist/workbench/service.js +359 -0
  200. package/ecagent/dist/types.d.ts +6 -2
  201. package/kits/docs/context-assembly.md +1 -1
  202. package/kits/docs/evolcore/INDEX.md +4 -2
  203. package/kits/docs/evolcore/aid.md +25 -0
  204. package/kits/docs/evolcore/config.md +16 -1
  205. package/kits/docs/evolcore/directory.md +30 -12
  206. package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
  207. package/kits/docs/evolcore/model.md +10 -0
  208. package/kits/docs/evolcore/msg.md +9 -0
  209. package/kits/docs/evolcore/peer.md +19 -65
  210. package/kits/docs/evolcore/provider.md +124 -4
  211. package/kits/docs/evolcore/quota.md +54 -0
  212. package/kits/docs/evolcore/role.md +83 -0
  213. package/kits/docs/evolcore/services.md +6 -6
  214. package/kits/docs/evolcore/stats.md +2 -0
  215. package/kits/docs/evolcore/team-workspace.md +1 -1
  216. package/kits/docs/evolcore/thread-chain.md +14 -15
  217. package/kits/docs/evolcore/tool-authorization.md +5 -0
  218. package/kits/docs/evolcore/trigger.md +12 -0
  219. package/kits/eck_message_manifest.json +12 -0
  220. package/kits/provider-templates.json +1213 -0
  221. package/kits/rules/04-relation.md +3 -3
  222. package/kits/schemas/_meta.json +14 -2
  223. package/kits/schemas/agent-config.schema.20.json +24 -0
  224. package/kits/schemas/contact-book.schema.4.json +52 -0
  225. package/kits/schemas/providers.schema.3.json +200 -0
  226. package/kits/skills/.switches.json +8 -0
  227. package/kits/skills/ability/references/calling.md +1 -1
  228. package/kits/skills/agent-output-cards/SKILL.md +57 -0
  229. package/kits/skills/ec-group/SKILL.md +2 -2
  230. package/kits/skills/ec-identity/SKILL.md +19 -72
  231. package/kits/skills/ec-provider/SKILL.md +270 -0
  232. package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
  233. package/kits/skills/ec-trigger/SKILL.md +1 -1
  234. package/kits/skills/thread-ops/SKILL.md +34 -21
  235. package/kits/templates/message-fragments/group-batch-item.md +1 -1
  236. package/kits/templates/message-fragments/group-batch.md +1 -1
  237. package/kits/templates/message-fragments/inject-default.md +1 -1
  238. package/kits/templates/message-fragments/interrupt-insert.md +1 -0
  239. package/kits/templates/message-fragments/item-group.md +1 -1
  240. package/kits/templates/message-fragments/item-private.md +1 -1
  241. package/kits/templates/message-fragments/thread-context.md +1 -1
  242. package/kits/templates/message-fragments/trigger-session.md +1 -1
  243. package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
  244. package/kits/templates/roles/admin.json +2 -19
  245. package/kits/templates/roles/member.json +0 -3
  246. package/kits/templates/roles/visitor.json +1 -0
  247. package/kits/templates/system-fragments/baseagent.md +6 -0
  248. package/kits/templates/system-fragments/commands.md +4 -3
  249. package/kits/templates/system-fragments/directory-contacts.md +3 -4
  250. package/kits/templates/system-fragments/managed-runtime.md +1 -1
  251. package/kits/templates/system-fragments/relation.md +1 -1
  252. package/kits/templates/system-fragments/thread.md +7 -5
  253. package/kits/templates/system-fragments/venue.md +11 -0
  254. package/package.json +6 -4
  255. package/scripts/agent-template/inspect.mjs +50 -11
  256. package/scripts/agent-template/shared/common.mjs +11 -6
  257. package/scripts/agent-template/shared/team-schema.json +6 -4
  258. package/scripts/agent-template/shared/template-contract.mjs +62 -11
  259. package/scripts/agent-template/shared/template-package.mjs +189 -21
  260. package/scripts/agent-template/shared/template-runtime.mjs +54 -6
  261. package/scripts/agent-template/shared/template.mjs +2 -2
  262. package/scripts/agent-template/team-pack.mjs +52 -14
  263. package/dist/cli/peer.js +0 -127
  264. package/dist/config/peer-operation-service.js +0 -132
  265. package/dist/config/peer-request-service.js +0 -532
  266. package/dist/core/command/connect-menu.js +0 -624
@@ -14,10 +14,12 @@ import path from 'path';
14
14
  import os from 'os';
15
15
  import { createHash } from 'node:crypto';
16
16
  import { buildCliLaunchCommand, commandExists, isWindows, resolvePowerShellShimPath, resolveProbePath, } from '../utils/cross-platform.js';
17
- import { execFileSync } from 'child_process';
17
+ import { execFile } from 'child_process';
18
+ import { requireTrustedWindowsCmdPathAsync } from '../utils/windows-shell-trust.js';
18
19
  import { parse as parseToml } from 'smol-toml';
19
20
  import { readRuntimeEnvironmentVariable } from '../config/runtime-env.js';
20
21
  import { providerModelEnabled, resolveProviderServiceForBaseagent, resolveProviderService } from '../config/providers.js';
22
+ import { errorQuestionRule } from '../utils/error-utils.js';
21
23
  /** Resolve the installed Codex CLI entrypoint, including npm shims on Windows. */
22
24
  export function resolveCodexCliPath() {
23
25
  return resolveProbePath('codex');
@@ -36,18 +38,23 @@ export function resolveCodexLaunchCommand(args, options = {}) {
36
38
  comSpec: options.comSpec,
37
39
  });
38
40
  }
39
- /** Execute a Codex CLI command using the resolved npm shim/path. */
40
- export function execCodexCliSync(args, options) {
41
+ /** Execute a Codex CLI command without blocking the daemon, including shim trust checks. */
42
+ export async function execCodexCli(args, options) {
41
43
  const commandPath = resolveCodexCliPath();
42
44
  if (!commandPath)
43
45
  throw new Error('Codex CLI not found');
44
- const launchCommand = resolveCodexLaunchCommand(args, { commandPath });
45
- if (!launchCommand)
46
- throw new Error('Codex CLI not found');
47
- return execFileSync(launchCommand.command, launchCommand.args, {
48
- ...(options ?? {}),
49
- windowsHide: isWindows,
50
- windowsVerbatimArguments: launchCommand.windowsVerbatimArguments,
46
+ const resolveWindowsCmd = isWindows && /\.(?:cmd|bat)$/i.test(commandPath)
47
+ ? await requireTrustedWindowsCmdPathAsync().then(cmd => () => cmd,
48
+ // Keep launch failures on the existing diagnostic and error path.
49
+ error => () => { throw error; }) : undefined;
50
+ const launchCommand = buildCliLaunchCommand(commandPath, args, { resolveWindowsCmd });
51
+ return new Promise((resolve, reject) => {
52
+ const child = execFile(launchCommand.command, launchCommand.args, {
53
+ ...options,
54
+ windowsHide: isWindows,
55
+ windowsVerbatimArguments: launchCommand.windowsVerbatimArguments,
56
+ }, (error, stdout) => error ? reject(error) : resolve(stdout));
57
+ child.stdin?.end();
51
58
  });
52
59
  }
53
60
  const BASEAGENT_ALIASES = {
@@ -253,8 +260,14 @@ export async function resolveRuntimeBaseagentModelSelection(baseagent, configure
253
260
  discoveredDefaultModels.set(key, model);
254
261
  return model;
255
262
  }
256
- catch {
263
+ catch (error) {
257
264
  // Provider/app-server payloads can contain credentials or physical paths.
265
+ // Retain only the dictionary-owned repair hint, never the raw response.
266
+ const rule = errorQuestionRule(error);
267
+ if (rule)
268
+ throw Object.assign(new Error(rule.message ?? '模型连接需要补充信息'), {
269
+ code: rule.question?.fields.includes('baseUrl') ? 'PROVIDER_BASE_URL_MISSING' : 'PROVIDER_CREDENTIAL_INVALID',
270
+ });
258
271
  throw defaultModelUnavailable(canonical);
259
272
  }
260
273
  })().finally(() => discoveringDefaultModels.delete(key));
@@ -313,6 +326,36 @@ function normalizeRequestMetadata(value) {
313
326
  queryParams: normalizeStringMap(value?.queryParams, 'queryParams'),
314
327
  };
315
328
  }
329
+ /** Retain known connection facts when resolution stops at a missing native key. */
330
+ class NativeConnectionIncompleteError extends Error {
331
+ #connection;
332
+ constructor(message, connection) {
333
+ super(message);
334
+ this.#connection = connection;
335
+ }
336
+ get connection() { return this.#connection; }
337
+ }
338
+ /** Resolve exactly the same native credential precedence as the runner, without model discovery. */
339
+ export function resolveNativeConnectionForRepair(baseagent, configured, runtime) {
340
+ const override = { ...configured, model: '<connection-repair>' };
341
+ try {
342
+ if (baseagent === 'claude')
343
+ return resolveAnthropicConfig({ agents: {} }, override, runtime);
344
+ if (baseagent === 'codex')
345
+ return resolveOpenaiConfig({ agents: {} }, override);
346
+ if (baseagent === 'ecagent')
347
+ return resolveEcagentConfig({ agents: {} }, override);
348
+ if (baseagent === 'gemini')
349
+ return { ...resolveGoogleConfig({ agents: {} }, override),
350
+ baseUrl: process.env.GOOGLE_GEMINI_BASE_URL };
351
+ }
352
+ catch (error) {
353
+ if (error instanceof NativeConnectionIncompleteError)
354
+ return error.connection;
355
+ throw error;
356
+ }
357
+ return undefined;
358
+ }
316
359
  /** Claude Code accepts both names; AUTH_TOKEN is kept first for compatibility. */
317
360
  function resolveAnthropicApiKey(...values) {
318
361
  return directInferenceValue(...values);
@@ -389,9 +432,6 @@ export function resolveAnthropicConfig(config, override, runtime) {
389
432
  const runtimeAuthToken = readRuntimeEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', runtime?.agentAid, runtime?.projectPath).value;
390
433
  const runtimeApiKey = readRuntimeEnvironmentVariable('ANTHROPIC_API_KEY', runtime?.agentAid, runtime?.projectPath).value;
391
434
  const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey, undefined, runtimeAuthToken, runtimeApiKey, settings.env?.ANTHROPIC_AUTH_TOKEN, settings.env?.ANTHROPIC_API_KEY);
392
- if (!apiKey) {
393
- 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.');
394
- }
395
435
  const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
396
436
  const overrideBaseUrlValue = resolveGatewayReference(override?.baseUrl);
397
437
  const overrideBaseUrl = isPlaceholderUrl(overrideBaseUrlValue) ? undefined : overrideBaseUrlValue;
@@ -401,6 +441,8 @@ export function resolveAnthropicConfig(config, override, runtime) {
401
441
  || settings.env?.ANTHROPIC_BASE_URL;
402
442
  const headers = normalizeStringMap(override?.headers, 'headers');
403
443
  const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
444
+ if (!apiKey)
445
+ throw new NativeConnectionIncompleteError('No API key found for Claude. Select a Provider via baseagents.claude.provider, or set env ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY.', { baseUrl, headers, queryParams });
404
446
  const model = override?.model
405
447
  || config.agents?.claude?.model
406
448
  || settings.model
@@ -578,9 +620,6 @@ export function resolveOpenaiConfig(config, override, runtime) {
578
620
  const apiKey = credential?.apiKey;
579
621
  const authType = credential?.authType;
580
622
  const authSource = credential?.authSource;
581
- if (!apiKey) {
582
- throw new Error('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.');
583
- }
584
623
  const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
585
624
  const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
586
625
  const baseUrl = overrideBaseUrl
@@ -589,6 +628,8 @@ export function resolveOpenaiConfig(config, override, runtime) {
589
628
  || undefined;
590
629
  const headers = normalizeStringMap(override?.headers, 'headers');
591
630
  const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
631
+ if (!apiKey)
632
+ throw new NativeConnectionIncompleteError('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.', { baseUrl, headers, queryParams });
592
633
  const model = override?.model
593
634
  || config.agents?.codex?.model
594
635
  || codexSettings.model
@@ -684,9 +725,6 @@ export function resolveEcagentConfig(config, override) {
684
725
  const apiKey = (isPlaceholder(override?.apiKey) ? undefined : override?.apiKey)
685
726
  || process.env.ECAGENT_API_KEY
686
727
  || process.env.OPENAI_API_KEY;
687
- if (!apiKey) {
688
- throw new Error('No ecagent API key found. Select a Provider via baseagents.ecagent.provider, or set env ECAGENT_API_KEY / OPENAI_API_KEY.');
689
- }
690
728
  const baseUrl = (override?.baseUrl && !override.baseUrl.includes('placeholder') ? override.baseUrl : undefined)
691
729
  || process.env.ECAGENT_BASE_URL
692
730
  || DEFAULT_ECAGENT_BASE_URL;
@@ -694,6 +732,8 @@ export function resolveEcagentConfig(config, override) {
694
732
  || discoveredDefaultModel('ecagent', { ...configured, ...override }) || '';
695
733
  const headers = normalizeStringMap(override?.headers, 'headers');
696
734
  const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
735
+ if (!apiKey)
736
+ throw new NativeConnectionIncompleteError('No ecagent API key found. Select a Provider via baseagents.ecagent.provider, or set env ECAGENT_API_KEY / OPENAI_API_KEY.', { baseUrl, headers, queryParams });
697
737
  const effort = override?.effort ?? configured?.effort;
698
738
  const numberOr = (value, fallback) => (typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : fallback);
699
739
  return {
@@ -3,7 +3,7 @@ import { spawn } from 'child_process';
3
3
  import { createRequire } from 'module';
4
4
  import { ensureDir } from '../utils/atomic-write.js';
5
5
  import { resolveAnthropicConfig } from './baseagent.js';
6
- import { hasExplicitProviderModelPolicy, resolveProviderService } from '../config/providers.js';
6
+ import { resolveProviderService } from '../config/providers.js';
7
7
  import { buildModelRequestHeaders } from './request-identity.js';
8
8
  import { DEFAULT_PERMISSION_MODE } from '../types.js';
9
9
  import { renderActionAsText } from '../core/interaction-router.js';
@@ -34,9 +34,9 @@ import { buildClaudeUnixSocketAllowlist } from '../core/permission/unix-socket-p
34
34
  import { auditToolInfrastructureFailure, auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
35
35
  import { getManagedTaskTempDir, isManagedSessionRuntimeDir } from '../cli/task-context.js';
36
36
  import { unsettledInterruptError, withInterruptDeadline, hasTrustedFullAccessContext } from './runner-types.js';
37
- import { getGatewayPricing as getSharedGatewayPricing } from '../stats/price-resolver.js';
38
- import { resolveModelCapabilities } from '../core/model/model-capabilities.js';
39
- import { contextTokensForUsage, usageForContext, realContextWindowForModel, autoCompactWindowForModel, sdkAutoCompactWindowForModel } from './runner-types.js';
37
+ import { getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
38
+ import { contextTokensForUsage, usageForContext, realContextWindowForModel } from './runner-types.js';
39
+ import { CLAUDE_AUTO_COMPACT_MAX_TOKENS, CLAUDE_AUTO_COMPACT_MIN_TOKENS, resolveCatalogAutoCompactPolicy, resolveModelCapabilities, } from '../core/model/model-capabilities.js';
40
40
  import { hasContextWindowSuffix, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
41
41
  const resolveModule = createRequire(import.meta.url);
42
42
  const CLAUDE_INTERRUPT_TIMEOUT_MS = 5_000;
@@ -459,7 +459,7 @@ async function assertClaudeSettingSourcesHaveLiteralSandboxPaths(cwd, settingSou
459
459
  }
460
460
  }
461
461
  // ── 网关价格缓存 ─────────────────────────────────────────────────────────────
462
- // 价格获取、缓存与计费统一由 price-resolver.ts 管理,各基座共用一份缓存
462
+ // 价格获取、缓存与计费统一由 model-resolver.ts 管理,各基座共用一份缓存
463
463
  // (按 baseUrl、1h TTL、stale-while-revalidate)。
464
464
  /**
465
465
  * 为支持 1M 上下文的模型追加 `[1m]` 后缀——仅在交给 SDK query() 时调用。
@@ -475,7 +475,7 @@ function applyContextWindow(modelId, contextWindow, catalog) {
475
475
  const variantListed = catalog?.models.some(m => hasContextWindowSuffix(m.id) && stripContextWindowSuffix(m.id) === modelId);
476
476
  if (variantListed)
477
477
  return modelId;
478
- if (contextWindow === 1_000_000)
478
+ if (contextWindow >= 1_000_000)
479
479
  return `${modelId}[1m]`;
480
480
  return modelId;
481
481
  }
@@ -484,9 +484,12 @@ function resolveClaudeModelContext(modelId, catalog) {
484
484
  catalog,
485
485
  fallbackContextWindow: realContextWindowForModel(modelId),
486
486
  });
487
+ const policy = resolveCatalogAutoCompactPolicy(catalog, modelId);
488
+ const contextWindow = policy?.contextWindow ?? capabilities.contextWindow;
487
489
  return {
488
- sdkModel: applyContextWindow(capabilities.model, capabilities.contextWindow, catalog),
489
- contextWindow: capabilities.contextWindow,
490
+ sdkModel: applyContextWindow(capabilities.model, contextWindow, catalog),
491
+ contextWindow,
492
+ autoCompactTokens: policy?.autoCompactTokens,
490
493
  };
491
494
  }
492
495
  class MessageStream {
@@ -748,7 +751,11 @@ export class AgentRunner {
748
751
  /** 返回当前网关 /v1/models 的价格缓存(1h TTL,stale-while-revalidate)。
749
752
  * 缺失/过期时 fire-and-forget 触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
750
753
  getGatewayPricing() {
751
- return getSharedGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
754
+ const pricing = getSharedGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
755
+ if (!pricing)
756
+ return undefined;
757
+ // 附带本次调用实际使用的连接来源,供 usage_events 记录 Provider 维度。
758
+ return { ...pricing, source: { baseUrl: this.baseUrl, providerId: this.config?.agents?.claude?.provider } };
752
759
  }
753
760
  async resolveCapabilityRunOptions(projectPath) {
754
761
  let agentConfig = this.agentConfig;
@@ -1441,7 +1448,7 @@ export class AgentRunner {
1441
1448
  * SDK 原始事件 → 标准 AgentEvent 转换
1442
1449
  * 所有 SDK 特有的事件类型引用封装在此方法内
1443
1450
  */
1444
- async *transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, isResuming = false, sandboxSettingsFile, permissionMode, turn, projectPath = process.cwd(), topicBinding = false, recoverySessionId, resolvedContextWindow) {
1451
+ async *transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, isResuming = false, sandboxSettingsFile, permissionMode, turn, projectPath = process.cwd(), topicBinding = false, recoverySessionId, resolvedContextWindow, resolvedAutoCompactTokens) {
1445
1452
  let lastSessionId;
1446
1453
  let pendingSessionId;
1447
1454
  let hasTurnActivity = false;
@@ -1874,7 +1881,7 @@ export class AgentRunner {
1874
1881
  const effectiveModel = callModel ?? this.model;
1875
1882
  const totalTokens = contextTokensForUsage(u, effectiveModel);
1876
1883
  const contextWindowTokens = resolvedContextWindow ?? realContextWindowForModel(sdkModel);
1877
- const autoCompactTokens = autoCompactWindowForModel(sdkModel);
1884
+ const autoCompactTokens = resolvedAutoCompactTokens;
1878
1885
  const aggregateContextUsage = totalTokens > 0 ? {
1879
1886
  totalTokens,
1880
1887
  maxTokens: contextWindowTokens,
@@ -2094,7 +2101,7 @@ export class AgentRunner {
2094
2101
  // 同步用户级配置到内存
2095
2102
  this.syncFromUserSettings();
2096
2103
  // Run preparation and model menus resolve aliases from the same snapshot.
2097
- const runCatalog = modelOverride?.provider && hasExplicitProviderModelPolicy(modelOverride.provider, 'claude')
2104
+ const runCatalog = modelOverride?.provider
2098
2105
  ? await getRunnerCatalog('claude', undefined, { providerId: modelOverride.provider })
2099
2106
  : await this.getModelCatalog();
2100
2107
  if (this.baseUrl) {
@@ -2777,7 +2784,7 @@ export class AgentRunner {
2777
2784
  logger.info(`[AgentRunner] systemPromptAppend: none`);
2778
2785
  }
2779
2786
  const catalogModel = resolveCatalogModel(runCatalog, callModel);
2780
- const { sdkModel, contextWindow } = resolveClaudeModelContext(catalogModel, runCatalog);
2787
+ const { sdkModel, contextWindow, autoCompactTokens } = resolveClaudeModelContext(catalogModel, runCatalog);
2781
2788
  const agentEnv = this.getAgentEnv(runtimeEnv, sessionId, callPermissionMode, modelOverride?.provider);
2782
2789
  const dependencies = executionSandbox.state !== 'off' && !sandboxFallback
2783
2790
  ? inspectClaudeSandboxDependencies(agentEnv)
@@ -2863,6 +2870,11 @@ export class AgentRunner {
2863
2870
  logger.debug(`[Claude-stderr] ${trimmed}`);
2864
2871
  }
2865
2872
  };
2873
+ // Claude Code 的自动压缩阈值只能经 CLI 参数下发:SDK 顶层没有
2874
+ // `autoCompactWindow` 这个 Options 字段(它在 Settings 契约里),旧写法被
2875
+ // 静默丢弃——实测 deepseek-flash 仍在 ~168k 处自动压缩,旧阈值从未生效。
2876
+ // 这里改用 `--autocompact <tokens>`,低于 CLI 下限 100k 时不下发,交给 CLI 默认。
2877
+ const capabilityExtraArgs = capabilityOptions.extraArgs;
2866
2878
  const commonOptions = {
2867
2879
  cwd: projectPath,
2868
2880
  model: sdkModel,
@@ -2875,7 +2887,12 @@ export class AgentRunner {
2875
2887
  && callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
2876
2888
  spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid),
2877
2889
  } : {}),
2878
- autoCompactWindow: sdkAutoCompactWindowForModel(sdkModel, contextWindow),
2890
+ ...(autoCompactTokens !== undefined && autoCompactTokens >= CLAUDE_AUTO_COMPACT_MIN_TOKENS ? {
2891
+ extraArgs: {
2892
+ ...capabilityExtraArgs,
2893
+ autocompact: String(Math.min(autoCompactTokens, CLAUDE_AUTO_COMPACT_MAX_TOKENS)),
2894
+ },
2895
+ } : {}),
2879
2896
  advisorModel: 'haiku',
2880
2897
  canUseTool: canUseToolCallback,
2881
2898
  permissionMode: sdkPermissionMode,
@@ -3160,7 +3177,7 @@ export class AgentRunner {
3160
3177
  this.interruptFns.set(sessionId, () => sdkStream.interrupt());
3161
3178
  }
3162
3179
  // 返回标准 AgentEvent 流(重试由 MessageProcessor 层负责)
3163
- let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
3180
+ let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow, autoCompactTokens);
3164
3181
  const self = this;
3165
3182
  return (async function* () {
3166
3183
  try {
@@ -3178,7 +3195,7 @@ export class AgentRunner {
3178
3195
  else {
3179
3196
  self.interruptFns.delete(sessionId);
3180
3197
  }
3181
- transformed = self.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, undefined, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
3198
+ transformed = self.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, undefined, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow, autoCompactTokens);
3182
3199
  emittedAnyEvent = false;
3183
3200
  yield* transformed;
3184
3201
  return;
@@ -3376,7 +3393,7 @@ export class AgentRunner {
3376
3393
  const callEffort = (modelOverride?.effortMode === 'model_default'
3377
3394
  ? undefined
3378
3395
  : modelOverride?.effort ?? (useModel ? this.effort : undefined));
3379
- const catalog = useModel ? modelOverride?.provider && hasExplicitProviderModelPolicy(modelOverride.provider, 'claude')
3396
+ const catalog = useModel ? modelOverride?.provider
3380
3397
  ? await getRunnerCatalog('claude', undefined, { providerId: modelOverride.provider })
3381
3398
  : await this.getModelCatalog() : undefined;
3382
3399
  if (callModel)
@@ -1,6 +1,7 @@
1
1
  import { assertRunnerModelAllowed, getRunnerCatalog, catalogEfforts, assertCatalogSelectable } from '../core/model/model-catalog.js';
2
2
  // Codex/OpenAI API 不认识 Claude Code SDK 的窗口后缀,必须传入基础模型 ID。
3
3
  import { parseModelId, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
4
+ import { EVOLCORE_AUTO_COMPACT_WINDOW_TOKENS, evolcoreAutoCompactTokens } from '../core/model/model-capabilities.js';
4
5
  import { formatAsyncQuestionAnswer, hasTrustedFullAccessContext, parseAsyncUserQuestions, unsettledInterruptError, withInterruptDeadline } from './runner-types.js';
5
6
  import { requestDangerousCommandPermissionResult } from '../core/permission/approval-gateway.js';
6
7
  import { permissionFailureResult } from '../core/permission/permission-result.js';
@@ -17,7 +18,7 @@ import { catalogHash } from '../core/model/catalog-service.js';
17
18
  import { summarizeToolInputForAudit } from '../utils/tool-summary.js';
18
19
  import { auditCodexApprovalDecision, auditPermissionLifecycle, auditToolInfrastructureFailure, auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
19
20
  import { classifyError, ErrorType, getToolResultErrorText, isOutputTokenLimitError, isRetryableError } from '../utils/error-utils.js';
20
- import { findModelSpec, getGatewayPricing as getSharedGatewayPricing } from '../stats/price-resolver.js';
21
+ import { findModelSpec, getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
21
22
  import { renderActionAsText } from '../core/interaction-router.js';
22
23
  import { buildEnvelope, isInteractionSendAccepted, sendInteractionPayload } from '../core/message/message-utils.js';
23
24
  import { resolveCodexCapabilityThreadConfigForProject } from '../core/capability/capability-manager.js';
@@ -28,9 +29,10 @@ import { classifyEvolcoreShellCommand, canonicalizeEvolcoreCommandArgv, literalS
28
29
  import { compareVersions } from '../utils/npm-ops.js';
29
30
  import { agentCodexTokenPath, getPackageRoot, resolvePaths, resolveRoot } from '../paths.js';
30
31
  import { CODEX_HOOK_TOKEN_ENV, MAIN_CLI_BIN } from '../product.js';
31
- import { ensureSessionRuntimeDir, getManagedTaskTempDir } from '../cli/task-context.js';
32
+ import { ensureSessionRuntimeDir, ensureSessionRuntimeDirAsync, getManagedTaskTempDir } from '../cli/task-context.js';
32
33
  import { buildTranscriptTurns } from '../core/session/session-transcript.js';
33
34
  import { CodexSessionFileAdapter } from '../core/session/adapters/codex-session-file-adapter.js';
35
+ import { readSessionHistoryBackward } from '../core/session/session-fs-store.js';
34
36
  import { repairCodexSessionProvider } from '../core/session/session-file-health.js';
35
37
  import { execFileSync } from 'child_process';
36
38
  import { probeCli, probeCliSync, CODEX_CLI_PROBE_TIMEOUT_MS, CODEX_CLI_PROBE_RETRY_TIMEOUT_MS } from '../utils/cross-platform.js';
@@ -947,6 +949,7 @@ export class CodexRunner {
947
949
  || shellCarrier !== undefined
948
950
  && classifyEvolcoreShellCommand(shellCarrier.command, {
949
951
  dialect: shellCarrier.dialect,
952
+ posixShell: shellCarrier.posixShell,
950
953
  }).kind !== 'none'
951
954
  || rawArgv.length === 1
952
955
  && classifyEvolcoreShellCommand(rawArgv[0], {
@@ -1090,12 +1093,12 @@ export class CodexRunner {
1090
1093
  return true;
1091
1094
  }
1092
1095
  async waitForCodexTurnPersistence(sessionManager, projectPath, threadId, turnId, timeoutMs = 0) {
1093
- const check = () => {
1096
+ const check = async () => {
1094
1097
  try {
1095
1098
  if (typeof sessionManager?.checkSessionTurnPersisted === 'function') {
1096
- return sessionManager.checkSessionTurnPersisted(projectPath, threadId, 'codex', turnId, this.resolvedConfig.agentAid) === true;
1099
+ return await sessionManager.checkSessionTurnPersisted(projectPath, threadId, 'codex', turnId, this.resolvedConfig.agentAid) === true;
1097
1100
  }
1098
- return this.codexSessionFileAdapter.checkTurnPersisted(projectPath, threadId, turnId, this.resolvedConfig.agentAid);
1101
+ return await this.codexSessionFileAdapter.checkTurnPersisted(projectPath, threadId, turnId, this.resolvedConfig.agentAid);
1099
1102
  }
1100
1103
  catch (error) {
1101
1104
  logger.debug(`[CodexRunner] rollout persistence check failed: session=${threadId} turn=${turnId} `
@@ -1105,7 +1108,7 @@ export class CodexRunner {
1105
1108
  };
1106
1109
  const deadline = Date.now() + Math.max(0, timeoutMs);
1107
1110
  while (true) {
1108
- if (check())
1111
+ if (await check())
1109
1112
  return true;
1110
1113
  const remaining = deadline - Date.now();
1111
1114
  if (remaining <= 0)
@@ -1154,6 +1157,18 @@ export class CodexRunner {
1154
1157
  });
1155
1158
  }
1156
1159
  }
1160
+ /**
1161
+ * Codex 自动压缩阈值:由 EvolCore 统一下发,不依赖 Codex 对模型窗口的推断。
1162
+ * 窗口本身超过 550k 的模型才覆盖,其余保持 Codex 自带的默认策略。
1163
+ */
1164
+ buildAutoCompactThreadConfig(model) {
1165
+ if (!model)
1166
+ return null;
1167
+ const window = findModelSpec(resolveRoot(), model)?.context_window ?? 0;
1168
+ if (!(window > EVOLCORE_AUTO_COMPACT_WINDOW_TOKENS))
1169
+ return null;
1170
+ return { model_auto_compact_token_limit: evolcoreAutoCompactTokens(window) };
1171
+ }
1157
1172
  mergeThreadConfig(...configs) {
1158
1173
  const merged = {};
1159
1174
  for (const config of configs) {
@@ -1412,7 +1427,10 @@ export class CodexRunner {
1412
1427
  * 缺失/过期时异步触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
1413
1428
  getGatewayPricing() {
1414
1429
  const conn = this.currentProviderConfig();
1415
- return getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
1430
+ const pricing = getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
1431
+ if (!pricing)
1432
+ return undefined;
1433
+ return { ...pricing, source: { baseUrl: conn.baseUrl, providerId: conn.providerId } };
1416
1434
  }
1417
1435
  getModelCatalog() {
1418
1436
  return getRunnerCatalog('codex', this.resolvedConfig.agentAid, this.currentProviderConfig());
@@ -2345,7 +2363,7 @@ export class CodexRunner {
2345
2363
  ...(fallback
2346
2364
  ? { sandbox: 'danger-full-access' }
2347
2365
  : executionSandbox.sandbox ? { sandbox: executionSandbox.sandbox } : {}),
2348
- config: this.sanitizeThreadEnvironmentConfig(this.mergeThreadConfig(fallback ? undefined : executionSandbox.permissionProfileConfig, persistentRuntimeEnv ? { shell_environment_policy: { set: persistentRuntimeEnv } } : undefined, capabilityConfig, userInputConfig, externalToolConfig, this.buildEvolcoreShellEnvironmentConfig(sessionId, threadSessionToken, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined), this.buildLifecycleLockdownConfig(callMode)), callMode, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined),
2366
+ config: this.sanitizeThreadEnvironmentConfig(this.mergeThreadConfig(fallback ? undefined : executionSandbox.permissionProfileConfig, persistentRuntimeEnv ? { shell_environment_policy: { set: persistentRuntimeEnv } } : undefined, capabilityConfig, userInputConfig, this.buildAutoCompactThreadConfig(callModel), externalToolConfig, this.buildEvolcoreShellEnvironmentConfig(sessionId, threadSessionToken, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined), this.buildLifecycleLockdownConfig(callMode)), callMode, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined),
2349
2367
  ...(developerInstructions ? { developerInstructions } : {}),
2350
2368
  });
2351
2369
  let threadOptions = buildThreadOptions();
@@ -3079,6 +3097,7 @@ export class CodexRunner {
3079
3097
  if (!this.isThreadNotFoundError(error))
3080
3098
  throw error;
3081
3099
  logger.info(`[CodexRunner] Compact thread not loaded, resuming before compact: ${agentSessionId}`);
3100
+ await ensureSessionRuntimeDirAsync(_sessionId);
3082
3101
  const compactModel = stripContextWindowSuffix(modelOverride?.model || this.model);
3083
3102
  const compactEffort = modelOverride?.effortMode === 'model_default'
3084
3103
  ? undefined
@@ -3198,17 +3217,13 @@ export class CodexRunner {
3198
3217
  const sessionFile = this.findCodexSessionFile(threadId);
3199
3218
  if (!sessionFile)
3200
3219
  return undefined;
3201
- let text = '';
3202
- try {
3203
- text = fs.readFileSync(sessionFile, 'utf8');
3204
- }
3205
- catch {
3206
- return undefined;
3207
- }
3208
3220
  const threshold = startedAtMs - 1000;
3209
- for (const line of text.trimEnd().split('\n').reverse()) {
3221
+ let atTail = true;
3222
+ for (const raw of readSessionHistoryBackward(sessionFile)) {
3223
+ const line = atTail ? raw.trimEnd() : raw;
3210
3224
  if (!line.trim())
3211
3225
  continue;
3226
+ atTail = false;
3212
3227
  let entry;
3213
3228
  try {
3214
3229
  entry = JSON.parse(line);
@@ -3407,6 +3422,7 @@ export class CodexRunner {
3407
3422
  // callers without that context remain readonly, including old fullaccess
3408
3423
  // threads. Do not mutate shared turn/session permission maps while forking.
3409
3424
  const sessionKey = context?.sessionId ?? this.findSessionKeyByThread(agentSessionId);
3425
+ await ensureSessionRuntimeDirAsync(sessionKey);
3410
3426
  const mode = normalizePermissionMode(context?.permissionMode).mode;
3411
3427
  const executionSandbox = this.buildExecutionSandboxOptions(sessionKey, mode, projectPath, undefined, undefined, context ?? {});
3412
3428
  const capabilityConfig = await this.resolveCapabilityThreadConfig(projectPath);
@@ -3967,7 +3983,10 @@ export class CodexRunner {
3967
3983
  return await denyInfrastructure('ec_shell_untrusted_executable', 'EC command approval denied because the shell executable failed Windows Authenticode trust validation');
3968
3984
  }
3969
3985
  if (canonicalEcApproval?.parseFailure?.issue === 'unsupported-escape') {
3970
- return await denyInfrastructure('ec_shell_unsupported_escape', 'EC inline text does not support PowerShell `n. Use literal \\n in the argument instead.');
3986
+ return await denyInfrastructure('ec_shell_unsupported_escape', canonicalEcApproval.parseFailure.dialect === 'powershell'
3987
+ ? 'EC inline text does not support PowerShell `n. Use literal \\n in the argument instead.'
3988
+ : literalShellParseRemedy(canonicalEcApproval.parseFailure)
3989
+ ?? 'EC command contains unsupported shell escaping');
3971
3990
  }
3972
3991
  if (canonicalEcApproval?.parseFailure?.issue === 'lossy-cmd-shim') {
3973
3992
  return await denyInfrastructure('ec_shell_lossy_cmd_shim', 'PowerShell cannot pass physical multiline EC arguments through ec.cmd intact. Use ec ... via the PowerShell-native shim instead.');
@@ -22,8 +22,8 @@ import { auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
22
22
  import { resolveEcagentConfig, resolveRuntimeBaseagentModelSelection } from './baseagent.js';
23
23
  import { resolveProviderServiceForBaseagent } from '../config/providers.js';
24
24
  import { buildModelRequestHeaders } from './request-identity.js';
25
- import { getGatewayPricing as getSharedGatewayPricing } from '../stats/price-resolver.js';
26
- import { resolveAutoCompactWindow, resolveModelCapabilities } from '../core/model/model-capabilities.js';
25
+ import { getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
26
+ import { evolcoreAutoCompactTokens, resolveModelCapabilities } from '../core/model/model-capabilities.js';
27
27
  import { appendRequestPath } from './request-identity.js';
28
28
  import { getManagedTaskTempDir } from '../cli/task-context.js';
29
29
  import { unsettledInterruptError, withInterruptDeadline, hasTrustedFullAccessContext, isOneMillionContextModel } from './runner-types.js';
@@ -478,7 +478,7 @@ function createModel(capabilities, baseUrl) {
478
478
  contextWindow: capabilities.contextWindow,
479
479
  maxTokens: capabilities.maxOutputTokens,
480
480
  capabilities,
481
- autoCompactWindow: resolveAutoCompactWindow(capabilities.contextWindow, capabilities.maxOutputTokens, DEFAULT_COMPACTION_SETTINGS.reserveTokens),
481
+ autoCompactWindow: evolcoreAutoCompactTokens(capabilities.contextWindow, Math.max(DEFAULT_COMPACTION_SETTINGS.reserveTokens, capabilities.maxOutputTokens)),
482
482
  compat: {
483
483
  maxTokensField: 'max_tokens',
484
484
  supportsUsageInStreaming: true,
@@ -849,7 +849,10 @@ export class EcagentRunner {
849
849
  * 缺失/过期时异步触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
850
850
  getGatewayPricing() {
851
851
  const conn = this.currentProviderConfig();
852
- return getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
852
+ const pricing = getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
853
+ if (!pricing)
854
+ return undefined;
855
+ return { ...pricing, source: { baseUrl: conn.baseUrl, providerId: conn.providerId } };
853
856
  }
854
857
  currentProviderConfig(providerOverride) {
855
858
  const providerId = providerOverride ?? this.config.providerId;
@@ -26,7 +26,7 @@ import { GeminiSessionFileAdapter } from '../core/session/adapters/gemini-sessio
26
26
  import { logger } from '../utils/logger.js';
27
27
  import { normalizeExecutionPermissionMode, normalizePermissionMode } from '../core/permission/mode.js';
28
28
  import { resolveRoot } from '../paths.js';
29
- import { getGatewayPricing as getSharedGatewayPricing } from '../stats/price-resolver.js';
29
+ import { getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
30
30
  import { workspaceContainsHClassPaths } from '../core/permission/protected-paths.js';
31
31
  import { buildBubblewrapCommand } from '../core/permission/sandbox-runtime.js';
32
32
  import { getManagedTaskTempDir } from '../cli/task-context.js';
@@ -345,7 +345,10 @@ export class GeminiRunner {
345
345
  * 缺失/过期时异步触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
346
346
  getGatewayPricing() {
347
347
  const conn = this.currentProviderConfig();
348
- return getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
348
+ const pricing = getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
349
+ if (!pricing)
350
+ return undefined;
351
+ return { ...pricing, source: { baseUrl: conn.baseUrl, providerId: conn.providerId } };
349
352
  }
350
353
  getModelCatalog() {
351
354
  return getRunnerCatalog('gemini', this.agentAid, this.currentProviderConfig());
@@ -15,11 +15,15 @@ export class BaseagentRunnerUnavailableError extends Error {
15
15
  }
16
16
  /** Codex's native asynchronous reply envelope used by its rich clients. */
17
17
  export function formatAsyncQuestionAnswer(answer) {
18
- return '<send_user_message_question_reply>' + JSON.stringify({
18
+ const reply = '<send_user_message_question_reply>' + JSON.stringify({
19
19
  questionItemId: answer.questionItemId,
20
20
  question: answer.question,
21
21
  answer: answer.answer,
22
22
  }) + '</send_user_message_question_reply>';
23
+ if (!answer.interruptedTools?.length)
24
+ return reply;
25
+ return reply + '\n以下工具在提问暂停前已发起,尚未确认完成。请先核验实际执行状态和结果,不要直接重跑:\n'
26
+ + JSON.stringify(answer.interruptedTools);
23
27
  }
24
28
  export function parseAsyncUserQuestions(value) {
25
29
  if (!Array.isArray(value) || value.length === 0 || value.length > 20) {
@@ -173,23 +177,3 @@ export function isOneMillionContextModel(model) {
173
177
  export function realContextWindowForModel(model) {
174
178
  return isOneMillionContextModel(model) ? 1000000 : 200000;
175
179
  }
176
- /**
177
- * EvolCore auto-compact threshold: fixed at 650k tokens regardless of model
178
- * context window. Large-window models (1M) compress at 650k; small-window
179
- * models (200k/128k) never reach this threshold and rely on the SDK's own
180
- * built-in compaction instead.
181
- */
182
- export function autoCompactWindowForModel(_model) {
183
- return 650_000;
184
- }
185
- /**
186
- * Threshold passed to the Claude Code SDK's autoCompactWindow option.
187
- * Kept window-aware so the SDK's own built-in compaction continues to fire
188
- * at the right point for small-context models (200k/128k), where EvolCore's
189
- * fixed 650k threshold would never trigger.
190
- */
191
- export function sdkAutoCompactWindowForModel(model, resolvedContextWindow) {
192
- const contextWindow = resolvedContextWindow ?? realContextWindowForModel(model);
193
- const reserve = Math.min(10_000, Math.floor(contextWindow * 0.05));
194
- return Math.min(650_000, Math.max(1, contextWindow - reserve));
195
- }
@@ -724,10 +724,14 @@ export async function agentmdGet(aid, opts) {
724
724
  if (opts?.remoteOnly) {
725
725
  const code = String(r.error?.code ?? '');
726
726
  const message = String(r.error?.message ?? r.error);
727
+ const retryable = r.error.retryable;
727
728
  if (code === 'AGENTMD_NOT_FOUND' || /not found|404|missing/i.test(message)) {
728
729
  throw Object.assign(new Error(`agent.md not found for ${aid}`), { code: 'AGENTMD_NOT_FOUND' });
729
730
  }
730
- throw new Error(`Remote agent.md verification unavailable for ${aid}`);
731
+ throw Object.assign(new Error(`Remote agent.md verification unavailable for ${aid}: ${message}`), {
732
+ code: code || 'UNAVAILABLE',
733
+ ...(typeof retryable === 'boolean' ? { retryable } : {}),
734
+ });
731
735
  }
732
736
  // Network/fetch failed — fall back to local file.
733
737
  if (!fs.existsSync(localPath)) {
@@ -183,13 +183,14 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
183
183
  && daemonResult.request_state === 'completed'
184
184
  && ((!!daemonResult.response && typeof daemonResult.response === 'object' && !Array.isArray(daemonResult.response))
185
185
  || (Array.isArray(daemonResult.responses) && daemonResult.responses.length > 0));
186
- if (!daemonResult.message_id && !daemonResult.handoff_id && !completedRequest) {
186
+ if (!daemonResult.message_id && !daemonResult.handoff_id && !completedRequest && daemonResult.status !== 'queued') {
187
187
  return { ok: false, error: 'daemon AUN message send returned no message_id' };
188
188
  }
189
189
  const sent = {
190
190
  ok: true,
191
191
  // handoff_id 是内部投递实例,不再冒充 message_id 回给调用方。
192
192
  message_id: daemonResult.message_id || '',
193
+ outbox_id: daemonResult.outbox_id,
193
194
  handoff_id: daemonResult.handoff_id,
194
195
  target_session_id: daemonResult.target_session_id,
195
196
  seq: daemonResult.seq,
@@ -18,6 +18,7 @@ import fs from 'fs';
18
18
  import path from 'path';
19
19
  import { setTimeout as delay } from 'node:timers/promises';
20
20
  import { ServiceProxyClient, EndpointPolicy } from '@agentunion/fastaun';
21
+ import { DEFAULT_ECWEB_PROXY_VISIBILITY } from '../config/daemon-services.js';
21
22
  import { resolvePaths } from '../paths.js';
22
23
  import { logger } from '../utils/logger.js';
23
24
  import { parseEcwebInstanceRecord } from '../contracts/ecweb-instance.js';
@@ -226,15 +227,16 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
226
227
  return { registered: 0, gatewayRegistered: false };
227
228
  if (!endpoint)
228
229
  continue;
230
+ const visibility = svc.proxy?.visibility ?? (svc.name === 'ecweb' ? DEFAULT_ECWEB_PROXY_VISIBILITY : 'private');
229
231
  try {
230
232
  proxyClient.registerService(svc.name, endpoint, {
231
233
  serviceType: svc.proxy?.serviceType ?? 'http',
232
- visibility: svc.proxy?.visibility ?? 'private',
234
+ visibility,
233
235
  metadata: svc.proxy?.metadata ?? {},
234
236
  });
235
237
  registered += 1;
236
238
  endpoints[svc.name] = endpoint;
237
- logger.info(`${LOG} 注册服务 "${svc.name}" → ${endpoint} (type=${svc.proxy?.serviceType ?? 'http'}, visibility=${svc.proxy?.visibility ?? 'private'})`);
239
+ logger.info(`${LOG} 注册服务 "${svc.name}" → ${endpoint} (type=${svc.proxy?.serviceType ?? 'http'}, visibility=${visibility})`);
238
240
  }
239
241
  catch (e) {
240
242
  logger.warn(`${LOG} 注册服务 "${svc.name}" 失败: ${e?.message || e}`);
@@ -0,0 +1 @@
1
+ {"id":"sha256:12c2256a403ff169bb86c416","builtAt":"2026-11-15T03:59:05.194Z"}