evolcore 0.0.47 → 0.0.48

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 (218) hide show
  1. package/CHANGELOG.md +56 -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 +139 -39
  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 +31 -16
  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/service-proxy.js +4 -2
  14. package/dist/build-identity.json +1 -0
  15. package/dist/channels/aun.js +81 -24
  16. package/dist/channels/daemon.js +9 -25
  17. package/dist/cli/aun-commands.js +86 -51
  18. package/dist/cli/code-stats.js +19 -8
  19. package/dist/cli/command-log.js +1 -1
  20. package/dist/cli/daemon-commands.js +44 -43
  21. package/dist/cli/directory.js +7 -1
  22. package/dist/cli/ecmsg-gateway.js +5 -2
  23. package/dist/cli/index.js +2 -8
  24. package/dist/cli/init-channel.js +4 -6
  25. package/dist/cli/init.js +72 -50
  26. package/dist/cli/invoke-command.js +1 -1
  27. package/dist/cli/provider-command.js +74 -13
  28. package/dist/cli/role.js +61 -17
  29. package/dist/cli/stats.js +3 -3
  30. package/dist/cli/thread-command.js +16 -51
  31. package/dist/config/boot-log.js +3 -9
  32. package/dist/config/builtin-roles.js +5 -7
  33. package/dist/config/config-manager.js +2 -6
  34. package/dist/config/daemon-services.js +30 -3
  35. package/dist/config/gateway-config.js +2 -2
  36. package/dist/config/invoke-ipc-service.js +6 -4
  37. package/dist/config/peer-bind-code.js +3 -4
  38. package/dist/config/peer-book-store.js +62 -229
  39. package/dist/config/peer-book.js +26 -27
  40. package/dist/config/peer-role-resolver.js +16 -1
  41. package/dist/config/provider-identity-migration.js +4 -1
  42. package/dist/config/provider-ipc-service.js +56 -11
  43. package/dist/config/provider-menu-request.js +24 -5
  44. package/dist/config/provider-templates.js +127 -0
  45. package/dist/config/providers-config.js +59 -8
  46. package/dist/config/providers-management.js +467 -49
  47. package/dist/config/role-command-service.js +248 -1
  48. package/dist/config/schema-migration.js +105 -4
  49. package/dist/core/agent-application-service.js +6 -1
  50. package/dist/core/agent-runtime.js +4 -0
  51. package/dist/core/auth/agent-delegation.js +2 -1
  52. package/dist/core/auth/auth-gateway.js +2 -1
  53. package/dist/core/auth/delegation-authorization.js +3 -0
  54. package/dist/core/auth/operation-authorizer.js +25 -0
  55. package/dist/core/auth/operation-catalog.js +28 -64
  56. package/dist/core/capability/providers/codex-capability-provider.js +7 -8
  57. package/dist/core/channel-loader.js +18 -0
  58. package/dist/core/command/agent-control.js +32 -0
  59. package/dist/core/command/command-handler.js +81 -85
  60. package/dist/core/command/menu-catalog.js +1 -0
  61. package/dist/core/command/menu-handler.js +61 -149
  62. package/dist/core/command/menu-protocol.js +7 -1
  63. package/dist/core/command/provider-menu.js +13 -3
  64. package/dist/core/command/role-menu.js +47 -23
  65. package/dist/core/command/slash-handler.js +26 -43
  66. package/dist/core/command/team-workspace-items.js +81 -12
  67. package/dist/core/command/team-workspace-team.js +9 -71
  68. package/dist/core/command/topic-slash.js +9 -30
  69. package/dist/core/daemon-bootstrap.js +8 -1
  70. package/dist/core/daemon-control.js +7 -7
  71. package/dist/core/evolagent-registry.js +14 -1
  72. package/dist/core/file-integrity/store.js +2 -0
  73. package/dist/core/handoff/runtime.js +37 -1
  74. package/dist/core/inference/text-inference.js +3 -1
  75. package/dist/core/initialization/service.js +11 -6
  76. package/dist/core/interaction-router.js +3 -0
  77. package/dist/core/invoke/executors/text.js +72 -19
  78. package/dist/core/ipc-registration.js +2 -1
  79. package/dist/core/message/aun-ipc-sender.js +165 -55
  80. package/dist/core/message/im-renderer.js +1 -1
  81. package/dist/core/message/message-bridge.js +51 -334
  82. package/dist/core/message/message-log.js +5 -0
  83. package/dist/core/message/message-queue.js +22 -0
  84. package/dist/core/message/message-utils.js +8 -0
  85. package/dist/core/message/response-engine.js +429 -116
  86. package/dist/core/message/send-routing.js +5 -1
  87. package/dist/core/model/catalog-service.js +31 -11
  88. package/dist/core/model/model-capabilities.js +22 -4
  89. package/dist/core/model/model-catalog.js +1 -0
  90. package/dist/core/ownership/owner-resolver.js +328 -50
  91. package/dist/core/permission/protected-paths.js +6 -6
  92. package/dist/core/relation/peer-identity.js +23 -1
  93. package/dist/core/relation/same-owner-proof.js +81 -112
  94. package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
  95. package/dist/core/session/session-file-health.js +13 -7
  96. package/dist/core/session/session-fs-store.js +91 -35
  97. package/dist/core/session/session-manager.js +68 -24
  98. package/dist/core/session/session-mapper.js +14 -34
  99. package/dist/core/session/session-transcript.js +5 -1
  100. package/dist/core/task/task-activity-store.js +84 -0
  101. package/dist/core/task/task-recovery-service.js +12 -0
  102. package/dist/core/thread/command-parser.js +7 -12
  103. package/dist/core/thread/thread-context-storage.js +3 -2
  104. package/dist/core/thread/thread-operation.js +2 -13
  105. package/dist/core/thread/thread-service.js +15 -46
  106. package/dist/directory/owner-directory-admission.js +1 -1
  107. package/dist/directory/owner-directory-cache.js +45 -28
  108. package/dist/directory/owner-directory-markdown.js +13 -1
  109. package/dist/directory/owner-directory-query-operation.js +29 -3
  110. package/dist/directory/owner-directory-remarks.js +11 -3
  111. package/dist/eck/message-renderer.js +84 -24
  112. package/dist/ecweb/basic-settings-service.js +3 -1
  113. package/dist/ecweb/message-context-service.js +1 -1
  114. package/dist/ecweb/pairing.js +4 -3
  115. package/dist/ecweb/providers-service.js +26 -1
  116. package/dist/ecweb/runtime/lifecycle.js +18 -8
  117. package/dist/ecweb/runtime/proxy-access.js +74 -0
  118. package/dist/ecweb/runtime/supervisor.js +4 -2
  119. package/dist/event-center/registry.js +13 -2
  120. package/dist/event-center/runtime.js +103 -11
  121. package/dist/event-center/script-runner.js +5 -5
  122. package/dist/index.js +92 -59
  123. package/dist/ipc.js +13 -2
  124. package/dist/outputs/events.js +62 -0
  125. package/dist/outputs/protocol.js +102 -0
  126. package/dist/outputs/service.js +279 -0
  127. package/dist/paths.js +3 -0
  128. package/dist/proxy/manager.js +43 -13
  129. package/dist/services/index.js +89 -4
  130. package/dist/services/ipc-operation.js +4 -15
  131. package/dist/services/pack-manager.js +12 -1
  132. package/dist/services/router.js +21 -6
  133. package/dist/services/script-runner.js +5 -4
  134. package/dist/services/validation.js +1 -1
  135. package/dist/stats/budget.js +1 -1
  136. package/dist/stats/db.js +19 -0
  137. package/dist/stats/index.js +1 -1
  138. package/dist/stats/{price-resolver.js → model-resolver.js} +305 -24
  139. package/dist/stats/normalizer.js +2 -0
  140. package/dist/stats/query.js +35 -27
  141. package/dist/stats/role-budget.js +5 -2
  142. package/dist/stats/writer.js +10 -6
  143. package/dist/trigger/audit.js +7 -0
  144. package/dist/trigger/authorization.js +105 -11
  145. package/dist/trigger/feedback.js +10 -0
  146. package/dist/trigger/history.js +37 -11
  147. package/dist/trigger/ipc-service.js +12 -1
  148. package/dist/trigger/manager.js +1 -0
  149. package/dist/trigger/scheduler.js +7 -5
  150. package/dist/trigger/script-executor.js +2 -1
  151. package/dist/trigger/script-sandbox.js +9 -3
  152. package/dist/trigger/validation.js +22 -0
  153. package/dist/utils/cross-platform.js +73 -26
  154. package/dist/utils/error-dict.json +94 -4
  155. package/dist/utils/error-utils.js +27 -4
  156. package/dist/utils/evolcore-version.js +36 -65
  157. package/dist/utils/msg-diag.js +1 -0
  158. package/dist/utils/process-introspect.js +12 -7
  159. package/dist/utils/process-tree.js +50 -2
  160. package/dist/utils/windows-shell-trust.js +2 -0
  161. package/dist/workbench/protocol.js +80 -0
  162. package/dist/workbench/service.js +359 -0
  163. package/ecagent/dist/types.d.ts +6 -2
  164. package/kits/docs/context-assembly.md +1 -1
  165. package/kits/docs/evolcore/INDEX.md +2 -2
  166. package/kits/docs/evolcore/config.md +12 -0
  167. package/kits/docs/evolcore/directory.md +22 -3
  168. package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
  169. package/kits/docs/evolcore/model.md +10 -0
  170. package/kits/docs/evolcore/peer.md +19 -65
  171. package/kits/docs/evolcore/provider.md +123 -3
  172. package/kits/docs/evolcore/role.md +80 -0
  173. package/kits/docs/evolcore/services.md +6 -6
  174. package/kits/docs/evolcore/team-workspace.md +1 -1
  175. package/kits/docs/evolcore/thread-chain.md +14 -15
  176. package/kits/docs/evolcore/tool-authorization.md +5 -0
  177. package/kits/docs/evolcore/trigger.md +10 -0
  178. package/kits/eck_message_manifest.json +12 -0
  179. package/kits/provider-templates.json +1213 -0
  180. package/kits/rules/04-relation.md +3 -3
  181. package/kits/schemas/_meta.json +14 -2
  182. package/kits/schemas/contact-book.schema.4.json +52 -0
  183. package/kits/schemas/providers.schema.3.json +200 -0
  184. package/kits/skills/.switches.json +4 -0
  185. package/kits/skills/ability/references/calling.md +1 -1
  186. package/kits/skills/ec-group/SKILL.md +2 -2
  187. package/kits/skills/ec-identity/SKILL.md +19 -72
  188. package/kits/skills/ec-provider/SKILL.md +221 -0
  189. package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
  190. package/kits/skills/ec-trigger/SKILL.md +1 -1
  191. package/kits/skills/thread-ops/SKILL.md +34 -21
  192. package/kits/templates/message-fragments/group-batch-item.md +1 -1
  193. package/kits/templates/message-fragments/group-batch.md +1 -1
  194. package/kits/templates/message-fragments/inject-default.md +1 -1
  195. package/kits/templates/message-fragments/interrupt-insert.md +1 -0
  196. package/kits/templates/message-fragments/item-group.md +1 -1
  197. package/kits/templates/message-fragments/item-private.md +1 -1
  198. package/kits/templates/message-fragments/thread-context.md +1 -1
  199. package/kits/templates/message-fragments/trigger-session.md +1 -1
  200. package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
  201. package/kits/templates/roles/admin.json +2 -19
  202. package/kits/templates/roles/member.json +0 -3
  203. package/kits/templates/system-fragments/baseagent.md +6 -0
  204. package/kits/templates/system-fragments/commands.md +3 -3
  205. package/kits/templates/system-fragments/managed-runtime.md +1 -1
  206. package/kits/templates/system-fragments/relation.md +1 -1
  207. package/kits/templates/system-fragments/thread.md +6 -5
  208. package/package.json +6 -4
  209. package/scripts/agent-template/inspect.mjs +4 -1
  210. package/scripts/agent-template/shared/common.mjs +2 -3
  211. package/scripts/agent-template/shared/template-contract.mjs +2 -1
  212. package/scripts/agent-template/shared/template-package.mjs +9 -2
  213. package/scripts/agent-template/shared/template-runtime.mjs +20 -5
  214. package/scripts/agent-template/team-pack.mjs +6 -3
  215. package/dist/cli/peer.js +0 -127
  216. package/dist/config/peer-operation-service.js +0 -132
  217. package/dist/config/peer-request-service.js +0 -532
  218. package/dist/core/command/connect-menu.js +0 -624
