evolcore 0.0.39 → 0.0.41-test.0

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 (153) hide show
  1. package/CHANGELOG.md +93 -0
  2. package/README.md +31 -20
  3. package/bin/codex-managed-hook.mjs +11 -0
  4. package/bin/ec-safe-output.js +25 -3
  5. package/dist/agents/baseagent-availability.js +1 -0
  6. package/dist/agents/claude-runner.js +53 -152
  7. package/dist/agents/codex-runner.js +485 -241
  8. package/dist/agents/ecagent-runner.js +48 -18
  9. package/dist/agents/gemini-runner.js +27 -8
  10. package/dist/agents/runner-types.js +39 -9
  11. package/dist/aun/ability-device-routing.js +26 -0
  12. package/dist/aun/aid/client.js +1 -1
  13. package/dist/aun/aid/control-aid.js +23 -98
  14. package/dist/aun/aid/ownership-operation.js +1 -3
  15. package/dist/aun/group/identity.js +8 -0
  16. package/dist/aun/group/invite-service.js +6 -0
  17. package/dist/aun/msg/managed-operation.js +4 -4
  18. package/dist/aun/msg/p2p.js +28 -12
  19. package/dist/aun/storage/download.js +30 -0
  20. package/dist/aun/storage/index.js +14 -6
  21. package/dist/channels/aun.js +99 -52
  22. package/dist/channels/daemon.js +24 -4
  23. package/dist/channels/dingtalk.js +8 -2
  24. package/dist/channels/feishu.js +6 -1
  25. package/dist/channels/wecom.js +7 -3
  26. package/dist/cli/agent-command.js +2 -0
  27. package/dist/cli/agent-create.js +121 -23
  28. package/dist/cli/agent.js +10 -3
  29. package/dist/cli/aid-bind-command.js +4 -1
  30. package/dist/cli/aun-commands.js +82 -22
  31. package/dist/cli/daemon-commands.js +260 -26
  32. package/dist/cli/index.js +25 -13
  33. package/dist/cli/memory-command.js +33 -14
  34. package/dist/cli/restart-monitor.js +52 -13
  35. package/dist/cli/session-command.js +128 -13
  36. package/dist/cli/stats.js +60 -4
  37. package/dist/cli/task-context.js +1 -0
  38. package/dist/cli/trigger-command.js +2 -2
  39. package/dist/config/access-policy.js +2 -0
  40. package/dist/config/config-field-policy.js +1 -0
  41. package/dist/config/config-operation-service.js +17 -6
  42. package/dist/config/gateway-config.js +1 -1
  43. package/dist/config/peer-role-resolver.js +10 -8
  44. package/dist/contracts/ecweb-service-protocol.js +44 -0
  45. package/dist/core/agent-application-service.js +11 -1
  46. package/dist/core/agent-ipc-registration.js +4 -0
  47. package/dist/core/agent-runtime.js +6 -0
  48. package/dist/core/auth/agent-delegation.js +87 -9
  49. package/dist/core/auth/auth-gateway.js +3 -1
  50. package/dist/core/auth/authorization-audit.js +25 -4
  51. package/dist/core/auth/debug-context.js +5 -1
  52. package/dist/core/auth/operation-catalog.js +24 -0
  53. package/dist/core/command/agent-control.js +91 -12
  54. package/dist/core/command/command-handler.js +64 -47
  55. package/dist/core/command/connect-menu.js +23 -2
  56. package/dist/core/command/menu-catalog.js +49 -12
  57. package/dist/core/command/menu-handler.js +110 -105
  58. package/dist/core/command/menu-protocol.js +29 -3
  59. package/dist/core/command/role-menu.js +7 -6
  60. package/dist/core/command/slash-gate.js +22 -5
  61. package/dist/core/command/slash-handler.js +121 -102
  62. package/dist/core/event-catalog.js +17 -0
  63. package/dist/core/interaction-router.js +2 -1
  64. package/dist/core/ipc-registration.js +44 -8
  65. package/dist/core/memory/batch-meta.js +2 -0
  66. package/dist/core/memory/consolidation-context.js +42 -51
  67. package/dist/core/memory/consolidation-ops-records.js +39 -7
  68. package/dist/core/memory/consolidation-trigger.js +72 -65
  69. package/dist/core/memory/consolidation.js +226 -20
  70. package/dist/core/memory/memory-writer.js +160 -34
  71. package/dist/core/memory/relation-idle-monitor.js +287 -0
  72. package/dist/core/memory/relation-sweep.js +206 -0
  73. package/dist/core/message/aun-ipc-sender.js +31 -5
  74. package/dist/core/message/aun-request-registry.js +97 -3
  75. package/dist/core/message/im-renderer.js +4 -0
  76. package/dist/core/message/message-admission.js +8 -4
  77. package/dist/core/message/message-bridge.js +96 -53
  78. package/dist/core/message/message-log.js +72 -0
  79. package/dist/core/message/message-queue.js +11 -5
  80. package/dist/core/message/outbound.js +70 -0
  81. package/dist/core/message/peer-mode.js +7 -2
  82. package/dist/core/message/response-engine.js +633 -191
  83. package/dist/core/model/model-catalog.js +7 -6
  84. package/dist/core/ownership/owner-resolver.js +384 -178
  85. package/dist/core/permission/ec-command-parser.js +129 -8
  86. package/dist/core/permission/tool-policy.js +35 -14
  87. package/dist/core/role/runtime-policy.js +64 -0
  88. package/dist/core/session/session-capsule.js +197 -0
  89. package/dist/core/session/session-manager.js +172 -18
  90. package/dist/core/session/session-mapper.js +2 -0
  91. package/dist/core/system-session/memory.js +3 -18
  92. package/dist/ecweb/basic-settings-service.js +709 -0
  93. package/dist/ecweb/providers-service.js +172 -0
  94. package/dist/index.js +95 -7
  95. package/dist/ipc.js +100 -19
  96. package/dist/stats/budget.js +1 -1
  97. package/dist/stats/db.js +48 -0
  98. package/dist/stats/index.js +3 -3
  99. package/dist/stats/price-resolver.js +304 -5
  100. package/dist/stats/query.js +328 -3
  101. package/dist/stats/writer.js +79 -6
  102. package/dist/trigger/application-service.js +12 -0
  103. package/dist/trigger/authorization.js +2 -2
  104. package/dist/trigger/feedback.js +18 -7
  105. package/dist/trigger/history.js +36 -0
  106. package/dist/trigger/manager.js +20 -3
  107. package/dist/trigger/parser.js +6 -3
  108. package/dist/trigger/patch.js +1 -1
  109. package/dist/trigger/scheduler.js +3 -0
  110. package/dist/trigger/system-definitions.js +43 -7
  111. package/dist/trigger/validation.js +13 -5
  112. package/dist/utils/ecweb-supervisor.js +31 -10
  113. package/dist/utils/error-utils.js +22 -4
  114. package/dist/utils/evolcore-version.js +3 -2
  115. package/dist/utils/host-info.js +52 -0
  116. package/dist/utils/npm-ops.js +2 -1
  117. package/dist/utils/package-version-info.js +1 -1
  118. package/dist/utils/upgrade-jobs.js +45 -5
  119. package/ecagent/dist/harness/agent-harness.js +4 -1
  120. package/kits/docs/INDEX.md +1 -1
  121. package/kits/docs/aun/ABILITY_CALLING.md +20 -2
  122. package/kits/docs/evolcore/INDEX.md +3 -2
  123. package/kits/docs/evolcore/agent-create.md +3 -2
  124. package/kits/docs/evolcore/agent.md +1 -1
  125. package/kits/docs/evolcore/aid.md +29 -12
  126. package/kits/docs/evolcore/config.md +9 -7
  127. package/kits/docs/evolcore/event.md +1 -0
  128. package/kits/docs/evolcore/fs.md +5 -0
  129. package/kits/docs/evolcore/memory-architecture.md +3 -4
  130. package/kits/docs/evolcore/memory-consolidation.md +28 -7
  131. package/kits/docs/evolcore/memory-tags.md +1 -1
  132. package/kits/docs/evolcore/memory.md +1 -1
  133. package/kits/docs/evolcore/menu-client.md +1 -1
  134. package/kits/docs/evolcore/menu-protocol.md +38 -0
  135. package/kits/docs/evolcore/msg.md +18 -2
  136. package/kits/docs/evolcore/session.md +14 -0
  137. package/kits/eck_manifest.json +3 -3
  138. package/kits/rules/04-relation.md +3 -2
  139. package/kits/schemas/agent-config.schema.13.json +20 -1
  140. package/kits/skills/aid-ability/SKILL.md +35 -6
  141. package/kits/templates/memory-consolidation/generalize.md +32 -4
  142. package/kits/templates/memory-consolidation/notes.md +2 -2
  143. package/kits/templates/memory-consolidation/promote.md +10 -2
  144. package/kits/templates/session-capsule/recovery.md +5 -0
  145. package/kits/templates/session-capsule/renew.md +5 -0
  146. package/kits/templates/system-fragments/baseagent.md +5 -0
  147. package/kits/templates/system-fragments/bootstrap.md +6 -6
  148. package/kits/templates/system-fragments/channel.md +1 -1
  149. package/kits/templates/system-fragments/memory.md +12 -3
  150. package/kits/templates/system-fragments/session.md +1 -1
  151. package/kits/{rules/07-memory-and-thread.md → templates/system-fragments/thread.md} +17 -80
  152. package/package.json +3 -3
  153. package/dist/stats/billing.js +0 -215
