evolcore 0.0.45 → 0.0.47

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 (228) hide show
  1. package/CHANGELOG.md +113 -0
  2. package/bin/ecmsg.js +33 -23
  3. package/dist/ability/application-service.js +1 -2
  4. package/dist/ability/package.js +28 -0
  5. package/dist/agent-template/jobs.js +158 -36
  6. package/dist/agent-template/runtime.js +401 -34
  7. package/dist/agent-template/service.js +764 -369
  8. package/dist/agent-template/tool-runner.js +35 -17
  9. package/dist/agent-template/types.js +7 -4
  10. package/dist/agents/baseagent.js +10 -9
  11. package/dist/agents/claude-runner.js +22 -6
  12. package/dist/agents/codex/app-server-client.js +34 -27
  13. package/dist/agents/codex/diagnostics.js +18 -1
  14. package/dist/agents/codex-runner.js +3 -1
  15. package/dist/agents/ecagent-runner.js +3 -1
  16. package/dist/agents/gemini-runner.js +2 -1
  17. package/dist/aun/group/fs-download.js +1 -1
  18. package/dist/aun/menu/client.js +142 -182
  19. package/dist/aun/rpc/client.js +33 -17
  20. package/dist/aun/service-proxy.js +6 -23
  21. package/dist/channels/aun.js +675 -120
  22. package/dist/channels/daemon.js +1 -1
  23. package/dist/cli/agent-create.js +37 -10
  24. package/dist/cli/agent-template.js +105 -84
  25. package/dist/cli/agent.js +31 -18
  26. package/dist/cli/daemon-commands.js +42 -56
  27. package/dist/cli/daemon-lifecycle-client.js +55 -19
  28. package/dist/cli/directory.js +12 -4
  29. package/dist/cli/ecmsg-gateway.js +5 -2
  30. package/dist/cli/events-command.js +2 -1
  31. package/dist/cli/init-channel.js +2 -2
  32. package/dist/cli/init.js +57 -21
  33. package/dist/cli/integrity-command.js +2 -0
  34. package/dist/cli/managed-command-guard.js +20 -1
  35. package/dist/cli/menu-client.js +7 -5
  36. package/dist/cli/restart-monitor.js +135 -46
  37. package/dist/cli/services-command.js +28 -5
  38. package/dist/cli/task-context.js +83 -15
  39. package/dist/cli/upgrade-command.js +4 -2
  40. package/dist/config/config-field-policy.js +24 -0
  41. package/dist/config/config-manager.js +49 -19
  42. package/dist/config/peer-book-store.js +167 -127
  43. package/dist/config/peer-role-resolver.js +24 -4
  44. package/dist/config/provider-identity-migration.js +158 -6
  45. package/dist/config/provider-identity.js +10 -4
  46. package/dist/config/provider-ipc-service.js +10 -2
  47. package/dist/config/provider-local-sync.js +2 -2
  48. package/dist/config/providers-config.js +95 -10
  49. package/dist/config/providers-import.js +4 -6
  50. package/dist/config/providers.js +14 -3
  51. package/dist/config/role-store.js +1 -1
  52. package/dist/config/schema-migration.js +123 -16
  53. package/dist/config/schema-registry.js +6 -2
  54. package/dist/config-store.js +9 -1
  55. package/dist/core/agent-application-service.js +56 -29
  56. package/dist/core/agent-create-status.js +3 -1
  57. package/dist/core/agent-creation-claim.js +1 -0
  58. package/dist/core/agent-ipc-registration.js +2 -2
  59. package/dist/core/agent-reload-coordinator.js +38 -1
  60. package/dist/core/agent-runtime.js +91 -43
  61. package/dist/core/auth/agent-delegation.js +13 -3
  62. package/dist/core/auth/delegation-diagnostics.js +56 -15
  63. package/dist/core/auth/operation-authorizer.js +2 -2
  64. package/dist/core/auth/operation-catalog.js +3 -3
  65. package/dist/core/bootstrap-service.js +3 -0
  66. package/dist/core/capability/capability-manager.js +3 -1
  67. package/dist/core/channel-loader.js +29 -3
  68. package/dist/core/channel-runtime.js +1 -1
  69. package/dist/core/command/agent-control.js +6 -5
  70. package/dist/core/command/agent-template-menu.js +32 -97
  71. package/dist/core/command/eventcenter-menu.js +61 -13
  72. package/dist/core/command/menu-catalog.js +11 -4
  73. package/dist/core/command/menu-handler.js +39 -12
  74. package/dist/core/command/menu-protocol.js +8 -16
  75. package/dist/core/command/skill-slash.js +6 -2
  76. package/dist/core/command/slash-handler.js +4 -6
  77. package/dist/core/command/team-workspace-bootstrap.js +1 -2
  78. package/dist/core/command/team-workspace-management-store.js +83 -0
  79. package/dist/core/command/team-workspace-management.js +1 -2
  80. package/dist/core/command/team-workspace-team.js +26 -3
  81. package/dist/core/daemon-bootstrap.js +11 -9
  82. package/dist/core/daemon-control.js +4 -7
  83. package/dist/core/daemon-lifecycle.js +189 -143
  84. package/dist/core/evolagent-registry.js +50 -2
  85. package/dist/core/evolagent.js +2 -1
  86. package/dist/core/file-integrity/read.js +9 -16
  87. package/dist/core/file-integrity/store.js +94 -34
  88. package/dist/core/handoff/dispatcher.js +33 -7
  89. package/dist/core/handoff/runtime.js +8 -0
  90. package/dist/core/host-snapshot.js +9 -4
  91. package/dist/core/inference/text-inference.js +12 -2
  92. package/dist/core/initialization/service.js +22 -4
  93. package/dist/core/invoke/invoke-service.js +24 -3
  94. package/dist/core/ipc-registration.js +7 -3
  95. package/dist/core/memory/consolidation.js +6 -6
  96. package/dist/core/message/aun-ipc-sender.js +109 -7
  97. package/dist/core/message/contact-admission.js +6 -2
  98. package/dist/core/message/message-bridge.js +13 -0
  99. package/dist/core/message/message-queue.js +131 -30
  100. package/dist/core/message/pending-hints.js +8 -0
  101. package/dist/core/message/response-engine.js +48 -2
  102. package/dist/core/message/send-routing.js +3 -12
  103. package/dist/core/model/catalog-service.js +13 -0
  104. package/dist/core/model/model-catalog.js +57 -18
  105. package/dist/core/ownership/owner-resolver.js +27 -10
  106. package/dist/core/pack-auth.js +163 -31
  107. package/dist/core/pack-install.js +42 -1
  108. package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
  109. package/dist/core/permission/ec-command-parser.js +3 -1
  110. package/dist/core/permission/shell-environment.js +23 -0
  111. package/dist/core/rate-window.js +6 -1
  112. package/dist/core/relation/peer-identity.js +5 -1
  113. package/dist/core/relation/same-owner-proof.js +2 -1
  114. package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
  115. package/dist/core/session/session-file-health.js +36 -7
  116. package/dist/core/session/session-idle-monitor.js +0 -1
  117. package/dist/core/session/session-manager.js +14 -0
  118. package/dist/core/session/session-title.js +26 -6
  119. package/dist/core/skill/index-generator.js +3 -4
  120. package/dist/core/task/task-image-resources.js +1 -1
  121. package/dist/core/thread/thread-service.js +0 -1
  122. package/dist/core/thread/topic-id.js +8 -0
  123. package/dist/directory/owner-directory-admission.js +17 -0
  124. package/dist/directory/owner-directory-cache.js +3 -1
  125. package/dist/directory/owner-directory-markdown.js +145 -23
  126. package/dist/directory/owner-directory-policy.js +23 -0
  127. package/dist/directory/owner-directory-query-operation.js +20 -6
  128. package/dist/directory/owner-directory-search.js +47 -0
  129. package/dist/eck/message-renderer.js +171 -32
  130. package/dist/ecweb/basic-settings-service.js +7 -3
  131. package/dist/ecweb/providers-service.js +17 -10
  132. package/dist/ecweb/runtime/lifecycle.js +65 -16
  133. package/dist/ecweb/runtime/supervisor.js +79 -50
  134. package/dist/event-center/admission-materializer.js +1 -1
  135. package/dist/event-center/bus-gate.js +48 -4
  136. package/dist/event-center/bus-host.js +3 -3
  137. package/dist/event-center/center-config.js +57 -28
  138. package/dist/event-center/dispatcher.js +8 -0
  139. package/dist/event-center/event-log.js +69 -27
  140. package/dist/event-center/index-generator.js +6 -1
  141. package/dist/event-center/ipc-operation.js +66 -25
  142. package/dist/event-center/pack-loader.js +12 -55
  143. package/dist/event-center/pack-manager.js +5 -3
  144. package/dist/event-center/registry.js +48 -52
  145. package/dist/event-center/runtime.js +219 -81
  146. package/dist/event-center/script-runner.js +18 -7
  147. package/dist/event-center/types.js +9 -1
  148. package/dist/event-center/validation.js +33 -4
  149. package/dist/index.js +132 -75
  150. package/dist/ipc.js +35 -8
  151. package/dist/product.js +1 -0
  152. package/dist/proxy/manager.js +52 -11
  153. package/dist/proxy/service-supervisor.js +265 -67
  154. package/dist/services/dispatcher.js +26 -3
  155. package/dist/services/idempotency.js +128 -0
  156. package/dist/services/identity.js +3 -27
  157. package/dist/services/index-generator.js +5 -1
  158. package/dist/services/index.js +244 -45
  159. package/dist/services/ipc-operation.js +164 -20
  160. package/dist/services/pack-manager.js +37 -9
  161. package/dist/services/router.js +100 -31
  162. package/dist/services/script-runner.js +15 -4
  163. package/dist/services/service-payload.js +50 -2
  164. package/dist/services/validation.js +107 -3
  165. package/dist/trigger/scheduler.js +18 -4
  166. package/dist/trigger/script-sandbox.js +39 -2
  167. package/dist/trigger/state.js +7 -0
  168. package/dist/utils/aid-bind.js +155 -18
  169. package/dist/utils/atomic-write.js +3 -3
  170. package/dist/utils/cross-platform.js +59 -16
  171. package/dist/utils/error-utils.js +26 -1
  172. package/dist/utils/instance-registry.js +94 -35
  173. package/dist/utils/process-introspect.js +187 -27
  174. package/dist/utils/project-path.js +47 -3
  175. package/dist/utils/upgrade-jobs.js +4 -4
  176. package/dist/utils/windows-shell-trust.js +174 -68
  177. package/kits/docs/context-assembly.md +3 -3
  178. package/kits/docs/evolcore/agent.md +28 -10
  179. package/kits/docs/evolcore/aid.md +3 -1
  180. package/kits/docs/evolcore/config.md +22 -0
  181. package/kits/docs/evolcore/directory.md +46 -12
  182. package/kits/docs/evolcore/event-center.md +6 -6
  183. package/kits/docs/evolcore/group-collaboration.md +1 -1
  184. package/kits/docs/evolcore/menu-client.md +7 -5
  185. package/kits/docs/evolcore/menu-protocol.md +5 -3
  186. package/kits/docs/evolcore/msg.md +10 -3
  187. package/kits/docs/evolcore/provider.md +17 -5
  188. package/kits/docs/evolcore/services.md +145 -12
  189. package/kits/docs/evolcore/thread-chain.md +17 -9
  190. package/kits/docs/prompt-loading-architecture.md +4 -4
  191. package/kits/eck_message_manifest.json +46 -3
  192. package/kits/rules/04-relation.md +10 -2
  193. package/kits/rules/06-channel.md +2 -1
  194. package/kits/schemas/providers.schema.2.json +1 -0
  195. package/kits/skills/ec-group/SKILL.md +4 -0
  196. package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
  197. package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
  198. package/kits/skills/thread-ops/SKILL.md +8 -5
  199. package/kits/templates/message-fragments/group-batch-item.md +3 -0
  200. package/kits/templates/message-fragments/group-batch.md +1 -0
  201. package/kits/templates/message-fragments/item-group.md +4 -0
  202. package/kits/templates/message-fragments/item-private.md +4 -0
  203. package/kits/templates/message-fragments/thread-context.md +1 -1
  204. package/kits/templates/system-fragments/commands.md +5 -5
  205. package/kits/templates/system-fragments/managed-runtime.md +1 -1
  206. package/kits/templates/system-fragments/relation.md +11 -7
  207. package/package.json +3 -2
  208. package/scripts/agent-template/index.mjs +9 -4
  209. package/scripts/agent-template/inspect.mjs +16 -9
  210. package/scripts/agent-template/shared/plan.mjs +3 -33
  211. package/scripts/agent-template/shared/template-contract.mjs +186 -3
  212. package/scripts/agent-template/shared/template-package.mjs +119 -10
  213. package/scripts/agent-template/shared/template-runtime.mjs +49 -6
  214. package/scripts/agent-template/shared/template.mjs +5 -5
  215. package/scripts/agent-template/team-pack.mjs +245 -0
  216. package/scripts/agent-template/team-preview.mjs +111 -0
  217. package/scripts/aid-batch/identity-batch.mjs +143 -0
  218. package/dist/ability/versions.js +0 -32
  219. package/dist/aun/model-headers.js +0 -17
  220. package/dist/channels/builtin-plugins.js +0 -19
  221. package/dist/core/command/team-workspace-initializer.js +0 -2
  222. package/dist/core/command/team-workspace-job-store.js +0 -88
  223. package/dist/core/command/team-workspace-management-service.js +0 -2
  224. package/dist/core/contact-bind-registry.js +0 -27
  225. package/dist/event-center/ledger.js +0 -52
  226. package/dist/services/reply.js +0 -55
  227. package/kits/templates/message-fragments/item.md +0 -3
  228. package/scripts/agent-template/pack.mjs +0 -169