package/dist/cli/init.js CHANGED
@@ -8,7 +8,9 @@ import { scanInstances } from '../utils/instance-registry.js';
8
8
  import { saveDefaultsSafe, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
9
9
  import { currentVersion } from '../config/schema-registry.js';
10
10
  import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
11
- import { resolveEcwebExternalUrl } from '../ecweb/pairing.js';
11
+ import { buildEcwebPairingUrl, fetchRemotePairingCode } from '../ecweb/pairing.js';
12
+ import { waitForEcwebProxyAccess } from '../ecweb/runtime/proxy-access.js';
13
+ import { ipcQuery } from '../ipc.js';
12
14
  import { ensureControlAgentMd, generateControlAid, hasLocalControlIdentity, missingControlIdentityMessage, resolveControlAidDomain, submitControlAidRegistration, } from '../aun/aid/control-aid.js';
13
15
  import { isValidAid } from '../aun/aid/validation.js';
14
16
  /**
@@ -23,7 +25,7 @@ async function probeCodexAvailability() {
23
25
  }
24
26
  import { resolveCodexCliPath, resolveCodexPowerShellShimPath, } from '../agents/baseagent.js';
25
27
  import { assertProjectPathReference, defaultProjectsRoot, hasProjectPathEnvironmentReference } from '../utils/project-path.js';
26
- import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
28
+ import { WEB_CLI_BIN, WEB_PACKAGE_NAME, WEB_PACKAGE_LATEST } from '../product.js';
27
29
  import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
28
30
  import { askInit, printInitCancelHint } from './init-cancel.js';
29
31
  import { AUTO_BASEAGENT_CANDIDATES, BASEAGENT_CANDIDATES, detectAvailableBaseagents, detectBaseagentDetails, } from '../agents/baseagent-availability.js';
@@ -175,7 +177,7 @@ export async function importProvidersForCliInit(available, options = {}) {
175
177
  for (const item of warnings) {
176
178
  const hint = item.baseagent === 'ecagent'
177
179
  ? '请在内部配置中为内置 ecagent 选择可用 Provider。'
178
- : '可使用 ec provider import 或 ECWEB 检查并补齐。';
180
+ : '可使用 ec provider templates 查看内置模板,再用 ec provider create --template <id> 配置;也可在 ECWEB 中添加。';
179
181
  console.warn(`⚠ ${item.baseagent}: ${messages[item.code]}(${item.code});${hint}`);
180
182
  }
181
183
  }
@@ -251,8 +253,8 @@ function installErrorMessage(e) {
251
253
  return String(e?.stderr || e?.message || e).trim();
252
254
  }
253
255
  export async function ensureEcwebInstalledForInit(options = {}) {
254
- const isInstalled = options.isInstalled ?? (() => commandExists(WEB_CLI_BIN));
255
- if (isInstalled())
256
+ const installed = options.isInstalled ? options.isInstalled() : !!(await (await import('../utils/npm-ops.js')).resolveGlobalPkgAsync(WEB_PACKAGE_NAME)) || commandExists(WEB_CLI_BIN);
257
+ if (installed)
256
258
  return { ok: true, installedNow: false };
257
259
  if (!options.quiet)
258
260
  console.log(` 📦 EC Web 组件未安装,正在安装 ${WEB_PACKAGE_LATEST}...`);
@@ -279,6 +281,10 @@ export async function cmdInitWeb(dependencies = {}) {
279
281
  const p = resolvePaths();
280
282
  const hasIdentity = dependencies.hasLocalIdentity ?? hasLocalControlIdentity;
281
283
  const existingConfig = (dependencies.loadConfig ?? loadDaemonConfig)();
284
+ if (ecwebService(existingConfig.services).enabled === false) {
285
+ console.error('❌ ECWeb 已被手动关闭,未修改设置;请先启用 ECWeb 后重试初始化。');
286
+ return false;
287
+ }
282
288
  if (existingConfig.aid && !hasIdentity(existingConfig.aid)) {
283
289
  console.error(`❌ ${missingControlIdentityMessage(existingConfig.aid)}`);
284
290
  return false;
@@ -286,9 +292,21 @@ export async function cmdInitWeb(dependencies = {}) {
286
292
  ensureDataDirs();
287
293
  const daemonRunning = dependencies.isDaemonRunning?.()
288
294
  ?? scanInstances().mains.some(instance => instance.alive);
289
- if (daemonRunning && !(dependencies.loadConfig ?? loadDaemonConfig)().aid) {
290
- console.error("❌ EvolCore 正在运行但未配置控制 AID;请先停止服务后重试。");
291
- return false;
295
+ const readRuntimeAid = dependencies.runtimeAid ?? (async () => {
296
+ const status = await ipcQuery(p.socket, { type: 'status' }, 3000);
297
+ if (!status)
298
+ throw new Error('无法确认运行中 daemon 的身份,未执行重启;请稍后重试');
299
+ return status.controlAid?.aid;
300
+ });
301
+ let runtimeAid;
302
+ if (daemonRunning) {
303
+ try {
304
+ runtimeAid = await readRuntimeAid();
305
+ }
306
+ catch (error) {
307
+ console.error(`❌ ${installErrorMessage(error)}`);
308
+ return false;
309
+ }
292
310
  }
293
311
  const install = await (dependencies.ensureEcwebInstalled ?? ensureEcwebInstalledForInit)();
294
312
  if (!install.ok)
@@ -335,18 +353,32 @@ export async function cmdInitWeb(dependencies = {}) {
335
353
  else {
336
354
  console.log('ℹ 主机名片将在 Web 初始化完成 Owner 绑定后发布。');
337
355
  }
338
- if (ecwebService(config.services)?.enabled !== true) {
339
- config = { ...config, services: setEcwebEnabled(config.services, true) };
340
- try {
341
- (dependencies.saveConfig ?? saveDaemonConfig)(config);
342
- }
343
- catch (error) {
344
- console.error(`❌ 启用 ECWeb 失败: ${installErrorMessage(error)}`);
345
- return false;
346
- }
356
+ if (ecwebService(config.services)?.enabled === false) {
357
+ console.error('❌ ECWeb 已被手动关闭,未修改设置;请先启用 ECWeb 后重试初始化。');
358
+ return false;
347
359
  }
348
360
  try {
349
- if (!daemonRunning && dependencies.startDaemon) {
361
+ if (daemonRunning && runtimeAid !== controlAid) {
362
+ console.log('ℹ 主机控制 AID 已准备,正在重启 EvolCore 使身份生效...');
363
+ const accepted = dependencies.restartDaemon ? await dependencies.restartDaemon()
364
+ : await (await import('./daemon-commands.js')).cmdRestart({ applyPackageUpgrades: false });
365
+ if (!accepted)
366
+ throw new Error('控制 AID 已保存,但重启未确认受理;请检查 ec status 后重试');
367
+ const deadline = Date.now() + 60000;
368
+ let activated = false;
369
+ do {
370
+ try {
371
+ activated = await readRuntimeAid() === controlAid;
372
+ }
373
+ catch { /* IPC is temporarily absent during restart. */ }
374
+ if (activated)
375
+ break;
376
+ await new Promise(resolve => setTimeout(resolve, 250));
377
+ } while (Date.now() < deadline);
378
+ if (!activated)
379
+ throw new Error('控制 AID 已保存,但重启后身份尚未验证;请检查 ec status,勿重复发起重启');
380
+ }
381
+ else if (!daemonRunning && dependencies.startDaemon) {
350
382
  await dependencies.startDaemon();
351
383
  }