@@ -130,6 +130,18 @@ export async function cmdRestartMonitor() {
130
130
  const hasCorrelatedRequest = requestId !== 'unknown';
131
131
  const upgradeJobId = hasCorrelatedRequest ? readRestartRequest(pendingFile, requestId)?.upgradeJobId : undefined;
132
132
  const upgradeJob = typeof upgradeJobId === 'string' ? readUpgradeJob(upgradeJobId) : null;
133
+ let configuredAutoUpgrade = true;
134
+ if (!upgradeJob && !process.argv.includes('--apply-package-upgrades') && !process.argv.includes('--skip-package-upgrades')) {
135
+ try {
136
+ configuredAutoUpgrade = loadDaemonConfig().upgrade?.autoOnStart !== false;
137
+ }
138
+ catch {
139
+ configuredAutoUpgrade = false;
140
+ }
141
+ }
142
+ const applyPackageUpgrades = !!upgradeJob
143
+ || process.argv.includes('--apply-package-upgrades')
144
+ || (!process.argv.includes('--skip-package-upgrades') && configuredAutoUpgrade);
133
145
  if (upgradeJobId && (!upgradeJob || upgradeJob.restartRequestId !== requestId || upgradeJob.released || upgradeJob.deadline <= Date.now())) {
134
146
  if (upgradeJob)
135
147
  updateUpgradeJob(upgradeJob.jobId, { status: 'timeout', success: false, released: true, code: 'UPGRADE_TIMEOUT', reason: 'Update expired before restart preflight' }, '更新已超时,未执行重启');
@@ -222,6 +234,23 @@ export async function cmdRestartMonitor() {
222
234
  process.exitCode = 2;
223
235
  return;
224
236
  }
237
+ if (upgradeJob?.distTag === 'stable') {
238
+ let enabled = false;
239
+ try {
240
+ enabled = loadDaemonConfig().upgrade?.autoOnStart !== false;
241
+ }
242
+ catch { }
243
+ if (!enabled) {
244
+ log('Automatic stable upgrade disabled before restart; leaving the daemon running');
245
+ updateUpgradeJob(upgradeJob.jobId, {
246
+ status: 'failed', success: false, released: true, code: 'AUTO_UPGRADE_DISABLED',
247
+ reason: 'Automatic stable upgrades disabled by autoOnStart',
248
+ }, '自动更新已关闭,未执行重启');
249
+ cleanupPendingFile(pendingFile, log, hasCorrelatedRequest ? requestId : undefined);
250
+ process.exitCode = 2;
251
+ return;
252
+ }
253
+ }
225
254
  if (hasCorrelatedRequest) {
226
255
  if (upgradeJob && (readUpgradeJob(upgradeJob.jobId)?.status !== 'running' || upgradeJob.deadline <= Date.now())) {
227
256
  cleanupPendingFile(pendingFile, log, requestId);
@@ -371,16 +400,24 @@ export async function cmdRestartMonitor() {
371
400
  const stoppedCodex = stopCodexAppServerOrphans();
372
401
  if (stoppedCodex)
373
402
  log(`Cleaned ${stoppedCodex} EvolCore codex app-server orphan(s)`);
374
- // Apply only the preflight cache. There is no registry VERSION query after
375
- // shutdown (npm still downloads the exact cached package when needed).
376
- log('Applying cached version information...');
377
- // 升级会原地替换整包,先留一个可回退的产物副本。备份放 EVOLCORE_HOME 而非包目录:
378
- // Linux/macOS 的全局目录常常不可写,而 HOME 一定可写。
379
- const upgradeBackup = await backupDistForUpgrade(p, log);
380
- const [upgrade] = await applyCachedPackageUpgrades(undefined, {
381
- log,
382
- ...(upgradeJob ? { target: upgradeJob.target, distTag: upgradeJob.distTag, npmConfig: upgradeJob.npmConfig } : {}),
383
- });
403
+ let upgradeBackup = null;
404
+ let upgrade;
405
+ if (applyPackageUpgrades) {
406
+ // Apply only the preflight cache. There is no registry VERSION query after
407
+ // shutdown (npm still downloads the exact cached package when needed).
408
+ log('Applying cached version information...');
409
+ // 升级会原地替换整包,先留一个可回退的产物副本。备份放 EVOLCORE_HOME 而非包目录:
410
+ // Linux/macOS 的全局目录常常不可写,而 HOME 一定可写。
411
+ upgradeBackup = await backupDistForUpgrade(p, log);
412
+ [upgrade] = await applyCachedPackageUpgrades(undefined, {
413
+ log,
414
+ ...(upgradeJob ? { target: upgradeJob.target, distTag: upgradeJob.distTag, npmConfig: upgradeJob.npmConfig } : {}),
415
+ });
416
+ }
417
+ else {
418
+ log('Skipping cached package upgrade because upgrade.autoOnStart=false');
419
+ upgrade = { status: 'skipped', error: 'Automatic package upgrades disabled by autoOnStart' };
420
+ }
384
421
  let upgradeRolledBack;
385
422
  switch (upgrade.status) {
386
423
  case 'upgraded':
@@ -405,9 +442,11 @@ export async function cmdRestartMonitor() {
405
442
  log(`Already up to date (${upgrade.from})`);
406
443
  break;
407
444
  case 'skipped':
408
- log(upgrade.error
409
- ? 'Skipped upgrade (network unavailable)'
410
- : 'Skipped upgrade check (dev mode)');
445
+ log(upgrade.error === 'Automatic package upgrades disabled by autoOnStart'
446
+ ? 'Skipped package upgrade (autoOnStart=false)'
447
+ : upgrade.error
448
+ ? 'Skipped upgrade (network unavailable)'
449
+ : 'Skipped upgrade check (dev mode)');
411
450
  break;
412
451
  case 'failed':
413
452
  log(`⚠ Upgrade failed (${upgrade.from} → ${upgrade.to}): ${upgrade.error}`);
@@ -1,15 +1,20 @@
1
1
  import path from 'path';
2
2
  import fs from 'fs';
3
3
  import { resolvePaths, resolveRoot } from '../paths.js';
4
+ import { authorizeLocalCommand } from './task-context.js';
5
+ import { findSessionCapsule, materializeSessionCapsules } from '../core/session/session-capsule.js';
4
6
  import { scanChatDirs, readLastJsonlLine, } from '../core/session/session-fs-store.js';
5
7
  const HELP_TEXT = `
6
8
  ec session <command> [options]
7
9
 
8
- 本地会话文件查询(不经过 daemon,直接读 $EVOLCORE_HOME/agents/ 下的 session 存档)。
10
+ 本地会话文件查询(读取 $EVOLCORE_HOME/agents/ 下的存档;托管任务先经 daemon 鉴权)。
9
11
 
10
12
  命令:
11
13
  find <sessionId> 按 ec 会话 id(meta_YYYYMMDD_<ts>)定位 session 文件,
12
14
  输出 agentSessionId 与所在位置等元数据
15
+ source <sessionId> 查询直接来源 EC 会话(根会话无来源)
16
+ capsule list <sessionId> 列出该 EC 会话使用的恢复/renew 胶囊
17
+ capsule show <capsuleId> 查看胶囊正文和底层会话轮换关系
13
18
  help 显示本帮助
14
19
 
15
20
  选项:
@@ -58,7 +63,52 @@ function findMetaInTrash(chatDir, metaFileName) {
58
63
  catch { /* 目录不存在,跳过 */ }
59
64
  return hits;
60
65
  }
61
- async function cmdFind(args) {
66
+ async function authorizedChatDirs(args) {
67
+ let scope;
68
+ if (process.env.EVOLCORE_SESSION_ID) {
69
+ scope = await authorizeLocalCommand(['session', ...args]);
70
+ if (!scope.selfAid || !scope.peerRole || scope.peerRole === 'none')
71
+ throw new Error('当前任务身份不可用');
72
+ }
73
+ return scanChatDirs(resolvePaths().sessionsDir).filter(chat => {
74
+ if (!scope)
75
+ return true;
76
+ if (chat.selfAID !== scope.selfAid)
77
+ return false;
78
+ if (scope.peerRole === 'owner' || scope.peerRole === 'admin')
79
+ return true;
80
+ return !!scope.channel && !!scope.channelId
81
+ && chat.channelType === scope.channel && chat.channelId === scope.channelId;
82
+ });
83
+ }
84
+ function findRecords(chats, sessionId) {
85
+ if (!/^meta_[A-Za-z0-9_-]+$/u.test(sessionId))
86
+ throw new Error('无效的 EC 会话 ID');
87
+ return chats.flatMap(chat => {
88
+ const locations = [...findMetaInChatDir(chat.dirPath, `${sessionId}.jsonl`), ...findMetaInTrash(chat.dirPath, `${sessionId}.jsonl`)];
89
+ const records = locations.flatMap(file => {
90
+ const meta = readLastJsonlLine(file);
91
+ return meta?.id === sessionId ? [{ chat, file, meta }] : [];
92
+ });
93
+ if (records.length)
94
+ return records;
95
+ const file = path.join(chat.dirPath, 'active.json');
96
+ const meta = readJsonFileSafe(file);
97
+ return meta?.id === sessionId ? [{ chat, file, meta }] : [];
98
+ });
99
+ }
100
+ function printCapsule(capsule) {
101
+ console.log(`胶囊: ${capsule.capsuleId}`);
102
+ console.log(` EC 会话: ${capsule.sessionId}`);
103
+ if (capsule.sourceSessionId)
104
+ console.log(` 来源 EC 会话: ${capsule.sourceSessionId}`);
105
+ console.log(` cause: ${capsule.cause}`);
106
+ console.log(` sourceAgentSessionId: ${capsule.sourceAgentSessionId ?? '(无)'}`);
107
+ console.log(` agentSessionId: ${capsule.agentSessionId ?? '(尚未绑定)'}`);
108
+ console.log(` 创建: ${new Date(capsule.createdAt).toISOString()}`);
109
+ console.log(` 消费: ${capsule.consumedAt === undefined ? '(待接收)' : new Date(capsule.consumedAt).toISOString()}`);
110
+ }
111
+ async function cmdFind(args, chatDirs) {
62
112
  const jsonFormat = hasFlag(args, '--format') && argValue(args, '--format') === 'json'
63
113
  || hasFlag(args, '--json');
64
114
  // 位置参数已在调用处剥掉子命令,第一个非 flag 参数即 sessionId
@@ -70,14 +120,12 @@ async function cmdFind(args) {
70
120
  }
71
121
  // 允许传入带或不带 .jsonl 后缀的 id
72
122
  const sessionId = rawId.endsWith('.jsonl') ? rawId.slice(0, -'.jsonl'.length) : rawId;
73
- if (!sessionId.startsWith('meta_')) {
123
+ if (!/^meta_[A-Za-z0-9_-]+$/u.test(sessionId)) {
74
124
  console.error(`✗ ec 会话 id 应以 meta_ 开头(如 meta_20261012_1791789158257),收到: ${rawId}`);
75
125
  process.exitCode = 1;
76
126
  return;
77
127
  }
78
128
  const metaFileName = `${sessionId}.jsonl`;
79
- const p = resolvePaths();
80
- const chatDirs = scanChatDirs(p.sessionsDir);
81
129
  const found = [];
82
130
  for (const chat of chatDirs) {
83
131
  const locations = [
@@ -90,6 +138,7 @@ async function cmdFind(args) {
90
138
  continue;
91
139
  found.push({
92
140
  sessionId: meta.id || sessionId,
141
+ sourceSessionId: meta.sourceSessionId ?? null,
93
142
  metaFile,
94
143
  sessionKey: meta.sessionKey,
95
144
  agentSessionId: meta.agentSessionId ?? null,
@@ -114,6 +163,7 @@ async function cmdFind(args) {
114
163
  if (active && active.id === sessionId) {
115
164
  found.push({
116
165
  sessionId,
166
+ sourceSessionId: active.sourceSessionId ?? null,
117
167
  metaFile: activeFile,
118
168
  sessionKey: active.sessionKey,
119
169
  agentSessionId: active.agentSessionId ?? null,
@@ -147,6 +197,8 @@ async function cmdFind(args) {
147
197
  }
148
198
  for (const f of found) {
149
199
  console.log(`ec 会话 id: ${f.sessionId}`);
200
+ if (f.sourceSessionId)
201
+ console.log(` sourceSessionId: ${f.sourceSessionId}`);
150
202
  console.log(` agentSessionId: ${f.agentSessionId ?? '(空)'}`);
151
203
  console.log(` baseagent: ${f.baseagent ?? '(未知)'}`);
152
204
  console.log(` threadId: ${f.threadId || '(主会话)'}`);
@@ -182,13 +234,76 @@ export async function runSessionCommand(args) {
182
234
  console.log(HELP_TEXT);
183
235
  return;
184
236
  }
185
- switch (sub) {
186
- case 'find':
187
- await cmdFind(args.slice(1));
188
- break;
189
- default:
190
- console.error(`✗ 未知子命令: ${sub}`);
191
- console.log(HELP_TEXT);
192
- process.exitCode = 1;
237
+ try {
238
+ const chats = await authorizedChatDirs(args);
239
+ const json = argValue(args, '--format') === 'json' || hasFlag(args, '--json');
240
+ switch (sub) {
241
+ case 'find':
242
+ await cmdFind(args.slice(1), chats);
243
+ break;
244
+ case 'source': {
245
+ const id = args[1];
246
+ if (!id || id.startsWith('-'))
247
+ throw new Error('用法: ec session source <sessionId>');
248
+ const found = findRecords(chats, id);
249
+ if (!found.length)
250
+ throw new Error(`未找到会话 ${id}`);
251
+ const sources = found.map(({ meta }) => ({ sessionId: meta.id, sourceSessionId: meta.sourceSessionId ?? null }));
252
+ if (json)
253
+ console.log(JSON.stringify({ ok: true, found: sources }, null, 2));
254
+ else
255
+ for (const source of sources)
256
+ console.log(source.sourceSessionId ?? '(根会话,无来源)');
257
+ break;
258
+ }
259
+ case 'capsule': {
260
+ const operation = args[1];
261
+ const id = args[2];
262
+ if (!id || id.startsWith('-'))
263
+ throw new Error('用法: ec session capsule list <sessionId> | show <capsuleId>');
264
+ if (operation === 'list') {
265
+ const found = findRecords(chats, id);
266
+ if (!found.length)
267
+ throw new Error(`未找到会话 ${id}`);
268
+ const capsules = [...new Set(found.map(record => record.chat.dirPath))]
269
+ .flatMap(chat => materializeSessionCapsules(chat).filter(capsule => capsule.sessionId === id));
270
+ if (json)
271
+ console.log(JSON.stringify({ ok: true, sessionId: id, capsules }, null, 2));
272
+ else if (!capsules.length)
273
+ console.log('(无胶囊)');
274
+ else
275
+ for (const capsule of capsules)
276
+ printCapsule(capsule);
277
+ }
278
+ else if (operation === 'show') {
279
+ if (!/^cap_[A-Za-z0-9_-]+$/u.test(id))
280
+ throw new Error('无效的胶囊 ID');
281
+ const capsules = chats.flatMap(chat => {
282
+ const capsule = findSessionCapsule(chat.dirPath, id);
283
+ return capsule ? [capsule] : [];
284
+ });
285
+ if (!capsules.length)
286
+ throw new Error(`未找到胶囊 ${id}`);
287
+ if (json)
288
+ console.log(JSON.stringify({ ok: true, capsules }, null, 2));
289
+ else
290
+ for (const capsule of capsules) {
291
+ printCapsule(capsule);
292
+ console.log(`\n${capsule.content}\n`);
293
+ }
294
+ }
295
+ else
296
+ throw new Error('用法: ec session capsule list <sessionId> | show <capsuleId>');
297
+ break;
298
+ }
299
+ default:
300
+ console.error(`✗ 未知子命令: ${sub}`);
301
+ console.log(HELP_TEXT);
302
+ process.exitCode = 1;
303
+ }
304
+ }
305
+ catch (error) {
306
+ console.error(`✗ ${error instanceof Error ? error.message : String(error)}`);
307
+ process.exitCode = 1;
193
308
  }
194
309
  }
package/dist/cli/stats.js CHANGED
@@ -4,8 +4,9 @@
4
4
  import { resolveRoot } from '../paths.js';
5
5
  import { wantsHelp } from './help.js';
6
6
  import { authorizeLocalCommand } from './task-context.js';
7
- import { queryAggregated, querySessionTurns, queryContextBreakdown, queryTopPeers, queryTopModels, queryMessageAggregated, queryPeerList, querySummary, queryPeerDaily, queryTaskModelCalls, querySessionModelCalls } from '../stats/query.js';
7
+ import { queryAggregated, querySessionTurns, queryContextBreakdown, queryTopPeers, queryTopModels, queryMessageAggregated, queryPeerList, querySummary, queryPeerDaily, queryTaskModelCalls, querySessionModelCalls, queryTaskSummary } from '../stats/query.js';
8
8
  import { getBudgetStatus } from '../stats/budget.js';
9
+ import { normalizeUsage } from '../stats/normalizer.js';
9
10
  const HELP = `ec stats — Token 用量与费用统计
10
11
 
11
12
  Usage: ec stats [options]
@@ -266,6 +267,48 @@ export async function handleStats(args) {
266
267
  }
267
268
  }
268
269
  console.log(`${GREEN}✓ 回填完成:${updated} 条事件${RESET}`);
270
+ // 步骤1b:回填 model_calls 的 cost 字段(逐次调用明细,同样只处理金额为 NULL 的行)
271
+ // 明细行与 usage_events 走同一套价目,回填后 task 级金额可直接 SUM 对账。
272
+ let callsUpdated = 0;
273
+ try {
274
+ const pendingCalls = db.prepare(`
275
+ SELECT id, ts, agent_aid, peer_key, session_id, model,
276
+ input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens
277
+ FROM model_calls WHERE cost_official_usd IS NULL
278
+ `).all();
279
+ for (let i = 0; i < pendingCalls.length; i += batchSize) {
280
+ db.exec('BEGIN');
281
+ const batch = pendingCalls.slice(i, i + batchSize);
282
+ for (const call of batch) {
283
+ const event = normalizeUsage({
284
+ input_tokens: call.input_tokens ?? 0,
285
+ output_tokens: call.output_tokens ?? 0,
286
+ cache_creation_input_tokens: call.cache_creation_tokens ?? 0,
287
+ cache_read_input_tokens: call.cache_read_tokens ?? 0,
288
+ }, {
289
+ ts: call.ts,
290
+ agent_aid: call.agent_aid ?? '',
291
+ peer_key: call.peer_key ?? '',
292
+ session_id: call.session_id ?? undefined,
293
+ model: call.model || 'unknown',
294
+ turns: 1,
295
+ });
296
+ const prices = resolvePrices(home, event);
297
+ db.prepare(`
298
+ UPDATE model_calls
299
+ SET cost_official_usd = ?, cost_official_cny = ?,
300
+ cost_gateway_usd = ?, cost_gateway_cny = ?
301
+ WHERE id = ?
302
+ `).run(prices.official?.usd ?? null, prices.official?.cny ?? null, prices.gateway?.usd ?? null, prices.gateway?.cny ?? null, call.id);
303
+ callsUpdated++;
304
+ }
305
+ db.exec('COMMIT');
306
+ }
307
+ console.log(`${GREEN}✓ 模型调用明细回填完成:${callsUpdated} 条${RESET}`);
308
+ }
309
+ catch (e) {
310
+ console.log(`${YELLOW}⚠ 模型调用明细回填跳过:${e?.message || e}${RESET}`);
311
+ }
269
312
  // 步骤2:重建 usage_daily(会自动聚合 cost 字段)
270
313
  console.log(`${CYAN}正在重建日聚合表...${RESET}`);
271
314
  const n = rebuildDailyRollup(home);
@@ -432,17 +475,30 @@ export async function handleStats(args) {
432
475
  return;
433
476
  }
434
477
  console.log(`\n${BOLD}📊 模型用量明细 — ${key}${RESET}\n`);
435
- const headers = ['#', 'Model', 'Source', 'Input', 'Output', 'CacheR', 'CacheW', 'Provider Thread', 'Task', 'Deg'];
478
+ const headers = ['#', 'Model', 'Source', 'Input', 'Output', 'CacheR', 'CacheW', 'Official', 'Gateway', 'Provider Thread', 'Deg'];
436
479
  const tableRows = rows.map(r => [
437
480
  String(r.call_index),
438
481
  r.model.split('-').slice(0, 3).join('-'),
439
482
  r.source,
440
483
  fmtTokens(r.input_tokens), fmtTokens(r.output_tokens),
441
484
  fmtTokens(r.cache_read_tokens), fmtTokens(r.cache_creation_tokens),
485
+ r.cost_official_usd != null && r.cost_official_usd > 0 ? '$' + r.cost_official_usd.toFixed(4) : '—',
486
+ r.cost_gateway_usd != null && r.cost_gateway_usd > 0 ? '$' + r.cost_gateway_usd.toFixed(4) : '—',
442
487
  r.provider_thread_id ?? '',
443
- r.task_id, r.degraded ? 'Y' : '',
488
+ r.degraded ? 'Y' : '',
444
489
  ]);
445
490
  printTable(headers, tableRows);
491
+ // 汇总行
492
+ if (byTask) {
493
+ const sum = queryTaskSummary(home, key);
494
+ console.log(`\n Tokens: input ${fmtTokens(sum.input_tokens)} output ${fmtTokens(sum.output_tokens)} cache_read ${fmtTokens(sum.cache_read_tokens)} cache_write ${fmtTokens(sum.cache_creation_tokens)}`);
495
+ if (sum.cost_official_usd > 0 || sum.cost_official_cny > 0) {
496
+ console.log(` Official: ${GREEN}$${sum.cost_official_usd.toFixed(4)}${RESET} ¥${sum.cost_official_cny.toFixed(4)}`);
497
+ }
498
+ if (sum.cost_gateway_usd > 0 || sum.cost_gateway_cny > 0) {
499
+ console.log(` Gateway: ${GREEN}$${sum.cost_gateway_usd.toFixed(4)}${RESET} ¥${sum.cost_gateway_cny.toFixed(4)}`);
500
+ }
501
+ }
446
502
  console.log();
447
503
  return;
448
504
  }
@@ -610,7 +666,7 @@ export async function handleStats(args) {
610
666
  const totCacheAll = totIn + totCacheRead;
611
667
  const sessionCacheHitRate = totCacheAll > 0 ? totCacheRead / totCacheAll : 0;
612
668
  // model_spec
613
- const { resolveModelSpec } = await import('../stats/billing.js');
669
+ const { resolveModelSpec } = await import('../stats/price-resolver.js');
614
670
  const spec = resolveModelSpec(home, last.model);
615
671
  const result = {
616
672
  turn: {
@@ -47,6 +47,7 @@ function normalizeTaskRuntimeContext(value) {
47
47
  executionSource: value.executionSource === 'fullaccess-command'
48
48
  || value.executionSource === 'trigger'
49
49
  || value.executionSource === 'agent-policy'
50
+ || value.executionSource === 'session-policy'
50
51
  ? value.executionSource : undefined,
51
52
  daemonRuntimeEpoch: optionalString(value.daemonRuntimeEpoch),
52
53
  threadId: optionalString(value.threadId),
@@ -365,7 +365,7 @@ export async function buildTriggerCreateRequest(args, fileScope, defaultAgentAid
365
365
  ...(parsed.targetSession === 'thread' ? { threadId: parsed.targetThreadId } : {}),
366
366
  },
367
367
  },
368
- reliability: { concurrency: 'forbid', missedPolicy: 'run_once', retry: { maxAttempts: 0, backoffMs: 30_000 } },
368
+ reliability: { concurrency: 'forbid', missedPolicy: 'run_once', retry: { maxAttempts: 1, backoffMs: 30_000 } },
369
369
  limits: limitsFromParsed(parsed),
370
370
  };
371
371
  const files = script ? [{
@@ -654,7 +654,7 @@ function loadDefinitionWithFiles(inputPath, fileScope) {
654
654
  const stat = fs.statSync(inputPath);
655
655
  const baseDir = stat.isDirectory() ? inputPath : path.dirname(inputPath);
656
656
  const jsonPath = stat.isDirectory() ? path.join(inputPath, 'trigger.json') : inputPath;
657
- const definition = normalizeTriggerDefinition(JSON.parse(readTriggerLocalFile(jsonPath, fileScope).toString('utf8')));
657
+ const definition = normalizeTriggerDefinition(JSON.parse(readTriggerLocalFile(jsonPath, fileScope).toString('utf8')), { allowLegacyZeroRetryAttempts: true });
658
658
  if (fileScope && definition.agentAid !== fileScope.selfAid)
659
659
  throw new Error('imported Trigger must belong to the authorized Agent');
660
660
  const files = [];
@@ -91,6 +91,8 @@ function assertAccessPolicyWrite(input, agent, policy) {
91
91
  function clonePolicy(policy) {
92
92
  return {
93
93
  policyMode: policy.policyMode,
94
+ allowExternalContacts: policy.allowExternalContacts ?? true,
95
+ allowedAids: [...(policy.allowedAids ?? [])],
94
96
  requestLimit: { ...policy.requestLimit },
95
97
  };
96
98
  }
@@ -227,6 +227,7 @@ export function resolveConfigFieldRule(fieldPath, scope) {
227
227
  }
228
228
  // 数值参数:整理节奏与容量上限,均 owner-only
229
229
  if (field === 'memory.idleHours'
230
+ || field === 'memory.maxUnconsolidatedHours'
230
231
  || field === 'memory.checkIntervalHours'
231
232
  || field === 'memory.backlogHours'
232
233
  || field === 'memory.indexMaxBytes'
@@ -6,8 +6,9 @@ import fs from 'fs';
6
6
  import path from 'path';
7
7
  import { resolvePaths, agentDir, agentRelationConfig } from '../paths.js';
8
8
  import { roleMenuQuery, roleMenuUpdate } from '../core/command/role-menu.js';
9
- import { parsePeerKey, PeerIdentityCache } from '../core/relation/peer-identity.js';
10
- import { isExplicitGroupId } from '../aun/group/index.js';
9
+ import { parseAgentMdFrontmatter, parsePeerKey, PeerIdentityCache } from '../core/relation/peer-identity.js';
10
+ import { agentmdGet } from '../aun/aid/agentmd.js';
11
+ import { isLegacyNamedGroupIdHint } from '../aun/group/index.js';
11
12
  import { isUnsupportedBaseagentConfigField } from './config-field-policy.js';
12
13
  export const AUTHENTICATED_CONFIG_ROLE_ENV = 'EVOLCORE_AUTHENTICATED_CONFIG_ROLE';
13
14
  export function executeResolvedConfigCommand(command, options = {}) {
@@ -64,7 +65,6 @@ async function executeRelationRoleCommand(op, options) {
64
65
  if (!op.self || !op.peerKey) {
65
66
  return { ok: false, code: 'PEER_REQUIRED', error: 'role requires --self <aid> --peer <peer-aid>' };
66
67
  }
67
- const target = roleTargetFromPeerKey(op.self, op.peerKey);
68
68
  const context = options.roleContext ?? {
69
69
  self: op.self,
70
70
  actorRole: options.role || 'owner',
@@ -76,6 +76,7 @@ async function executeRelationRoleCommand(op, options) {
76
76
  if (context.self !== op.self) {
77
77
  return { ok: false, code: 'SCOPE_MISMATCH', error: 'Role target does not match the receiving Agent' };
78
78
  }
79
+ const target = await roleTargetFromPeerKey(op.self, op.peerKey);
79
80
  const targetArgs = { self: op.self, view: 'target', target };
80
81
  const current = await roleMenuQuery(context, targetArgs);
81
82
  const explicitRole = current?.assignment?.explicitRole
@@ -140,7 +141,7 @@ async function executeRelationRoleCommand(op, options) {
140
141
  roleDetails: updatedDetails,
141
142
  };
142
143
  }
143
- function roleTargetFromPeerKey(self, peerKey) {
144
+ async function roleTargetFromPeerKey(self, peerKey) {
144
145
  let parsed;
145
146
  try {
146
147
  parsed = parsePeerKey(peerKey);
@@ -153,10 +154,20 @@ function roleTargetFromPeerKey(self, peerKey) {
153
154
  }
154
155
  const relation = read(ConfigTarget.Relation, { self, peerKey });
155
156
  const identity = PeerIdentityCache.get('aun', parsed.channelId, agentDir(self));
156
- const verifiedType = identity?.aid === parsed.channelId && identity.source === 'agentmd' && identity.verifiedAt > 0
157
+ let verifiedType = identity?.aid === parsed.channelId && identity.source === 'agentmd' && identity.verifiedAt > 0
157
158
  ? identity.type : undefined;
159
+ if (!relation?.targetKind && !verifiedType) {
160
+ try {
161
+ const result = await agentmdGet(parsed.channelId, { withVerification: true });
162
+ if (result.verification.status === 'verified') {
163
+ const metadata = parseAgentMdFrontmatter(result.content);
164
+ verifiedType = typeof metadata.type === 'string' ? metadata.type : undefined;
165
+ }
166
+ }
167
+ catch { }
168
+ }
158
169
  const isGroup = relation?.targetKind ? relation.targetKind === 'group'
159
- : verifiedType ? verifiedType === 'group' : isExplicitGroupId(parsed.channelId);
170
+ : verifiedType ? verifiedType.toLowerCase() === 'group' : isLegacyNamedGroupIdHint(parsed.channelId);
160
171
  return isGroup
161
172
  ? { kind: 'group', groupId: parsed.channelId }
162
173
  : { kind: 'private', peerAid: parsed.channelId };
@@ -18,7 +18,7 @@ import { saveDefaultsSafe, saveAgent } from '../config-store.js';
18
18
  import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../agents/baseagent.js';
19
19
  import { buildModelRequestHeaders } from '../agents/request-identity.js';
20
20
  import { appendV1RequestPath } from '../agents/request-identity.js';
21
- import { resolvePriceRow } from '../stats/billing.js';
21
+ import { resolvePriceRow } from '../stats/price-resolver.js';
22
22
  import { ipcQuery } from '../ipc.js';
23
23
  import { logger } from '../utils/logger.js';
24
24
  import { ConfigTarget, read as readConfig, stripLegacyAunGatewayConfig } from './config-manager.js';
@@ -43,12 +43,11 @@ export function listStaticAgentAdmins(aid, opts = {}) {
43
43
  catch {
44
44
  continue;
45
45
  }
46
- if (parsed.channelType !== 'aun'
47
- || !isValidAid(parsed.channelId)
48
- || isExplicitGroupId(parsed.channelId))
46
+ if (parsed.channelType !== 'aun' || !isValidAid(parsed.channelId))
49
47
  continue;
50
48
  const config = read(ConfigTarget.Relation, { self: aid, peerKey: entry.name }, { cache: opts.fresh !== true });
51
- if (config?.targetKind === 'group')
49
+ if (config?.targetKind === 'group'
50
+ || (!config?.targetKind && isExplicitGroupId(parsed.channelId)))
52
51
  continue;
53
52
  if (config?.role === 'admin')
54
53
  admins.add(parsed.channelId);
@@ -76,10 +75,12 @@ export function isStaticAgentOwner(aid, actorId) {
76
75
  return !!aid && !!actorId && listStaticAgentOwners(aid).includes(actorId);
77
76
  }
78
77
  export function isStaticAgentAdmin(aid, actorId) {
79
- if (!aid || !isValidAid(actorId) || isExplicitGroupId(actorId))
78
+ if (!aid || !isValidAid(actorId))
80
79
  return false;
81
80
  const config = read(ConfigTarget.Relation, { self: aid, peerKey: formatPeerKey('aun', actorId) }, { cache: true });
82
- return config?.targetKind !== 'group' && config?.role === 'admin';
81
+ if (config?.targetKind === 'group' || (!config?.targetKind && isExplicitGroupId(actorId)))
82
+ return false;
83
+ return config?.role === 'admin';
83
84
  }
84
85
  export function addStaticAgentOwner(aid, ownerAid) {
85
86
  throw new Error('Owner is protocol-managed; use ec aid bind');
@@ -213,12 +214,13 @@ function readAgentDefaultRole(aid, chatType) {
213
214
  function readDirectRelationRole(selfAid, channelType, channelId, expectedTargetKind) {
214
215
  if (!selfAid || !channelType || !channelId)
215
216
  return undefined;
216
- if (expectedTargetKind === 'private' && channelType === 'aun' && isExplicitGroupId(channelId))
217
- return undefined;
218
217
  const peerKey = formatPeerKey(channelType, channelId);
219
218
  const config = read(ConfigTarget.Relation, { self: selfAid, peerKey }, { cache: true });
220
219
  if (expectedTargetKind && config?.targetKind && config.targetKind !== expectedTargetKind)
221
220
  return undefined;
221
+ if (expectedTargetKind === 'private' && channelType === 'aun'
222
+ && !config?.targetKind && isExplicitGroupId(channelId))
223
+ return undefined;
222
224
  return config?.role;
223
225
  }
224
226
  function normalizeRelationRole(value, selfAid) {
@@ -0,0 +1,44 @@
1
+ export const ECWEB_SERVICE_PROTOCOL = Object.freeze({
2
+ name: 'evolcore.ecweb',
3
+ major: 1,
4
+ minor: 1,
5
+ capabilities: Object.freeze([
6
+ 'daemon.status',
7
+ 'agent.directory',
8
+ 'aun.directory',
9
+ 'menu.execute',
10
+ 'provider.management',
11
+ 'basic-settings',
12
+ 'model.catalog',
13
+ 'baseagent.snapshot',
14
+ 'monitor.snapshot',
15
+ 'monitor.subscription',
16
+ 'remote-auth',
17
+ 'trigger.history',
18
+ ]),
19
+ });
20
+ export function validateEcwebClientProtocolRequirements(value) {
21
+ if (!value || typeof value !== 'object' || Array.isArray(value)) {
22
+ return 'ECWeb client protocol requirements are missing or malformed';
23
+ }
24
+ const requirements = value;
25
+ if (requirements.name !== ECWEB_SERVICE_PROTOCOL.name) {
26
+ return `Unsupported ECWeb protocol name: ${String(requirements.name ?? 'missing')}`;
27
+ }
28
+ if (requirements.major !== ECWEB_SERVICE_PROTOCOL.major) {
29
+ return `Unsupported ECWeb protocol major version: ${String(requirements.major ?? 'missing')}`;
30
+ }
31
+ if (!Number.isInteger(requirements.minMinor) || requirements.minMinor < 0
32
+ || requirements.minMinor > ECWEB_SERVICE_PROTOCOL.minor) {
33
+ return `ECWeb requires protocol minor ${String(requirements.minMinor ?? 'missing')}, host supports ${ECWEB_SERVICE_PROTOCOL.minor}`;
34
+ }
35
+ if (!Array.isArray(requirements.requiredCapabilities)
36
+ || requirements.requiredCapabilities.some(capability => typeof capability !== 'string' || !capability.trim())) {
37
+ return 'ECWeb required capabilities are malformed';
38
+ }
39
+ const supported = new Set(ECWEB_SERVICE_PROTOCOL.capabilities);
40
+ const missing = requirements.requiredCapabilities.filter(capability => !supported.has(capability));
41
+ if (missing.length > 0)
42
+ return `ECWeb requires unsupported capabilities: ${missing.join(', ')}`;
43
+ return null;
44
+ }
@@ -1,3 +1,4 @@
1
+ import { initializationSummary } from '../cli/agent-create.js';
1
2
  import fs from 'node:fs';
2
3
  import path from 'node:path';
3
4
  import { agentMdPath, resolvePaths, } from '../paths.js';
@@ -90,11 +91,14 @@ export class AgentApplicationService {
90
91
  const config = (loadAgent(aid) ?? agent.config);
91
92
  const identity = readAgentMdIdentity(aid);
92
93
  const paths = resolvePaths();
94
+ const lifecycle = config?.lifecycle ?? null;
95
+ const initialization = initializationSummary(aid);
96
+ const initializationState = initialization && this.initialization?.status(aid);
93
97
  return {
94
98
  ok: true,
95
99
  aid,
96
100
  status: info.status || 'stopped',
97
- lifecycle: config?.lifecycle ?? null,
101
+ lifecycle,
98
102
  identity,
99
103
  config: {
100
104
  baseagent: info.baseagent || null,
@@ -104,6 +108,12 @@ export class AgentApplicationService {
104
108
  channels: info.channels ?? [],
105
109
  },
106
110
  connection,
111
+ ...(initialization ? {
112
+ initialization,
113
+ usable: typeof initializationState?.usable === 'boolean'
114
+ ? initializationState.usable
115
+ : initialization.complete === true && lifecycle === 'active' && connection?.status === 'connected',
116
+ } : {}),
107
117
  sessions: {
108
118
  active: info.activeSessions ?? 0,
109
119
  last_activity: info.lastActivity ? new Date(info.lastActivity).toISOString() : null,
@@ -274,6 +274,10 @@ export function registerAgentOperationExecutor({ ipcServer, sessionManager, agen
274
274
  const plan = resolveInitializationPlan(argv.slice(1), {
275
275
  projectCwd: taskSession.projectPath, tempDir: delegation.grant.sessionRuntimeDir,
276
276
  });
277
+ const { validateInitializationModelArgs } = await import('../cli/agent-create.js');
278
+ const modelError = await validateInitializationModelArgs(plan);
279
+ if (modelError)
280
+ return fail(modelError.code, modelError.error);
277
281
  if (plan.avatarFile?.startsWith('attachment:')) {
278
282
  const { readRelationAttachment } = await import('../utils/media-cache.js');
279
283
  plan.avatarFile = readRelationAttachment(taskAid, delegation.grant.peerKey, plan.avatarFile.slice('attachment:'.length)).attachment.filePath;