@@ -1,11 +1,9 @@
1
1
  import fs from 'node:fs';
2
2
  import path from 'node:path';
3
3
  import { execFile } from 'node:child_process';
4
- import { promisify } from 'node:util';
5
4
  import { getPackageRoot } from '../paths.js';
6
5
  import { templateError } from './types.js';
7
- const execute = promisify(execFile);
8
- export async function runTemplateTool(command, options) {
6
+ export async function runTemplateTool(command, options, control = {}) {
9
7
  const base = process.env.TMPDIR;
10
8
  if (!base || !path.isAbsolute(base))
11
9
  throw templateError('TEMP_UNAVAILABLE', 'Template tools require absolute TMPDIR');
@@ -14,19 +12,39 @@ export async function runTemplateTool(command, options) {
14
12
  const input = path.join(temporary, 'input.json');
15
13
  fs.writeFileSync(input, JSON.stringify({ ...options, packageRoot: getPackageRoot() }), { mode: 0o600 });
16
14
  try {
17
- let stdout;
18
- try {
19
- ({ stdout } = await execute(process.execPath, [path.join(getPackageRoot(), 'scripts', 'agent-template', 'index.mjs'),
20
- command, '--options-file', input], { env: { ...process.env }, maxBuffer: 32 * 1024 * 1024, timeout: 5 * 60_000 }));
21
- }
22
- catch (error) {
23
- const output = error.stdout;
24
- if (!output)
25
- throw templateError('TOOL_FAILED', 'Template tool failed before returning a result');
26
- stdout = output;
27
- }
28
- const lines = stdout.split(/\r?\n/).filter(Boolean);
29
- const result = lines.map(line => { try {
15
+ const stdout = await new Promise((resolve, reject) => {
16
+ if (control.signal?.aborted) {
17
+ reject(templateError('CONFLICT', 'Template job was cancelled'));
18
+ return;
19
+ }
20
+ const child = execFile(process.execPath, [path.join(getPackageRoot(), 'scripts', 'agent-template', 'index.mjs'),
21
+ command, '--options-file', input], { env: { ...process.env }, maxBuffer: 32 * 1024 * 1024,
22
+ timeout: 5 * 60_000, killSignal: 'SIGKILL' }, (error, output) => {
23
+ control.signal?.removeEventListener('abort', abort);
24
+ try {
25
+ control.onExit?.();
26
+ }
27
+ catch (exitError) {
28
+ reject(exitError);
29
+ return;
30
+ }
31
+ if (error && !output)
32
+ reject(templateError('TOOL_FAILED', 'Template tool stopped before returning a result'));
33
+ else
34
+ resolve(output);
35
+ });
36
+ const abort = () => { child.kill('SIGKILL'); };
37
+ control.signal?.addEventListener('abort', abort, { once: true });
38
+ try {
39
+ if (child.pid)
40
+ control.onSpawn?.({ pid: child.pid, input, generation: path.basename(temporary) });
41
+ }
42
+ catch (error) {
43
+ child.kill('SIGKILL');
44
+ reject(error);
45
+ }
46
+ });
47
+ const result = stdout.split(/\r?\n/).filter(Boolean).map(line => { try {
30
48
  return JSON.parse(line);
31
49
  }
32
50
  catch {
@@ -36,7 +54,7 @@ export async function runTemplateTool(command, options) {
36
54
  if (!result)
37
55
  throw templateError('TOOL_FAILED', 'Template tool returned no structured result');
38
56
  if (!result.ok)
39
- throw templateError(result.code ?? 'TOOL_FAILED', result.message, result.data);
57
+ throw templateError(result.code ?? 'TOOL_FAILED', result.message, result.details ?? result.data);
40
58
  return result.data;
41
59
  }
42
60
  finally {
@@ -1,5 +1,8 @@
1
- export const TEMPLATE_ACTIONS = ['inspect', 'build', 'push', 'pull', 'deploy'];
2
- export function templateJobAids(job) { return job.aids ?? [job.aid]; }
3
- export function templateError(code, message, data) {
4
- return Object.assign(new Error(message), { code, ...(data === undefined ? {} : { data }) });
1
+ export const TEMPLATE_ACTIONS = ['inspect', 'build', 'push', 'pull', 'preview', 'deploy',
2
+ 'status', 'resume', 'cancel', 'capabilities'];
3
+ export function templateJobAids(job) {
4
+ return Object.values(job.members).flatMap(member => member.aid ? [member.aid] : []);
5
+ }
6
+ export function templateError(code, message, details) {
7
+ return Object.assign(new Error(message), { code, ...(details === undefined ? {} : { details }) });
5
8
  }
@@ -17,7 +17,7 @@ import { buildCliLaunchCommand, commandExists, isWindows, resolvePowerShellShimP
17
17
  import { execFileSync } from 'child_process';
18
18
  import { parse as parseToml } from 'smol-toml';
19
19
  import { readRuntimeEnvironmentVariable } from '../config/runtime-env.js';
20
- import { resolveProviderServiceForBaseagent, resolveProviderService } from '../config/providers.js';
20
+ import { providerModelEnabled, resolveProviderServiceForBaseagent, resolveProviderService } from '../config/providers.js';
21
21
  /** Resolve the installed Codex CLI entrypoint, including npm shims on Windows. */
22
22
  export function resolveCodexCliPath() {
23
23
  return resolveProbePath('codex');
@@ -232,18 +232,18 @@ export async function resolveRuntimeBaseagentModelSelection(baseagent, configure
232
232
  const { getProviderCatalog, assertCatalogSelectable } = await import('../core/model/model-catalog.js');
233
233
  const catalog = await getProviderCatalog(configured.provider, undefined, false, false, 'ecagent');
234
234
  assertCatalogSelectable(catalog);
235
- model = catalog.models.find(item => item.verification === 'listed' && /deepseek.*flash/iu.test(item.id))?.id;
235
+ model = catalog.models.find(item => (item.verification === 'listed' || catalog.source === 'manual') && /deepseek.*flash/iu.test(item.id))?.id;
236
236
  }
237
237
  else {
238
238
  const connection = resolveOpenaiConfig({ agents: { codex: configured } }, configured);
239
+ const provider = connection.providerId ? resolveProviderServiceForBaseagent(connection.providerId, 'codex') : undefined;
239
240
  const { codexNativeCatalog } = await import('./codex/catalog.js');
240
- const models = await codexNativeCatalog({ ...connection, scope: '<runtime-default>', baseagent: 'codex' }, {
241
- allowCliFallback: false,
242
- });
243
- const overrides = connection.providerId
244
- ? resolveProviderServiceForBaseagent(connection.providerId, 'codex').modelOverrides : {};
245
- model = models?.find(item => item.verification === 'listed' && /^gpt.*terra/iu.test(item.id)
246
- && overrides[item.id]?.enabled !== false && item.supportsTools !== false)?.id;
241
+ const { getProviderCatalog } = await import('../core/model/model-catalog.js');
242
+ const models = provider?.modelPolicy === 'manual'
243
+ ? (await getProviderCatalog(provider.providerId, 'codex')).models
244
+ : await codexNativeCatalog({ ...connection, scope: '<runtime-default>', baseagent: 'codex' }, { allowCliFallback: false });
245
+ model = models?.find(item => (item.verification === 'listed' || provider?.modelPolicy === 'manual') && /^gpt.*terra/iu.test(item.id)
246
+ && providerModelEnabled(item.id, provider?.modelOverrides, provider?.modelPolicy) && item.supportsTools !== false)?.id;
247
247
  }
248
248
  if (!model)
249
249
  throw defaultModelUnavailable(canonical);
@@ -675,6 +675,7 @@ export function resolveEcagentConfig(config, override) {
675
675
  providerServiceType: provider.serviceType,
676
676
  providerStyle: provider.style,
677
677
  modelOverrides: provider.modelOverrides,
678
+ modelPolicy: provider.modelPolicy,
678
679
  };
679
680
  }
680
681
  const isPlaceholder = (value) => !value
@@ -1,10 +1,9 @@
1
- import { getRunnerCatalog, peekRunnerCatalog, catalogEfforts, resolveCatalogModel, assertCatalogSelectable } from '../core/model/model-catalog.js';
2
- import { query, forkSession as sdkForkSession, getSessionMessages as sdkGetSessionMessages, resolveSettings as sdkResolveSettings, } from '@anthropic-ai/claude-agent-sdk';
1
+ import { assertRunnerModelAllowed, getRunnerCatalog, peekRunnerCatalog, catalogEfforts, resolveCatalogModel, assertCatalogSelectable } from '../core/model/model-catalog.js';
3
2
  import { spawn } from 'child_process';
4
3
  import { createRequire } from 'module';
5
4
  import { ensureDir } from '../utils/atomic-write.js';
6
5
  import { resolveAnthropicConfig } from './baseagent.js';
7
- import { resolveProviderService } from '../config/providers.js';
6
+ import { hasExplicitProviderModelPolicy, resolveProviderService } from '../config/providers.js';
8
7
  import { buildModelRequestHeaders } from './request-identity.js';
9
8
  import { DEFAULT_PERMISSION_MODE } from '../types.js';
10
9
  import { renderActionAsText } from '../core/interaction-router.js';
@@ -16,6 +15,7 @@ import { assertOwnershipAuthorization } from '../core/ownership/owner-resolver.j
16
15
  import os from 'os';
17
16
  import crypto from 'crypto';
18
17
  import { logger } from '../utils/logger.js';
18
+ import { resolveProjectDefaultPath } from '../utils/project-path.js';
19
19
  import { createClaudeStartupArgumentsTooLongError, isClaudeStartupArgumentsTooLong, createClaudeCodeStartupError, isClaudeCodeStartupProcessError, } from '../utils/error-utils.js';
20
20
  import { requestDangerousCommandPermission } from '../core/permission/approval-gateway.js';
21
21
  import { checkBashDescription, checkDangerousCommand, checkReadonly, evaluateToolPreflight } from '../core/permission/tool-policy.js';
@@ -444,6 +444,7 @@ function resolveClaudeSettingsDirectory(runtimeEnv) {
444
444
  async function assertClaudeSettingSourcesHaveLiteralSandboxPaths(cwd, settingSources, managedSettings) {
445
445
  if (process.platform !== 'linux' || settingSources.length === 0)
446
446
  return;
447
+ const { resolveSettings: sdkResolveSettings } = await import('@anthropic-ai/claude-agent-sdk');
447
448
  const resolved = await sdkResolveSettings({ cwd, settingSources, managedSettings });
448
449
  for (const source of resolved.sources) {
449
450
  const filesystem = source.settings.sandbox?.filesystem;
@@ -668,7 +669,7 @@ export class AgentRunner {
668
669
  }
669
670
  }
670
671
  getRuntimeGatewayScope(projectPath) {
671
- const configuredProjectPath = this.agentConfig?.projects?.defaultPath;
672
+ const configuredProjectPath = resolveProjectDefaultPath(this.agentConfig?.projects?.defaultPath);
672
673
  return {
673
674
  ...(this.agentAid ? { agentAid: this.agentAid } : {}),
674
675
  ...(typeof projectPath === 'string' && projectPath.trim()
@@ -2093,7 +2094,9 @@ export class AgentRunner {
2093
2094
  // 同步用户级配置到内存
2094
2095
  this.syncFromUserSettings();
2095
2096
  // Run preparation and model menus resolve aliases from the same snapshot.
2096
- const runCatalog = await this.getModelCatalog();
2097
+ const runCatalog = modelOverride?.provider && hasExplicitProviderModelPolicy(modelOverride.provider, 'claude')
2098
+ ? await getRunnerCatalog('claude', undefined, { providerId: modelOverride.provider })
2099
+ : await this.getModelCatalog();
2097
2100
  if (this.baseUrl) {
2098
2101
  // 顺带预热网关价格缓存(1h TTL),让本轮结束写库时已就绪
2099
2102
  void getSharedGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
@@ -2759,6 +2762,7 @@ export class AgentRunner {
2759
2762
  // 本次调用使用的模型/强度:优先 modelOverride(response-engine 取 Agent 级配置后传入),
2760
2763
  // 缺省回落 agent 级 this.model。作为 per-call 入参传入,无共享状态,多对端并发互不污染。
2761
2764
  const callModel = modelOverride?.model || this.model;
2765
+ await assertRunnerModelAllowed('claude', callModel, { providerId: modelOverride?.provider ?? this.catalogConnection().providerId });
2762
2766
  const callEffort = (modelOverride?.effortMode === 'model_default'
2763
2767
  ? undefined
2764
2768
  : modelOverride?.effort ?? this.effort);
@@ -2780,6 +2784,9 @@ export class AgentRunner {
2780
2784
  : undefined;
2781
2785
  if (dependencies?.status === 'missing')
2782
2786
  throw createClaudeSandboxDependencyError(dependencies);
2787
+ // Load before creating temporary settings, so an import failure cannot
2788
+ // leave a partially prepared query behind.
2789
+ const { query } = await import('@anthropic-ai/claude-agent-sdk');
2783
2790
  const capabilityOptions = await this.resolveCapabilityRunOptions(projectPath);
2784
2791
  const managedSettings = callPermissionMode === 'fullaccess'
2785
2792
  ? undefined
@@ -3369,12 +3376,17 @@ export class AgentRunner {
3369
3376
  const callEffort = (modelOverride?.effortMode === 'model_default'
3370
3377
  ? undefined
3371
3378
  : modelOverride?.effort ?? (useModel ? this.effort : undefined));
3372
- const catalog = useModel ? await this.getModelCatalog() : undefined;
3379
+ const catalog = useModel ? modelOverride?.provider && hasExplicitProviderModelPolicy(modelOverride.provider, 'claude')
3380
+ ? await getRunnerCatalog('claude', undefined, { providerId: modelOverride.provider })
3381
+ : await this.getModelCatalog() : undefined;
3382
+ if (callModel)
3383
+ await assertRunnerModelAllowed('claude', callModel, { providerId: modelOverride?.provider ?? this.catalogConnection().providerId });
3373
3384
  if (catalog)
3374
3385
  assertCatalogSelectable(catalog);
3375
3386
  const resolvedModel = catalog && callModel
3376
3387
  ? resolveClaudeModelContext(resolveCatalogModel(catalog, callModel), catalog)
3377
3388
  : undefined;
3389
+ const { query } = await import('@anthropic-ai/claude-agent-sdk');
3378
3390
  return query({
3379
3391
  prompt,
3380
3392
  options: {
@@ -3616,10 +3628,12 @@ export class AgentRunner {
3616
3628
  return fs.existsSync(sessionFile) ? sessionFile : null;
3617
3629
  }
3618
3630
  async forkSession(agentSessionId, projectPath, title) {
3631
+ const { forkSession: sdkForkSession } = await import('@anthropic-ai/claude-agent-sdk');
3619
3632
  const result = await sdkForkSession(agentSessionId, { dir: projectPath, title });
3620
3633
  return result.sessionId;
3621
3634
  }
3622
3635
  async forkSessionAt(agentSessionId, projectPath, assistantMessageId, title) {
3636
+ const { forkSession: sdkForkSession } = await import('@anthropic-ai/claude-agent-sdk');
3623
3637
  const result = await sdkForkSession(agentSessionId, {
3624
3638
  dir: projectPath,
3625
3639
  upToMessageId: assistantMessageId,
@@ -3628,11 +3642,13 @@ export class AgentRunner {
3628
3642
  return result.sessionId;
3629
3643
  }
3630
3644
  async getSessionMessages(agentSessionId, projectPath) {
3645
+ const { getSessionMessages: sdkGetSessionMessages } = await import('@anthropic-ai/claude-agent-sdk');
3631
3646
  return sdkGetSessionMessages(agentSessionId, { dir: projectPath });
3632
3647
  }
3633
3648
  async rewindFiles(agentSessionId, projectPath, userMessageId) {
3634
3649
  logger.info(`[RewindFiles] agentSessionId=${agentSessionId} userMessageId=${userMessageId}`);
3635
3650
  const stderrChunks = [];
3651
+ const { query } = await import('@anthropic-ai/claude-agent-sdk');
3636
3652
  const tempQuery = query({
3637
3653
  prompt: '',
3638
3654
  options: {
@@ -9,7 +9,8 @@ import fs from 'fs';
9
9
  import path from 'path';
10
10
  import { ensureProcessManagedTempDir } from '../../cli/task-context.js';
11
11
  import { getPackageRoot, resolvePaths } from '../../paths.js';
12
- import { killProcess } from '../../utils/cross-platform.js';
12
+ import { killProcessAsync } from '../../utils/cross-platform.js';
13
+ import { isCurrentManagedHookLauncher } from './diagnostics.js';
13
14
  import { registerCodexAppServerProcess, unregisterCodexAppServerProcess, } from './app-server-registry.js';
14
15
  const BUILT_IN_CODEX_PROVIDER_IDS = new Set(['openai']);
15
16
  export const CODEX_THREAD_ACTIVE_WRITER = 'THREAD_ACTIVE_WRITER';
@@ -443,35 +444,44 @@ export class CodexAppServerClient {
443
444
  this.cleanupManagedHookRuntime();
444
445
  return;
445
446
  }
446
- // 优雅关闭:先关闭 stdin,然后发送 SIGTERM,等待进程退出
447
- proc.stdin.end();
448
- if (process.platform === 'win32' && proc.pid)
449
- killProcess(proc.pid, false);
450
- else
451
- proc.kill('SIGTERM');
452
- // 等待进程退出,最多等待 5 秒
453
- await new Promise((resolve) => {
454
- let exited = false;
455
- const timeout = setTimeout(() => {
456
- if (exited)
457
- return;
447
+ // Observe this child before closing stdin or dispatching termination. The
448
+ // Windows command is asynchronous, so its exit can arrive while we await it.
449
+ let exited = proc.exitCode !== null || proc.signalCode !== null;
450
+ let resolveExit;
451
+ const exit = new Promise(resolve => { resolveExit = resolve; });
452
+ const onExit = () => { exited = true; resolveExit(); };
453
+ proc.once('exit', onExit);
454
+ let timeout;
455
+ try {
456
+ if (!exited)
457
+ proc.stdin.end();
458
+ if (!exited) {
459
+ if (process.platform === 'win32' && proc.pid)
460
+ await killProcessAsync(proc.pid, false);
461
+ else
462
+ proc.kill('SIGTERM');
463
+ }
464
+ if (exited)
465
+ return;
466
+ // Retain the original five-second grace period after the termination
467
+ // command settles; an observed exit cancels escalation.
468
+ await Promise.race([exit, new Promise(resolve => { timeout = setTimeout(resolve, 5_000); })]);
469
+ if (!exited) {
458
470
  logger.warn('[CodexAppServer] Process did not exit after SIGTERM, sending SIGKILL');
459
471
  try {
460
472
  if (process.platform === 'win32' && proc.pid)
461
- killProcess(proc.pid, true);
473
+ await killProcessAsync(proc.pid, true);
462
474
  else
463
475
  proc.kill('SIGKILL');
464
476
  }
465
477
  catch { }
466
- resolve();
467
- }, 5000);
468
- proc.once('exit', () => {
469
- exited = true;
470
- clearTimeout(timeout);
471
- resolve();
472
- });
473
- });
474
- this.cleanupManagedHookRuntime();
478
+ }
479
+ }
480
+ finally {
481
+ clearTimeout(timeout);
482
+ proc.off('exit', onExit);
483
+ this.cleanupManagedHookRuntime();
484
+ }
475
485
  }
476
486
  async ensureStarted() {
477
487
  if (this.initialized)
@@ -726,10 +736,7 @@ export class CodexAppServerClient {
726
736
  const currentHookLauncher = !!expectedHookPath && (() => {
727
737
  try {
728
738
  const source = fs.readFileSync(expectedHookPath, 'utf8');
729
- const expectedPackageRoot = JSON.stringify(path.resolve(getPackageRoot()));
730
- return source.includes('EVOLCORE_MANAGED_HOOK_LAUNCHER')
731
- && (source.includes(expectedPackageRoot)
732
- || (process.platform === 'win32' && source.toLowerCase().includes(expectedPackageRoot.toLowerCase())));
739
+ return isCurrentManagedHookLauncher(source, getPackageRoot());
733
740
  }
734
741
  catch {
735
742
  return false;
@@ -7,12 +7,20 @@ import { createRequire } from 'node:module';
7
7
  import { fileURLToPath } from 'node:url';
8
8
  import { parse as parseToml } from 'smol-toml';
9
9
  import { TARGET_PACKAGE_ROOT_ENV } from '../../product.js';
10
+ import { resolveProjectDefaultPath } from '../../utils/project-path.js';
10
11
  export function checkCodexProjectPath(value, options = {}) {
11
12
  const configured = typeof value === 'string' ? value.trim() : '';
12
13
  if (!configured) {
13
14
  return { status: 'invalid', path: configured, warnings: [], reason: 'projects.defaultPath is not configured' };
14
15
  }
15
- const projectPath = path.resolve(configured);
16
+ let resolved;
17
+ try {
18
+ resolved = resolveProjectDefaultPath(configured, options);
19
+ }
20
+ catch (error) {
21
+ return { status: 'invalid', path: configured, warnings: [], reason: error.message };
22
+ }
23
+ const projectPath = path.resolve(resolved);
16
24
  const warnings = [];
17
25
  if ((options.platform ?? process.platform) === 'win32') {
18
26
  if (projectPath.length >= 240) {
@@ -241,6 +249,15 @@ function runtimeFileMayExist(file) {
241
249
  return !['ENOENT', 'ENOTDIR'].includes(error?.code || '');
242
250
  }
243
251
  }
252
+ /** Verify the canonical launcher and share startup's npm-link path comparison. */
253
+ export function isCurrentManagedHookLauncher(launcher, packageRoot) {
254
+ const installer = fileURLToPath(new URL('../../../bin/install-codex-managed-hooks.mjs', import.meta.url));
255
+ const managedHookInstaller = createRequire(import.meta.url)(installer);
256
+ const embeddedPackageRoot = managedHookInstaller.launcherPackageRoot(launcher);
257
+ return !!embeddedPackageRoot && path.isAbsolute(embeddedPackageRoot)
258
+ && launcher.replaceAll('\r\n', '\n') === managedHookInstaller.managedHookLauncher(embeddedPackageRoot)
259
+ && samePackageRoot(embeddedPackageRoot, packageRoot);
260
+ }
244
261
  /** Read-only inspection of the machine-wide Windows Codex managed hook. */
245
262
  export function inspectCodexManagedHook(options = {}) {
246
263
  const paths = codexManagedHookPaths(options);
@@ -1,4 +1,4 @@
1
- import { getRunnerCatalog, catalogEfforts, assertCatalogSelectable } from '../core/model/model-catalog.js';
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
4
  import { formatAsyncQuestionAnswer, hasTrustedFullAccessContext, parseAsyncUserQuestions, unsettledInterruptError, withInterruptDeadline } from './runner-types.js';
@@ -2295,6 +2295,7 @@ export class CodexRunner {
2295
2295
  await this.assertInterruptSettled(sessionId, agentSessionId);
2296
2296
  let resumingThread = !!agentSessionId;
2297
2297
  const modelContextId = modelOverride?.model || this.modelContextId;
2298
+ await assertRunnerModelAllowed('codex', modelContextId, this.currentProviderConfig(modelOverride?.provider));
2298
2299
  const callModel = stripContextWindowSuffix(modelContextId);
2299
2300
  const callEffort = modelOverride?.effortMode === 'model_default'
2300
2301
  ? undefined
@@ -3063,6 +3064,7 @@ export class CodexRunner {
3063
3064
  const release = await this.acquireThreadOperation(this.threadOperationKey(agentSessionId, _sessionId), 'compact');
3064
3065
  let compactAppServer;
3065
3066
  try {
3067
+ await assertRunnerModelAllowed('codex', modelOverride?.model || this.modelContextId, this.currentProviderConfig(modelOverride?.provider));
3066
3068
  const compactMode = normalizeExecutionPermissionMode(modelOverride?.permissionMode ?? this.chatModes.get(_sessionId) ?? this.currentMode);
3067
3069
  const appServer = this.getAppServerClient(compactMode === 'fullaccess', modelOverride?.provider);
3068
3070
  compactAppServer = appServer;
@@ -1,4 +1,4 @@
1
- import { getRunnerCatalog, catalogEfforts, assertCatalogSelectable, resolveCatalogModel, } from '../core/model/model-catalog.js';
1
+ import { assertRunnerModelAllowed, getRunnerCatalog, catalogEfforts, assertCatalogSelectable, resolveCatalogModel, } from '../core/model/model-catalog.js';
2
2
  // Ecagent/OpenAI API 不认识 Claude Code SDK 的窗口后缀,必须传入基础模型 ID。
3
3
  import { stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
4
4
  import fs from 'fs';
@@ -876,6 +876,7 @@ export class EcagentRunner {
876
876
  providerServiceType: provider.serviceType,
877
877
  providerStyle: provider.style,
878
878
  modelOverrides: provider.modelOverrides,
879
+ modelPolicy: provider.modelPolicy,
879
880
  };
880
881
  }
881
882
  listModes() {
@@ -890,6 +891,7 @@ export class EcagentRunner {
890
891
  return getRunnerCatalog('ecagent', this.agentAid, this.currentProviderConfig());
891
892
  }
892
893
  async resolveRunModel(modelId, connection) {
894
+ await assertRunnerModelAllowed('ecagent', modelId, connection);
893
895
  const catalog = await getRunnerCatalog('ecagent', undefined, connection);
894
896
  assertCatalogSelectable(catalog);
895
897
  const canonicalModel = resolveCatalogModel(catalog, modelId);
@@ -1,4 +1,4 @@
1
- import { getRunnerCatalog, assertCatalogSelectable } from '../core/model/model-catalog.js';
1
+ import { assertRunnerModelAllowed, getRunnerCatalog, assertCatalogSelectable } from '../core/model/model-catalog.js';
2
2
  // Gemini API 不认识 Claude Code SDK 的窗口后缀,必须传入基础模型 ID。
3
3
  import { stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
4
4
  /**
@@ -449,6 +449,7 @@ export class GeminiRunner {
449
449
  : undefined;
450
450
  const permissionProfile = resolveGeminiPermissionProfile(requestedPermissionMode, !!bootstrapAgentMdPath);
451
451
  const callModel = modelOverride?.model || this.model;
452
+ await assertRunnerModelAllowed('gemini', callModel, resolved);
452
453
  const managedTaskTmpDir = getManagedTaskTempDir(runtimeEnv);
453
454
  const runtimeDir = managedTaskTmpDir ?? runtimeEnv?.EVOLCORE_SESSION_RUNTIME_DIR;
454
455
  const managedTmpDir = runtimeDir ?? process.env.TMPDIR;
@@ -1,5 +1,4 @@
1
1
  import { createHash } from 'node:crypto';
2
- import { StorageLowLevel, StorageVFS } from '@agentunion/fastaun';
3
2
  export const DEFAULT_FS_CAT_BYTES = 128 * 1024;
4
3
  export const MAX_FS_CAT_BYTES = 128 * 1024;
5
4
  export class FsReadBudgetError extends Error {
@@ -46,6 +45,7 @@ async function downloadWithinBudget(url, maxBytes, headers) {
46
45
  }
47
46
  export async function readPersonalFsBytesWithinBudget(client, path, maxBytes, options) {
48
47
  validateFsReadBudget(maxBytes);
48
+ const { StorageLowLevel, StorageVFS } = await import('@agentunion/fastaun');
49
49
  const lowlevel = new StorageLowLevel(client);
50
50
  const getObject = lowlevel.getObject.bind(lowlevel);
51
51
  lowlevel.getObject = params => getObject({ ...params, offset: 0, limit: maxBytes + 1 });