352
384
  else if (!daemonRunning) {
@@ -355,7 +387,7 @@ export async function cmdInitWeb(dependencies = {}) {
355
387
  }
356
388
  const started = dependencies.startEcweb
357
389
  ? await dependencies.startEcweb()
358
- : await (await import("./daemon-commands.js")).startEcwebIfEnabled(p);
390
+ : await (await import("./daemon-commands.js")).startEcwebIfEnabled(p, { initialization: true });
359
391
  if (!started) {
360
392
  console.error("❌ ECWeb 未能启动;可稍后运行 ec watch web 重试。");
361
393
  return false;
@@ -367,12 +399,23 @@ export async function cmdInitWeb(dependencies = {}) {
367
399
  }
368
400
  const currentConfig = (dependencies.loadConfig ?? loadDaemonConfig)();
369
401
  const port = ecwebService(currentConfig.services)?.port ?? DEFAULT_ECWEB_PORT;
370
- const externalUrl = resolveEcwebExternalUrl(currentConfig);
402
+ const access = await (dependencies.waitForProxy ?? waitForEcwebProxyAccess)(currentConfig);
371
403
  console.log('\nECweb 初始化:');
372
404
  console.log(` 本地访问: http://localhost:${port}/init`);
373
- if (externalUrl)
374
- console.log(` 外网访问: ${externalUrl}/init`);
375
- console.log(' 远程首次访问需要配对;已有有效 token 可直接继续。');
405
+ console.log(` 外网代理: ${access.message}`);
406
+ if (access.state === 'ready' && access.url) {
407
+ console.log(` 外网访问: ${access.url}/init`);
408
+ const pair = await (dependencies.fetchPairingCode ?? fetchRemotePairingCode)();
409
+ const pairingUrl = pair ? buildEcwebPairingUrl(currentConfig, pair.code, true) : null;
410
+ if (pair && pairingUrl) {
411
+ console.log(` 配对码: ${pair.code}(仅可配对一次,约 ${Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000))} 分钟内有效)`);
412
+ console.log(` 一键初始化: ${pairingUrl}`);
413
+ }
414
+ else {
415
+ console.log(' 配对码暂不可用,可在本机初始化页面获取,或稍后重试 ec init --web。');
416
+ }
417
+ console.log(' 远程首次访问需要配对;已有有效 token 可直接继续。');
418
+ }
376
419
  return true;
377
420
  }
378
421
  // ==================== Main ====================
@@ -752,23 +795,13 @@ export async function initTail(options = {}) {
752
795
  }
753
796
  async function handleEcwebPrompt() {
754
797
  const daemonConfigForEcweb = loadDaemonConfig();
755
- if (ecwebService(daemonConfigForEcweb.services)?.enabled === undefined) {
798
+ if (ecwebService(daemonConfigForEcweb.services).enabled !== false) {
756
799
  const installResult = await ensureEcwebInstalledForInit();
757
800
  if (installResult.ok) {
758
- const cfg = loadDaemonConfig();
759
- saveDaemonConfig({
760
- ...cfg,
761
- services: setEcwebEnabled(cfg.services, true),
762
- });
763
801
  console.log(' ✓ 已启用 ECWeb(ec start 将自动在后台启动)');
764
802
  console.log(' 提示:首次访问运行 ec watch web 查看配对码和 URL');
765
803
  }
766
804
  else {
767
- const cfg = loadDaemonConfig();
768
- saveDaemonConfig({
769
- ...cfg,
770
- services: setEcwebEnabled(cfg.services, false),
771
- });
772
805
  console.log(' 提示:安装完成后运行 ec start;如需立即打开控制台,运行 ec watch web');
773
806
  }
774
807
  }
@@ -930,25 +963,17 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
930
963
  projectsDefaultPath = opts.projectpath;
931
964
  }
932
965
  // ── 5. 读取现有配置;协议冲突由 SDK 注册意图及共识判定 ──
933
- const existingCfg = loadDaemonConfig();
966
+ let existingCfg = loadDaemonConfig();
934
967
  // ── 6. EC Web 安装(先安装成功,再写 enabled 配置)──
935
968
  if (opts.ecweb === true) {
936
969
  const ensureEcweb = dependencies.ensureEcweb ?? (() => ensureEcwebInstalledForInit({ quiet: true }));
937
970
  const installResult = await ensureEcweb();
938
971
  if (!installResult.ok) {
939
- if (ecwebService(existingCfg.services)?.enabled === true) {
940
- try {
941
- saveDaemonConfig({
942
- ...existingCfg,
943
- services: setEcwebEnabled(existingCfg.services, false),
944
- });
945
- }
946
- catch (e) {
947
- fail('ECWEB_INSTALL_FAILED', `failed to install ${WEB_PACKAGE_LATEST}: ${installResult.error}; failed to disable ecweb: ${e?.message || e}`, EXIT_RUNTIME, format);
948
- }
949
- }
950
972
  fail('ECWEB_INSTALL_FAILED', `failed to install ${WEB_PACKAGE_LATEST}: ${installResult.error}`, EXIT_RUNTIME, format);
951
973
  }
974
+ if (ecwebService(existingCfg.services).enabled === false) {
975
+ existingCfg = { ...existingCfg, services: setEcwebEnabled(existingCfg.services, true) };
976
+ }
952
977
  }
953
978
  // ── 7. 写 defaults.json ──
954
979
  try {
@@ -994,9 +1019,6 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
994
1019
  ...existingCfg,
995
1020
  $schema_version: existingCfg.$schema_version ?? 1,
996
1021
  aid: controlAid,
997
- ...(opts.ecweb === true
998
- ? { services: setEcwebEnabled(existingCfg.services, true) }
999
- : {}),
1000
1022
  };
1001
1023
  saveDaemonConfig(next);
1002
1024
  }
@@ -1035,7 +1057,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
1035
1057
  success: true,
1036
1058
  controlAid: controlAid,
1037
1059
  ownerAid,
1038
- ecwebEnabled: opts.ecweb === true || ecwebService(existingCfg.services)?.enabled === true,
1060
+ ecwebEnabled: ecwebService(existingCfg.services).enabled === true,
1039
1061
  baseagent: chosenBaseagent,
1040
1062
  providers,
1041
1063
  projectsDefaultPath: projectsDefaultPath ?? null,
@@ -145,7 +145,7 @@ export async function cmdInvoke(args) {
145
145
  const sessionId = process.env.EVOLCORE_SESSION_ID;
146
146
  const delegationToken = readDelegationCredential();
147
147
  // 托管与非托管都走 daemon:密钥解析($VAR)与 providers.json 的合理归属都在 daemon。
148
- const argv = [
148
+ const argv = sessionId !== undefined || delegationToken ? ['invoke', ...args] : [
149
149
  'invoke',
150
150
  '--provider', parsed.providerId,
151
151
  '--service', parsed.serviceType,
@@ -1,5 +1,8 @@
1
1
  import fs from 'node:fs';
2
2
  import path from 'node:path';
3
+ import { createInterface } from 'node:readline/promises';
4
+ import { Writable } from 'node:stream';
5
+ import { providerTemplateDetail } from '../config/provider-templates.js';
3
6
  import { resolvePaths } from '../paths.js';
4
7
  import { readDelegationCredential, hashCurrentDelegatedCommand } from '../core/auth/agent-delegation.js';
5
8
  import { parseProviderCommand } from '../config/provider-ipc-service.js';
@@ -11,7 +14,14 @@ function providerText(command, data) {
11
14
  for (const [alias, target] of Object.entries(data.aliases ?? {}))
12
15
  lines.push(` ${label(alias)} → ${label(target)}`);
13
16
  };
14
- if (command.operation === 'sync') {
17
+ if (command.operation === 'templates') {
18
+ for (const item of data.templates ?? [data]) {
19
+ lines.push(`${label(item.templateId)} ${label(item.label)} (${label(item.product)})`, ` 服务:${Object.keys(item.provider.services ?? {}).join(', ')} 密钥入口:${label(item.credential.helpUrl)}`);
20
+ for (const field of item.fields)
21
+ lines.push(` 输入:${label(field.name)} ${label(field.label)}${field.required ? '(必填)' : ''}${field.default ? ' 默认 ' + label(field.default) : ''}`);
22
+ }
23
+ }
24
+ else if (command.operation === 'sync') {
15
25
  lines.push('✓ Provider 同步完成', `地址固化:${data.materializedBaseUrls ?? 0} 项`, `配置变更:${data.changedFiles ?? 0} 个文件,更新 ${data.referencesUpdated ?? 0} 处引用`);
16
26
  if (data.imports?.length) {
17
27
  lines.push('本机导入:');
@@ -52,14 +62,16 @@ function providerText(command, data) {
52
62
  lines.push(`${indent}${label(field)}:${label(value)}`);
53
63
  };
54
64
  const provider = structuredClone(data.provider ?? {});
55
- if (provider.common) {
56
- const key = provider.common.apiKey;
65
+ for (const connection of [provider.common, ...Object.values(provider.services ?? {})]) {
66
+ if (!connection)
67
+ continue;
68
+ const key = connection.apiKey;
57
69
  if (key && !/^\$(?:[A-Za-z_][A-Za-z0-9_]*|\{[A-Za-z_][A-Za-z0-9_]*\})$/u.test(key))
58
- provider.common.apiKey = '<redacted>';
70
+ connection.apiKey = '<redacted>';
59
71
  for (const field of ['headers', 'queryParams']) {
60
- if (provider.common[field])
61
- for (const key of Object.keys(provider.common[field]))
62
- provider.common[field][key] = '<redacted>';
72
+ if (connection[field])
73
+ for (const key of Object.keys(connection[field]))
74
+ connection[field][key] = '<redacted>';
63
75
  }
64
76
  }
65
77
  for (const [field, value] of Object.entries(provider))
@@ -73,11 +85,47 @@ function providerText(command, data) {
73
85
  lines.push(`配置版本:${label(data.revision)}`);
74
86
  return lines.join('\n');
75
87
  }
88
+ async function completeTemplateArgs(args, parsed) {
89
+ if (!parsed.templateId || parsed.operation === 'templates' || parsed.file)
90
+ return args;
91
+ if (!process.stdin.isTTY || !process.stdout.isTTY)
92
+ return args;
93
+ const template = providerTemplateDetail(parsed.templateId);
94
+ const result = [...args];
95
+ for (const field of template.fields) {
96
+ if (!field.required || field.default || parsed.templateInput?.inputs?.[field.name])
97
+ continue;
98
+ const prompt = createInterface({ input: process.stdin, output: process.stdout });
99
+ try {
100
+ result.push('--input', field.name + '=' + (await prompt.question(field.label + ': ')).trim());
101
+ }
102
+ finally {
103
+ prompt.close();
104
+ }
105
+ }
106
+ if (!parsed.templateInput?.apiKey) {
107
+ process.stdout.write(template.credential.label + '(输入不回显): ');
108
+ const silent = new Writable({ write(_chunk, _encoding, callback) { callback(); } });
109
+ const prompt = createInterface({ input: process.stdin, output: silent, terminal: true });
110
+ try {
111
+ result.push('--api-key', (await prompt.question('')).trim());
112
+ }
113
+ finally {
114
+ prompt.close();
115
+ silent.end();
116
+ process.stdout.write('\n');
117
+ }
118
+ }
119
+ return result;
120
+ }
76
121
  export async function cmdProvider(args) {
77
122
  if (!args.length || wantsHelp(args)) {
78
123
  console.log('用法: ec provider <命令> [--format json]\n\n'
79
- + ' list\n show <provider-id>\n create --file <path>\n import --file <path>\n'
124
+ + ' list\n show <provider-id>\n templates [template-id]\n create --file <path>\n import --file <path>\n'
80
125
  + ' update <provider-id> --file <path>\n delete <provider-id>\n sync\n\n'
126
+ + '模板:create / update <id> --template <template-id> --file <inputs.json>\n'
127
+ + '宿主终端也可用 --api-key、--name、--services ecagent,claude,codex、可重复 --input 字段=值;TTY 自动补齐。\n'
128
+ + '托管任务模板写入仅接受 --file;同域合并需显式 update,不自动覆盖。\n'
81
129
  + 'sync 扫描导入本机 Provider、固化环境变量地址、迁移 ID 与配置引用,并切换全局默认到 ecagent;不覆盖 Agent 显式基座选择。\n'
82
130
  + '默认输出可读文本;--format json 输出完整结构化响应,适合脚本处理。\n'
83
131
  + '宿主控制终端或 daemon 验证的 trusted fullaccess 任务可管理 process 级 Provider。\n'
@@ -88,15 +136,28 @@ export async function cmdProvider(args) {
88
136
  }
89
137
  const json = args.some((value, index) => value === '--format=json' || (value === '--format' && args[index + 1] === 'json'));
90
138
  try {
91
- const parsed = parseProviderCommand(['provider', ...args]);
139
+ let parsed = parseProviderCommand(['provider', ...args]);
92
140
  const sessionId = process.env.EVOLCORE_SESSION_ID;
93
141
  const delegationToken = readDelegationCredential();
142
+ if (sessionId !== undefined || delegationToken) {
143
+ if (parsed.templateId && parsed.operation !== 'templates' && (!parsed.file || parsed.templateInput)) {
144
+ throw new Error('托管任务模板写入仅支持 --file');
145
+ }
146
+ }
147
+ else {
148
+ args = await completeTemplateArgs(args, parsed);
149
+ parsed = parseProviderCommand(['provider', ...args]);
150
+ }
94
151
  // Keep managed argv identical to the command bound by task approval.
95
152
  // The daemon resolves relative input paths against the session project.
96
- const argv = sessionId !== undefined || delegationToken ? ['provider', ...args] : ['provider', parsed.operation,
97
- ...(parsed.providerId ? [parsed.providerId] : []),
98
- ...(parsed.file ? ['--file', path.resolve(parsed.file)] : []),
99
- ...(parsed.json ? ['--format', 'json'] : [])];
153
+ const argv = ['provider', ...args];
154
+ if (sessionId === undefined && !delegationToken && parsed.file) {
155
+ const index = argv.findIndex(value => value === '--file' || value.startsWith('--file='));
156
+ if (argv[index] === '--file')
157
+ argv[index + 1] = path.resolve(parsed.file);
158
+ else
159
+ argv[index] = '--file=' + path.resolve(parsed.file);
160
+ }
100
161
  let controlToken;
101
162
  if (!sessionId && !delegationToken) {
102
163
  try {
package/dist/cli/role.js CHANGED
@@ -1,3 +1,4 @@
1
+ import fs from 'node:fs';
1
2
  import { resolvePaths } from '../paths.js';
2
3
  import { executeResolvedRoleCommand, resolveRoleCommand, } from '../config/role-command-service.js';
3
4
  import { applyApprovedRoleAssignment } from '../core/command/role-menu.js';
@@ -11,26 +12,50 @@ export async function cmdRole(args) {
11
12
  return;
12
13
  }
13
14
  const json = getArgValue(args, '--format') === 'json';
14
- if (process.env.EVOLCORE_SESSION_ID) {
15
- try {
16
- const result = await runManaged(args, json);
15
+ try {
16
+ if (process.env.EVOLCORE_SESSION_ID !== undefined || readDelegationCredential()) {
17
+ const result = await runManaged(args);
17
18
  output(result, json);
19
+ return;
18
20
  }
19
- catch (err) {
20
- console.error(`❌ ${err.message ?? String(err)}`);
21
- process.exitCode = 1;
21
+ const resolved = resolveRoleCommand(args);
22
+ if (!resolved.ok)
23
+ fail(resolved.reason, resolved.code);
24
+ const selfAid = resolved.command.selfAid;
25
+ const quota = resolved.command.kind === 'quota';
26
+ if (quota) {
27
+ let controlToken;
28
+ try {
29
+ controlToken = fs.readFileSync(resolvePaths().controlToken, 'utf8').trim();
30
+ }
31
+ catch { }
32
+ const { response, transportError } = await queryDaemon(resolvePaths().socket, {
33
+ type: 'role.op', argv: ['role', ...args], controlToken,
34
+ }, 10_000);
35
+ if (!response)
36
+ fail(daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon'), 'DAEMON_UNAVAILABLE');
37
+ if (!response.ok || !response.result)
38
+ fail(response.error || 'role operation failed', response.code, response.data);
39
+ output(response.result, json);
40
+ return;
22
41
  }
23
- return;
42
+ const actorAid = listStaticAgentOwners(selfAid)[0] ?? selfAid;
43
+ const result = await executeResolvedRoleCommand(resolved.command, actorAid, applyApprovedRoleAssignment, {
44
+ self: selfAid, actorRole: 'owner', actorAid,
45
+ });
46
+ if (!result.ok)
47
+ fail(result.error, result.code, result.data);
48
+ output(result, json);
49
+ }
50
+ catch (err) {
51
+ const failure = { ok: false, code: err.code ?? 'ROLE_OPERATION_FAILED', error: err.message ?? String(err),
52
+ ...(err.data !== undefined ? { data: err.data } : {}) };
53
+ if (json)
54
+ output(failure, true);
55
+ else
56
+ console.error(`❌ [${failure.code}] ${failure.error}`);
57
+ process.exitCode = 1;
24
58
  }
25
- const resolved = resolveRoleCommand(args);
26
- if (!resolved.ok)
27
- fail(resolved.reason, resolved.code);
28
- const selfAid = resolved.command.selfAid;
29
- const actorAid = listStaticAgentOwners(selfAid)[0] ?? selfAid;
30
- const result = await executeResolvedRoleCommand(resolved.command, actorAid, applyApprovedRoleAssignment);
31
- if (!result.ok)
32
- fail(result.error, result.code, result.data);
33
- output(result, json);
34
59
  }
35
60
  function output(value, json) {
36
61
  if (json)
@@ -38,7 +63,7 @@ function output(value, json) {
38
63
  else
39
64
  console.log(JSON.stringify(value, null, 2));
40
65
  }
41
- async function runManaged(args, json) {
66
+ async function runManaged(args) {
42
67
  const sessionId = process.env.EVOLCORE_SESSION_ID;
43
68
  const delegationToken = readDelegationCredential();
44
69
  if (!delegationToken)
@@ -70,10 +95,29 @@ function printHelp() {
70
95
  ec role list [--status pending|approved|rejected|expired] [--self <agent-aid>]
71
96
  ec role approve <request-id> [--reason '<text>'] [--self <agent-aid>]
72
97
  ec role reject <request-id> [--reason '<text>'] [--self <agent-aid>]
98
+ ec role quota show <role-id> [--self <agent-aid>] [--format json]
99
+ ec role quota set <role-id> [额度选项] [--self <agent-aid>]
100
+ ec role quota disable <role-id> [--self <agent-aid>]
101
+ ec role quota inherit <role-id> [--self <agent-aid>]
102
+
103
+ 额度选项(仅修改明确传入的字段):
104
+ --enabled true|false 启用或关闭角色用量配额
105
+ --limit <amount|unlimited> 金额上限;0 表示阻止使用,unlimited 表示不限
106
+ --currency CNY|USD 人民币或美元
107
+ --reset daily|weekly|monthly|never 重置周期
108
+ --cost-basis gateway|official 网关价或官方价
109
+ --scope subject|role 每个对端独立额度或同角色共享额度
73
110
 
74
111
  说明:
75
112
  申请不会立即改变权限,只记录一条待审批请求,交由本 Agent 的 owner 审批。
76
113
  approve / reject 只能由本 Agent 的 owner 执行;审批通过后才写入关系角色。
114
+ quota 管理角色定义 usageLimits,不是消息准入频率 access.requestLimit。
115
+ quota set 不自动启用限制;需要时明确传 --enabled true。disable 保留金额等设置。
116
+ inherit 删除角色自己的额度覆盖,恢复使用 member 额度;set 会将当前继承值物化为本角色配置。
117
+ owner/admin 不受角色配额限制;自定义角色没有显式额度时继承 member。
118
+ quota 设置属于角色定义管理,仅 DaemonOwner 或已有可信 /fa 授权任务可执行。
119
+ Owner/Admin 保留当前 Agent 的查询权限;普通 Owner 只能分配已有角色,不能修改额度。
120
+ DaemonOwner 和可信 /fa 可管理同一 daemon 的其他本机 Agent,无需兼任目标 Agent Owner。
77
121
 
78
122
  Options:
79
123
  --self <agent-aid> 本端 agent AID;省略时从当前运行环境推断
package/dist/cli/stats.js CHANGED
@@ -26,7 +26,7 @@ ec stats — Token 用量与费用统计
26
26
  --session <id> 指定会话
27
27
 
28
28
  聚合粒度:
29
- --by hour|day|week|month|model|peer|agent
29
+ --by hour|day|week|month|model|peer|agent|provider
30
30
 
31
31
  快捷视图:
32
32
  --session <id> 单个会话明细
@@ -252,7 +252,7 @@ export async function handleStats(args) {
252
252
  // 全量重建日聚合表(运维兜底/排查),不依赖时间范围。
253
253
  if (flags.rebuild) {
254
254
  const { rebuildDailyRollup, getDb } = await import('../stats/db.js');
255
- const { resolvePrices } = await import('../stats/price-resolver.js');
255
+ const { resolvePrices } = await import('../stats/model-resolver.js');
256
256
  const startedAt = Date.now();
257
257
  // 步骤1:回填 usage_events 的 cost 字段(只处理 cost_official_usd IS NULL 的行)
258
258
  console.log(`${CYAN}正在回填历史事件的费用数据...${RESET}`);
@@ -680,7 +680,7 @@ export async function handleStats(args) {
680
680
  const totCacheAll = totIn + totCacheRead;
681
681
  const sessionCacheHitRate = totCacheAll > 0 ? totCacheRead / totCacheAll : 0;
682
682
  // model_spec
683
- const { resolveModelSpec } = await import('../stats/price-resolver.js');
683
+ const { resolveModelSpec } = await import('../stats/model-resolver.js');
684
684
  const spec = resolveModelSpec(home, last.model);
685
685
  const result = {
686
686
  turn: {