evolcore 0.0.43-test.1 → 0.0.43-test.3

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 (200) hide show
  1. package/CHANGELOG.md +31 -1
  2. package/README.md +22 -0
  3. package/dist/agents/claude-runner.js +26 -2
  4. package/dist/agents/codex/app-server-client.js +12 -0
  5. package/dist/agents/codex-runner.js +49 -8
  6. package/dist/agents/ecagent-runner.js +39 -15
  7. package/dist/agents/gemini-runner.js +15 -12
  8. package/dist/agents/tool-time-context.js +55 -0
  9. package/dist/aun/aid/agentmd.js +21 -1
  10. package/dist/aun/menu/client.js +1 -1
  11. package/dist/aun/model-headers.js +17 -0
  12. package/dist/aun/msg/p2p.js +7 -2
  13. package/dist/channels/aun.js +522 -50
  14. package/dist/channels/builtin-plugins.js +16 -11
  15. package/dist/channels/daemon.js +4 -0
  16. package/dist/channels/dingtalk.js +83 -31
  17. package/dist/channels/feishu.js +29 -13
  18. package/dist/channels/qqbot.js +32 -11
  19. package/dist/channels/wechat.js +13 -3
  20. package/dist/channels/wecom.js +67 -27
  21. package/dist/cli/agent-command.js +3 -86
  22. package/dist/cli/agent-create.js +20 -6
  23. package/dist/cli/agent.js +1 -79
  24. package/dist/cli/aun-commands.js +18 -19
  25. package/dist/cli/config.js +1 -1
  26. package/dist/cli/daemon-commands.js +47 -2
  27. package/dist/cli/data-command.js +9 -1
  28. package/dist/cli/debug-mode.js +1 -1
  29. package/dist/cli/diag.js +1 -1
  30. package/dist/cli/directory.js +149 -91
  31. package/dist/cli/getmeta-command.js +1 -1
  32. package/dist/cli/index.js +79 -22
  33. package/dist/cli/init.js +1 -23
  34. package/dist/cli/link-rules.js +1 -1
  35. package/dist/cli/managed-command-guard.js +0 -1
  36. package/dist/cli/pa-workspace-command.js +36 -2
  37. package/dist/cli/peer.js +3 -2
  38. package/dist/cli/restart-monitor.js +17 -3
  39. package/dist/cli/role.js +1 -1
  40. package/dist/cli/session-command.js +1 -1
  41. package/dist/cli/stats.js +2 -2
  42. package/dist/cli/task-context.js +3 -1
  43. package/dist/cli/thread-command.js +1 -1
  44. package/dist/cli/watch-msg.js +1 -1
  45. package/dist/config/builtin-role-templates.js +2 -2
  46. package/dist/config/builtin-roles.js +2 -1
  47. package/dist/config/config-field-policy.js +7 -2
  48. package/dist/config/config-manager.js +32 -10
  49. package/dist/config/peer-role-resolver.js +23 -1
  50. package/dist/config/role-schema.js +29 -4
  51. package/dist/config/role-service.js +12 -7
  52. package/dist/config/role-store.js +30 -8
  53. package/dist/config-store.js +75 -4
  54. package/dist/core/agent-ipc-registration.js +16 -59
  55. package/dist/core/auth/auth-gateway.js +14 -4
  56. package/dist/core/auth/authorization-audit.js +52 -14
  57. package/dist/core/auth/operation-authorizer.js +17 -11
  58. package/dist/core/auth/operation-catalog.js +5 -13
  59. package/dist/core/channel-loader.js +152 -16
  60. package/dist/core/channel-runtime.js +5 -0
  61. package/dist/core/command/agent-control.js +2 -1
  62. package/dist/core/command/agentmd-menu-request.js +50 -0
  63. package/dist/core/command/agentmd-menu.js +156 -0
  64. package/dist/core/command/cli-intent-parser.js +0 -8
  65. package/dist/core/command/command-handler.js +47 -40
  66. package/dist/core/command/connect-menu.js +7 -3
  67. package/dist/core/command/menu-catalog.js +16 -2
  68. package/dist/core/command/menu-handler.js +107 -14
  69. package/dist/core/command/menu-protocol.js +28 -0
  70. package/dist/core/command/role-menu.js +23 -9
  71. package/dist/core/command/slash-handler.js +139 -51
  72. package/dist/core/daemon-file-cache.js +3 -3
  73. package/dist/core/daemon-lifecycle.js +9 -1
  74. package/dist/core/evolagent-registry.js +5 -4
  75. package/dist/core/evolagent.js +10 -12
  76. package/dist/core/handoff/argv-parse.js +115 -0
  77. package/dist/core/handoff/ipc-registration.js +1 -1
  78. package/dist/core/ipc-registration.js +19 -2
  79. package/dist/core/lifecycle-notice.js +185 -0
  80. package/dist/core/memory/consolidation.js +8 -1
  81. package/dist/core/memory/relation-sweep.js +20 -8
  82. package/dist/core/message/aun-ipc-sender.js +35 -2
  83. package/dist/core/message/contact-admission.js +530 -0
  84. package/dist/core/message/im-renderer.js +111 -16
  85. package/dist/core/message/message-admission.js +29 -54
  86. package/dist/core/message/message-bridge.js +62 -8
  87. package/dist/core/message/message-utils.js +9 -5
  88. package/dist/core/message/peer-mode.js +55 -13
  89. package/dist/core/message/response-engine.js +298 -78
  90. package/dist/core/message/retry-scheduler.js +4 -0
  91. package/dist/core/ownership/owner-resolver.js +72 -34
  92. package/dist/core/permission/ec-command-parser.js +25 -38
  93. package/dist/core/permission/readonly-shell-query.js +34 -8
  94. package/dist/core/permission/tool-policy.js +50 -5
  95. package/dist/core/relation/pa-team.js +127 -0
  96. package/dist/core/role/runtime-policy.js +18 -5
  97. package/dist/core/session/session-manager.js +9 -1
  98. package/dist/core/soul.js +66 -0
  99. package/dist/core/system-session/memory.js +2 -2
  100. package/dist/core/thread/thread-service.js +6 -4
  101. package/dist/directory/contact-admission-paths.js +9 -0
  102. package/dist/directory/owner-directory-admission.js +125 -29
  103. package/dist/directory/owner-directory-cache.js +554 -58
  104. package/dist/directory/owner-directory-identity.js +60 -0
  105. package/dist/directory/owner-directory-markdown.js +154 -58
  106. package/dist/directory/owner-directory-policy.js +108 -0
  107. package/dist/directory/owner-directory-query-operation.js +399 -90
  108. package/dist/directory/owner-directory-remarks.js +29 -2
  109. package/dist/directory/owner-directory-request-operation.js +76 -0
  110. package/dist/directory/owner-directory-scope.js +35 -4
  111. package/dist/directory/owner-directory-search.js +118 -33
  112. package/dist/directory/owner-directory-store.js +117 -30
  113. package/dist/directory/owner-directory-text.js +60 -0
  114. package/dist/eck/kit-renderer.js +18 -8
  115. package/dist/eck/manifest-engine.js +55 -6
  116. package/dist/ecweb/basic-settings-service.js +2 -2
  117. package/dist/ecweb/message-context-service.js +28 -16
  118. package/dist/index.js +20 -5
  119. package/dist/ipc.js +1 -1
  120. package/dist/paths.js +29 -1
  121. package/dist/product.js +1 -0
  122. package/dist/response-system/config-resolver.js +1 -1
  123. package/dist/response-system/engines/v1/index.js +2 -1
  124. package/dist/response-system/modes/single-session/index.js +7 -2
  125. package/dist/trigger/scheduler.js +7 -4
  126. package/dist/trigger/validation.js +4 -0
  127. package/dist/utils/error-utils.js +12 -7
  128. package/dist/utils/logger.js +13 -4
  129. package/dist/utils/npm-ops.js +2 -2
  130. package/dist/utils/windows-autostart.js +1 -1
  131. package/ecagent/README.md +18 -0
  132. package/ecagent/dist/agent-loop.js +43 -1
  133. package/ecagent/dist/harness/agent-harness.d.ts +2 -0
  134. package/ecagent/dist/harness/agent-harness.js +24 -8
  135. package/ecagent/dist/harness/compaction/compaction.js +3 -0
  136. package/ecagent/dist/harness/types.d.ts +1 -0
  137. package/kits/docs/INDEX.md +1 -0
  138. package/kits/docs/channels/aun.md +1 -1
  139. package/kits/docs/context-assembly.md +21 -6
  140. package/kits/docs/eck_templates/INDEX.template.md +1 -2
  141. package/kits/docs/evolcore/INDEX.md +4 -1
  142. package/kits/docs/evolcore/agent-create.md +5 -5
  143. package/kits/docs/evolcore/agent.md +4 -9
  144. package/kits/docs/evolcore/directory.md +227 -0
  145. package/kits/docs/evolcore/ecweb-lifecycle.md +26 -0
  146. package/kits/docs/evolcore/file-navigation.md +265 -0
  147. package/kits/docs/evolcore/menu-protocol.md +55 -0
  148. package/kits/docs/evolcore/msg.md +1 -0
  149. package/kits/docs/evolcore/peer.md +2 -1
  150. package/kits/docs/evolcore/response.md +7 -1
  151. package/kits/docs/evolcore/task.md +2 -0
  152. package/kits/docs/evolcore/tool-authorization.md +1 -1
  153. package/kits/docs/evolcore/trigger.md +4 -0
  154. package/kits/docs/identity/ROLE_DETAIL.md +2 -0
  155. package/kits/docs/prompt-loading-architecture.md +6 -2
  156. package/kits/eck_manifest.auxiliary.json +1 -0
  157. package/kits/eck_manifest.json +64 -7
  158. package/kits/eck_manifest.memory.json +93 -4
  159. package/kits/rules/01-overview.md +2 -2
  160. package/kits/rules/03-identity.md +10 -9
  161. package/kits/rules/05-venue.md +2 -4
  162. package/kits/rules/06-channel.md +1 -1
  163. package/kits/schemas/_meta.json +44 -3
  164. package/kits/schemas/agent-config.schema.18.json +5 -0
  165. package/kits/schemas/agent-config.schema.19.json +924 -0
  166. package/kits/schemas/agent-config.schema.20.json +925 -0
  167. package/kits/schemas/relation-config.schema.12.json +289 -0
  168. package/kits/schemas/relation-config.schema.13.json +289 -0
  169. package/kits/schemas/role-config.schema.2.json +215 -0
  170. package/kits/schemas/role-config.schema.3.json +1038 -0
  171. package/kits/schemas/role-registry.schema.1.json +3 -2
  172. package/kits/skills/ec-skill/scripts/cli.mjs +3 -2
  173. package/kits/skills/ec-trigger/SKILL.md +4 -4
  174. package/kits/skills/personal-assistant/SKILL.md +109 -53
  175. package/kits/skills/personal-assistant/references/02-bootstrap.md +73 -30
  176. package/kits/skills/personal-assistant/scripts/clean.mjs +35 -18
  177. package/kits/skills/personal-assistant/scripts/init.mjs +41 -2
  178. package/kits/skills/personal-assistant/scripts/lib/persona.mjs +185 -0
  179. package/kits/skills/personal-assistant/scripts/migrate.mjs +55 -4
  180. package/kits/skills/personal-assistant/scripts/pa.mjs +173 -0
  181. package/kits/skills/personal-assistant/scripts/uninstall.mjs +130 -0
  182. package/kits/skills/personal-assistant/templates/persona-section.md +3 -3
  183. package/kits/templates/message-fragments/handoff-request-to-target.md +1 -1
  184. package/kits/templates/soul/00-GUIDE.md +39 -0
  185. package/kits/templates/soul/01-identity.md +5 -0
  186. package/kits/templates/soul/02-persona.md +11 -0
  187. package/kits/templates/soul/03-duties.md +5 -0
  188. package/kits/templates/soul/04-working-style.md +5 -0
  189. package/kits/templates/system-fragments/bootstrap.md +7 -7
  190. package/kits/templates/system-fragments/channel.md +2 -2
  191. package/kits/templates/system-fragments/commands.md +3 -2
  192. package/kits/templates/system-fragments/directory-contacts.md +9 -0
  193. package/kits/templates/system-fragments/memory.md +1 -1
  194. package/kits/templates/system-fragments/personal-assistant.md +50 -0
  195. package/kits/templates/system-fragments/reply.md +7 -0
  196. package/kits/templates/system-fragments/session.md +6 -2
  197. package/package.json +3 -2
  198. package/dist/cli/handoff-command.js +0 -353
  199. package/dist/directory/owner-directory-remark-operation.js +0 -147
  200. package/kits/docs/evolcore/self-summary.md +0 -29
@@ -197,6 +197,16 @@ async function runManagedAid(args, formatJson) {
197
197
  console.log(`✓ 头像已更新${response.result.avatar ? `: ${response.result.avatar}` : ''}${response.result.sha256 ? ` (sha256: ${response.result.sha256})` : ''}`);
198
198
  }
199
199
  }
200
+ /**
201
+ * handoff 只是内部投递实例,不属于对外回执。回执与 JSON 结果统一剥掉该字段,
202
+ * 调用方只看 message_id;需要排查时查运行日志。
203
+ */
204
+ function stripHandoff(result) {
205
+ if (!result || typeof result !== 'object' || !('handoff_id' in result))
206
+ return result;
207
+ const { handoff_id: _handoffId, ...rest } = result;
208
+ return rest;
209
+ }
200
210
  function failManagedGroup(formatJson, code, error, details = {}) {
201
211
  if (formatJson)
202
212
  console.log(JSON.stringify({ ok: false, code, error, ...details }));
@@ -2368,15 +2378,10 @@ Options:
2368
2378
  console.log(`request_id=${result.request_id} state=${result.request_state ?? '-'} message_id=${result.message_id ?? '-'}`);
2369
2379
  }
2370
2380
  else if (formatJson) {
2371
- console.log(JSON.stringify(result));
2381
+ console.log(JSON.stringify(stripHandoff(result)));
2372
2382
  }
2373
2383
  else {
2374
- if (result.handoff_id && result.status === 'delivered')
2375
- console.log(`✓ handoff ${result.handoff_id} 已投递 ${result.message_id ?? ''}`.trimEnd());
2376
- else if (result.handoff_id)
2377
- console.log(`✓ 已排队 handoff ${result.handoff_id}(尚未投递)`);
2378
- else
2379
- console.log(`✓ 已发送 ${result.message_id ?? ''} seq=${result.seq ?? '-'} status=${result.status ?? '-'}`);
2384
+ console.log(`✓ 已发送 message_id=${result.message_id ?? '-'} seq=${result.seq ?? '-'} status=${result.status ?? '-'}`);
2380
2385
  }
2381
2386
  return;
2382
2387
  }
@@ -2782,7 +2787,7 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
2782
2787
  const outputResult = (result, successHuman) => {
2783
2788
  if (!result.ok) {
2784
2789
  if (formatJson) {
2785
- console.log(JSON.stringify(result));
2790
+ console.log(JSON.stringify(stripHandoff(result)));
2786
2791
  }
2787
2792
  else {
2788
2793
  console.error(`❌ ${result.error}`);
@@ -2790,7 +2795,7 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
2790
2795
  process.exit(1);
2791
2796
  }
2792
2797
  if (formatJson) {
2793
- console.log(JSON.stringify(result));
2798
+ console.log(JSON.stringify(stripHandoff(result)));
2794
2799
  }
2795
2800
  else {
2796
2801
  successHuman();
@@ -3036,12 +3041,7 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
3036
3041
  }
3037
3042
  outputResult(result, () => {
3038
3043
  const r = result;
3039
- if (r.handoff_id && r.status === 'delivered')
3040
- console.log(`✓ handoff ${r.handoff_id} 已投递 ${r.message_id ?? ''}`.trimEnd());
3041
- else if (r.handoff_id)
3042
- console.log(`✓ 已排队 handoff ${r.handoff_id}(尚未投递)`);
3043
- else
3044
- console.log(`✓ 已发送 message_id=${r.message_id ?? r.message?.message_id ?? '-'} seq=${r.message?.seq ?? '-'}`);
3044
+ console.log(`✓ 已发送 message_id=${r.message_id ?? r.message?.message_id ?? '-'} seq=${r.message?.seq ?? '-'}`);
3045
3045
  });
3046
3046
  return;
3047
3047
  }
@@ -3565,15 +3565,14 @@ async function runManagedSend(argv, formatJson) {
3565
3565
  ...(typeof result.detail_code === 'string' ? { detail_code: result.detail_code } : {}),
3566
3566
  ...(typeof result.retryable === 'boolean' ? { retryable: result.retryable } : {}),
3567
3567
  ...(typeof result.sent === 'boolean' ? { sent: result.sent } : {}),
3568
+ ...(result.contact_request ? { contact_request: result.contact_request } : {}),
3568
3569
  });
3569
3570
  if (formatJson)
3570
- console.log(JSON.stringify(result));
3571
- else if (result.handoff_id)
3572
- console.log(`✓ handoff ${result.handoff_id} ${result.status === 'delivered' ? '已投递' : '已排队'} ${result.message_id ?? ''}`.trimEnd());
3571
+ console.log(JSON.stringify(stripHandoff(result)));
3573
3572
  else if (result.request_id)
3574
3573
  console.log(`sent message_id=${result.message_id ?? '-'} request_id=${result.request_id} state=${result.request_state ?? '-'}`);
3575
3574
  else
3576
- console.log(`✓ 已发送 message_id=${result.message_id ?? '-'} seq=${result.seq ?? result.message?.seq ?? '-'}`);
3575
+ console.log(`✓ 已发送 message_id=${result.message_id ?? '-'} seq=${result.seq ?? result.message?.seq ?? '-'} status=${result.status ?? '-'}`);
3577
3576
  // 复查 Trigger 结果必须可见:消息已发出所以不改退出码(避免调用方重发),
3578
3577
  // 但没建成要明说,别让调用方以为"N 分钟后会自动复查"。
3579
3578
  if (!formatJson) {
@@ -202,7 +202,7 @@ async function runManagedBatchGet(fields, rest, formatJson) {
202
202
  }
203
203
  renderConfigExecution(response.result, formatJson);
204
204
  }
205
- const HELP = `Usage: ec config <command> [options]
205
+ const HELP = `用法: ec config <command> [options]
206
206
 
207
207
  Fields:
208
208
  get <field> [<field> ...] one or more fields (batch)
@@ -15,6 +15,7 @@ import { EventBus } from '../core/event-bus.js';
15
15
  import { resolveGlobalPkg } from '../utils/npm-ops.js';
16
16
  import { ensureFreshPackageVersionInfo } from '../utils/package-version-info.js';
17
17
  import { ecwebVersionRequirementError, resolveEcwebLaunchCommand } from '../ecweb/runtime/launch.js';
18
+ import { stopEcwebForRestart } from '../ecweb/runtime/lifecycle.js';
18
19
  import { resolveEcwebExternalUrl, fetchRemotePairingCode, buildEcwebPairingUrl } from '../ecweb/pairing.js';
19
20
  import { isHostChinese } from '../utils/locale.js';
20
21
  import { scanInstances, cleanupInstances, findOrphanProcesses } from '../utils/instance-registry.js';
@@ -32,7 +33,7 @@ import { inspectDataMigrationRequirement } from '../core/data-migration.js';
32
33
  import { readHostInfo, readVersionInfo } from '../utils/host-info.js';
33
34
  import { queryStatusActivity, queryStatusActivityByAgent } from '../stats/query.js';
34
35
  import { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../agents/codex/app-server-registry.js';
35
- import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
36
+ import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode, setEcwebEnabled } from '../config/daemon-services.js';
36
37
  import { checkCodexProjectPath, inspectCodexManagedHook, ensureCodexManagedHook, runCodexHookLaunchDiagnostic, } from '../agents/codex/diagnostics.js';
37
38
  import { formatClaudeSandboxDependencies, formatCodexSandboxAvailability, inspectClaudeSandboxDependencies, inspectCodexSandboxAvailability, probeClaudeSandboxDependencies, probeCodexSandboxAvailability, } from '../core/permission/sandbox-runtime.js';
38
39
  const execFileAsync = promisify(execFile);
@@ -809,6 +810,11 @@ export async function cmdStart(opts = {}) {
809
810
  trace.finish(launched.ok);
810
811
  return;
811
812
  }
813
+ trace.mark('cli.stopStaleEcweb');
814
+ if (!await stopManagedEcweb(p)) {
815
+ trace.finish(false);
816
+ return;
817
+ }
812
818
  trace.mark('cli.spawnDaemon');
813
819
  trace.setMeta('traceId', traceId);
814
820
  console.log('🚀 Starting EvolCore...');
@@ -1154,6 +1160,12 @@ export async function cmdStop() {
1154
1160
  }
1155
1161
  const aliveMains = status.mains.filter(m => m.alive);
1156
1162
  if (aliveMains.length === 0 && runtimeOrphans.length === 0) {
1163
+ trace.mark('cli.stopEcweb');
1164
+ if (!await stopManagedEcweb(p)) {
1165
+ trace.finish(false);
1166
+ printStopSummary(trace, cmdStartedAt, false);
1167
+ return;
1168
+ }
1157
1169
  trace.discard();
1158
1170
  console.log('⚠ EvolCore is not running');
1159
1171
  return;
@@ -1175,6 +1187,14 @@ export async function cmdStop() {
1175
1187
  process.exitCode = 1;
1176
1188
  return;
1177
1189
  }
1190
+ // The daemon may not have adopted a legacy ECWeb whose instance record
1191
+ // disappeared. Stop that verified listener even after the daemon exits.
1192
+ trace.mark('cli.stopEcweb');
1193
+ if (!await stopManagedEcweb(p)) {
1194
+ trace.finish(false);
1195
+ printStopSummary(trace, cmdStartedAt, false);
1196
+ return;
1197
+ }
1178
1198
  // stopPid already observed every process leave the process table, so the
1179
1199
  // records can be cleaned immediately (same reasoning as restart-monitor).
1180
1200
  trace.mark('cli.cleanupInstances');
@@ -1529,6 +1549,14 @@ function renderStatusOverview(snapshot) {
1529
1549
  else {
1530
1550
  console.log(snapshot.channels.source === 'daemon' ? ' 无其他渠道' : ' 状态不可用');
1531
1551
  }
1552
+ for (const channel of snapshot.channels.items) {
1553
+ if (channel.reason)
1554
+ console.log(` ${channel.name}: ${channel.status} [${channel.reason.code}] ${channel.reason.message}`);
1555
+ }
1556
+ for (const provider of snapshot.channels.providers) {
1557
+ if (provider.reason)
1558
+ console.log(` ${statusChannelLabel(provider.channelType)} provider: ${provider.status} [${provider.reason.code}] ${provider.reason.message}`);
1559
+ }
1532
1560
  if (snapshot.triggers?.source === 'runtime+history') {
1533
1561
  console.log('\n触发器');
1534
1562
  renderStatusTable(['启用', '今日执行', '今日失败'], [[
@@ -1760,12 +1788,14 @@ async function collectStatusSnapshot() {
1760
1788
  },
1761
1789
  channels: {
1762
1790
  source: statusAvailable ? 'daemon' : 'unavailable',
1791
+ providers: statusResponse?.channelRuntime?.providers ?? [],
1763
1792
  items: Object.entries(statusResponse?.channels ?? {})
1764
1793
  .filter(([, channel]) => channel?.channelType !== 'aun')
1765
1794
  .map(([name, channel]) => ({
1766
1795
  name, type: channel?.channelType ?? name,
1767
1796
  status: channel?.status ?? (channel?.connected ? 'connected' : 'disconnected'),
1768
1797
  connected: channel?.connected ?? false,
1798
+ ...(channel?.reason ? { reason: channel.reason } : {}),
1769
1799
  })),
1770
1800
  },
1771
1801
  controlAid: statusResponse?.controlAid ?? null,
@@ -2864,7 +2894,7 @@ async function cmdWatchAid() {
2864
2894
  // 标记生成:[明文/密文|自主/响应](紫色=工具渲染标记)
2865
2895
  const mkTags = (encrypt, chatmode) => {
2866
2896
  const enc = encrypt ? '密文' : '明文';
2867
- const mode = chatmode === 'proactive' ? '自主' : '响应';
2897
+ const mode = chatmode === 'paactive' ? 'PA' : chatmode === 'proactive' ? '自主' : '响应';
2868
2898
  return `${MAGENTA}[${enc}|${mode}]${RST}`;
2869
2899
  };
2870
2900
  let msgPreview = '';
@@ -3344,6 +3374,21 @@ export function stopCodexAppServerOrphans() {
3344
3374
  }
3345
3375
  return killed;
3346
3376
  }
3377
+ /** Stop managed ECWeb, including verified listeners without instance records. */
3378
+ async function stopManagedEcweb(p) {
3379
+ try {
3380
+ const service = ecwebService(loadDaemonConfig().services);
3381
+ if (service && serviceRuntimeMode(service) === 'managed') {
3382
+ await stopEcwebForRestart(p, service.port ?? DEFAULT_ECWEB_PORT, console.log);
3383
+ }
3384
+ return true;
3385
+ }
3386
+ catch (error) {
3387
+ console.error(`❌ ECWeb 清理失败:${error instanceof Error ? error.message : String(error)}`);
3388
+ process.exitCode = 1;
3389
+ return false;
3390
+ }
3391
+ }
3347
3392
  /** 若 ecweb 在运行则杀掉并确认 pid/端口都已释放。 */
3348
3393
  async function stopEcwebIfRunning(p) {
3349
3394
  const port = ecwebService(loadDaemonConfig().services)?.port ?? DEFAULT_ECWEB_PORT;
@@ -79,10 +79,18 @@ async function waitForMaintenanceWindow() {
79
79
  throw new Error(`cannot begin migration while runtime remains active (main=${runtime.mainCount}, restart-monitor=${runtime.monitorPids.length}, ipc=${ipc})`);
80
80
  }
81
81
  export async function cmdData(args) {
82
- if (args[0] !== 'migrate' || wantsHelp(args)) {
82
+ const sub = args[0];
83
+ // 无参/求助 → 用法并 exit 0(用户主动查用法,不是错误)。
84
+ if (!sub || wantsHelp(args)) {
83
85
  console.log('用法: ec data migrate --dry-run | --apply [migration-id] | --verify [migration-id]');
84
86
  return;
85
87
  }
88
+ if (sub !== 'migrate') {
89
+ console.error(`未知子命令: ${sub}`);
90
+ console.error('用法: ec data migrate --dry-run | --apply [migration-id] | --verify [migration-id]');
91
+ process.exitCode = 1;
92
+ return;
93
+ }
86
94
  const root = resolveRoot();
87
95
  if (args.includes('--dry-run')) {
88
96
  if (args.length !== 2)
@@ -134,7 +134,7 @@ export async function resolveDebugContext(args) {
134
134
  const ctxWithoutEpoch = { ...runtimeContext, daemonRuntimeEpoch: undefined };
135
135
  Object.assign(process.env, buildTaskRuntimeEnv(ctxWithoutEpoch));
136
136
  process.env[AGENT_DELEGATION_TOKEN_ENV] = token;
137
- // contact / fs 等命令只读 EVOLCORE_SELF_AID,不走 taskRuntimeContext,单独注入
137
+ // peer / directory / fs 等命令只读 EVOLCORE_SELF_AID,不走 taskRuntimeContext,单独注入
138
138
  if (runtimeContext.selfAid)
139
139
  process.env.EVOLCORE_SELF_AID = runtimeContext.selfAid;
140
140
  }
package/dist/cli/diag.js CHANGED
@@ -5,7 +5,7 @@ import { parseDiagArgs } from '../core/command/diag-service.js';
5
5
  import { wantsHelp } from './help.js';
6
6
  export async function cmdDiag(args) {
7
7
  if (wantsHelp(args)) {
8
- console.log('用法:ec diag <问题描述> [--owner <daemonOwner-aid>] [--format json]\n ec diag stop [--format json]\n未指定 --owner 时联系本机 Control AID 的协议 Owner;有效诊断期间再次执行会追加到原 case。');
8
+ console.log('用法: ec diag <问题描述> [--owner <daemonOwner-aid>] [--format json]\n ec diag stop [--format json]\n未指定 --owner 时联系本机 Control AID 的协议 Owner;有效诊断期间再次执行会追加到原 case。');
9
9
  return;
10
10
  }
11
11
  const argv = ['diag', ...args];
@@ -1,16 +1,19 @@
1
1
  import { resolvePaths } from '../paths.js';
2
2
  import { daemonUnavailableMessage, getArgValue, isHelpFlag, queryDaemon, wantsHelp } from './help.js';
3
3
  import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
4
- import { DirectoryRemarkError, executeDirectoryRemarkCommand, resolveDirectoryRemarkCommand, } from '../directory/owner-directory-remark-operation.js';
5
4
  import { DirectoryQueryError, executeDirectoryQueryCommand, resolveDirectoryQueryCommand, } from '../directory/owner-directory-query-operation.js';
6
- const QUERY_ACTIONS = new Set(['find', 'show', 'list']);
5
+ import { executeDirectoryRequestCommand, resolveDirectoryRequestCommand, } from '../directory/owner-directory-request-operation.js';
6
+ /** `find` / `show` 是旧名,仍接受:`find` → `list`,`show` → `info`。 */
7
+ const QUERY_ACTIONS = new Set(['list', 'info', 'refresh', 'blocked', 'find', 'show']);
7
8
  /**
8
9
  * `ec directory ...`
9
10
  *
10
- * - `find|show|list`:查名录。只读本地快照;`find` 未命中会触发一次有界同步。
11
- * - `remark get|set|rm|list`:维护本地备注,写操作会重算 `directory.md`。
11
+ * 查询、重算注入与发起联系人邀请。**备注不走命令**:它是一个 frontmatter markdown 文件,由 Agent
12
+ * 直接读写自己目录下的 `<agent>/directory/remarks/<联系人AID>.md`,改完再
13
+ * `ec directory refresh` 让 `directory.md` 重算。
12
14
  *
13
- * 写操作必须由 daemon 执行——备注属于目标 Agent 的目录,个人助理的沙箱写不进去。
15
+ * 命令面与 `ec skill` 对齐:`list` 列举/过滤(含分页),`info` 看单条详情;
16
+ * 旧的 `find` / `show` 保留为别名。
14
17
  */
15
18
  export async function cmdDirectory(args) {
16
19
  if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
@@ -18,36 +21,53 @@ export async function cmdDirectory(args) {
18
21
  return;
19
22
  }
20
23
  const action = args[0];
21
- const isRemark = action === 'remark';
22
- if (!isRemark && !QUERY_ACTIONS.has(action)) {
24
+ if (!QUERY_ACTIONS.has(action) && action !== 'request') {
23
25
  console.error(`❌ 未知子命令: ${action}`);
24
26
  printHelp();
25
27
  process.exitCode = 1;
26
28
  return;
27
29
  }
28
- const json = getArgValue(args, '--format') === 'json';
29
- const argv = isRemark ? args.slice(1) : args;
30
+ // 与 `ec skill list` 对齐:`--json` 是 `--format json` 的同义写法。
31
+ const json = getArgValue(args, '--format') === 'json' || args.includes('--json');
30
32
  try {
31
33
  const result = process.env.EVOLCORE_SESSION_ID
32
- ? await runManaged(argv, isRemark, json)
33
- : await runLocal(argv, isRemark);
34
+ ? await runManaged(args, json)
35
+ : await runLocal(args);
34
36
  output(result, json);
35
37
  }
36
38
  catch (error) {
37
- const known = error instanceof DirectoryRemarkError || error instanceof DirectoryQueryError;
38
- console.error(`❌ ${known ? error.message : (error instanceof Error ? error.message : String(error))}`);
39
- process.exitCode = 1;
39
+ const known = error instanceof DirectoryQueryError;
40
+ const message = error instanceof Error ? error.message : String(error);
41
+ fail(known ? error.code : 'DIRECTORY_OPERATION_FAILED', message, json);
42
+ }
43
+ }
44
+ async function runLocal(argv) {
45
+ if (argv[0] === 'request') {
46
+ const command = resolveDirectoryRequestCommand(argv);
47
+ const { msgSend } = await import('../aun/msg/index.js');
48
+ return executeDirectoryRequestCommand(command, input => msgSend({
49
+ from: input.from, to: input.to, body: { mode: 'payload', payload: input.payload }, encrypt: input.encrypt,
50
+ }));
40
51
  }
52
+ return executeDirectoryQueryCommand(resolveDirectoryQueryCommand(argv));
41
53
  }
42
- async function runLocal(argv, isRemark) {
43
- return isRemark
44
- ? executeDirectoryRemarkCommand(resolveDirectoryRemarkCommand(argv))
45
- : executeDirectoryQueryCommand(resolveDirectoryQueryCommand(argv));
54
+ /**
55
+ * 失败输出:`--format json` 时要给出结构化结果。
56
+ *
57
+ * 之前无论 `--format json` 与否都只打印 `❌ <message>`,调用方拿不到错误码,
58
+ * 无法区分「人不在名录里」和「名录没授权/没快照」。结构化失败与成功结果保持
59
+ * 同一形状:`{ ok: false, code, error }`。
60
+ */
61
+ function fail(code, message, json) {
62
+ if (json)
63
+ console.log(JSON.stringify({ ok: false, code, error: message }));
64
+ else
65
+ console.error(`❌ ${message}`);
66
+ process.exitCode = 1;
46
67
  }
47
68
  function output(result, json) {
48
69
  if (!result.ok) {
49
- console.error(`❌ ${result.error}`);
50
- process.exitCode = 1;
70
+ fail(result.code, result.error, json);
51
71
  return;
52
72
  }
53
73
  if (json) {
@@ -55,116 +75,154 @@ function output(result, json) {
55
75
  return;
56
76
  }
57
77
  switch (result.action) {
58
- case 'find': {
59
- if (result.hits.length === 0) {
60
- console.log(result.synced ? '(同步后仍未找到)' : '(没有匹配)');
78
+ case 'request': {
79
+ console.log(`✓ 已向 ${result.targetAid} 发送加密 friend.invite.v1 加好友申请,message_id=${result.message_id}`);
80
+ console.log('发送成功只表示申请已提交;请等待 Evol App 处理并同步联系人名录,再重试原消息。');
81
+ return;
82
+ }
83
+ case 'list': {
84
+ if (result.entries.length === 0) {
85
+ console.log(result.total === 0 ? '(没有匹配)' : '(这一页没有条目)');
61
86
  return;
62
87
  }
63
- for (const hit of result.hits)
64
- printHit(hit);
88
+ for (const entry of result.entries)
89
+ printListRow(entry);
90
+ printPageFooter(result);
91
+ console.log('名录详情:ec directory info <AID>;名片正文:ec aid agentmd get <AID>');
92
+ return;
93
+ }
94
+ case 'info': {
95
+ // 按名字命中多条时全部列出,先给一行汇总,避免把第一条误当成唯一答案。
96
+ if (result.matchKind === 'fuzzy') {
97
+ console.log('(按名字包含匹配,可能不是同一个人;建议改用 AID 精确查)');
98
+ }
99
+ if (result.entries.length > 1) {
100
+ console.log(`按${result.matchedBy === 'name' ? '名字' : 'AID'}命中 ${result.entries.length} 条,逐条列出:`);
101
+ }
102
+ for (const entry of result.entries) {
103
+ if (result.entries.length === 1)
104
+ console.log(JSON.stringify(entry, null, 2));
105
+ else {
106
+ console.log('---');
107
+ console.log(JSON.stringify(entry, null, 2));
108
+ }
109
+ }
110
+ if (result.truncated)
111
+ console.log(`(另有 ${result.truncated} 条同名未列出,加 --limit 或按 AID 精确查)`);
65
112
  if (result.synced)
66
113
  console.log('(先做了一次同步)');
114
+ const aid = result.entries.length === 1 ? String(result.entries[0].aid ?? '') : '';
115
+ console.log(`名片正文:ec aid agentmd get ${aid || '<AID>'}`);
67
116
  return;
68
117
  }
69
- case 'show':
70
- console.log(JSON.stringify(result.entry, null, 2));
118
+ case 'refresh': {
119
+ console.log(result.pulled
120
+ ? `已拉取最新名录${typeof result.total === 'number' ? `(${result.total} 条)` : ''},directory.md 已重算`
121
+ : '没有可用连接,未拉取;本地名录已按当前备注重算');
71
122
  return;
72
- case 'list': {
73
- // 查询的 list 与备注的 list 同名,靠返回字段区分。
74
- if ('remarks' in result) {
75
- if (result.remarks.length === 0)
76
- console.log('(没有备注)');
77
- for (const item of result.remarks)
78
- console.log(item.remark ? `${item.aid}\t${item.remark}` : item.aid);
79
- return;
80
- }
123
+ }
124
+ case 'blocked': {
81
125
  if (result.entries.length === 0)
82
- console.log('(没有条目)');
126
+ console.log('(没有被拉黑的主体)');
83
127
  for (const entry of result.entries) {
84
128
  const name = typeof entry.name === 'string' ? entry.name : '';
85
- console.log([name && name !== entry.aid ? name : '', entry.aid, entry.type ?? '', entry.remark ?? '']
129
+ console.log([name || entry.aid, entry.aid, entry.type ?? '', entry.source]
86
130
  .filter(Boolean).join(' | '));
87
131
  }
88
132
  return;
89
133
  }
90
- case 'get':
91
- if (!result.remark)
92
- console.log('(无备注)');
93
- else
94
- console.log(JSON.stringify(result.remark, null, 2));
95
- return;
96
- case 'set':
97
- console.log(`已写入备注${result.regenerated ? ',directory.md 已重算' : ''}`);
98
- return;
99
- case 'rm':
100
- console.log(result.removed
101
- ? `已删除备注${result.regenerated ? ',directory.md 已重算' : ''}`
102
- : '该联系人没有备注');
103
- return;
104
134
  }
105
135
  }
106
- function printHit(hit) {
136
+ /** list 的一行:名字 | AID | type | exttype | 备注名 | 描述 | Owner | 归属。 */
137
+ function printListRow(entry) {
138
+ const text = (value) => (typeof value === 'string' ? value : '');
139
+ const name = text(entry.name);
107
140
  const cells = [
108
- hit.name && hit.name !== hit.aid ? hit.name : '',
109
- hit.aid,
110
- hit.type ?? '',
111
- hit.remark ?? '',
112
- hit.description ?? '',
141
+ name && name !== entry.aid ? name : '',
142
+ text(entry.aid),
143
+ text(entry.type),
144
+ text(entry.exttype),
145
+ text(entry.remark),
146
+ text(entry.description),
147
+ `Owner: ${text(entry.ownerAid) || '(无)'}`,
148
+ `归属: ${text(entry.ownershipStatus) || 'unknown'}${entry.ownershipVerified === true ? ' ✓' : ''}`,
149
+ `内外: ${entry.internal === true ? '内部' : '外部'}`,
113
150
  ].filter(Boolean);
114
- const exact = hit.score >= 1000 ? ' [精确匹配]' : '';
115
- console.log(`${cells.join(' | ')}${exact}`);
151
+ console.log(cells.join(' | '));
152
+ }
153
+ function printPageFooter(result) {
154
+ const pages = Math.max(1, Math.ceil(result.total / result.limit));
155
+ const next = result.hasMore ? ';加 --page ' + (result.page + 1) + ' 看下一页' : '';
156
+ console.log(`(第 ${result.page}/${pages} 页,共 ${result.total} 条${next})`);
116
157
  }
117
- async function runManaged(argv, isRemark, json) {
158
+ async function runManaged(argv, json) {
118
159
  const sessionId = process.env.EVOLCORE_SESSION_ID;
119
160
  const delegationToken = readDelegationCredential();
120
161
  if (!delegationToken) {
121
- throw new DirectoryRemarkError('DELEGATION_REQUIRED', `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`);
162
+ throw new DirectoryQueryError('DELEGATION_REQUIRED', `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`);
122
163
  }
123
164
  const { response, transportError } = await queryDaemon(resolvePaths().socket, {
124
165
  type: 'directory.op',
125
- argv: isRemark ? ['directory', 'remark', ...argv] : ['directory', ...argv],
166
+ argv: ['directory', ...argv],
126
167
  sessionId,
127
168
  delegationToken,
128
- }, isRemark ? 10_000 : 15_000);
169
+ }, argv[0] === 'request' ? 30_000 : 15_000);
129
170
  if (!response) {
130
- throw new DirectoryRemarkError('DAEMON_UNAVAILABLE', daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon'));
171
+ throw new DirectoryQueryError('DAEMON_UNAVAILABLE', daemonUnavailableMessage(transportError, 'Unable to connect to the evolcore daemon'));
131
172
  }
132
173
  if (!response.ok || !response.result) {
133
- throw new DirectoryRemarkError(response.code || 'DIRECTORY_OPERATION_FAILED', response.error || 'directory operation failed');
174
+ throw new DirectoryQueryError(response.code || 'DIRECTORY_OPERATION_FAILED', response.error || 'directory operation failed');
134
175
  }
135
176
  void json;
136
177
  return response.result;
137
178
  }
138
179
  function printHelp() {
139
- console.log(`Usage:
140
- ec directory find <query> --self <agent-aid> [--type <type>] [--scope internal|external|all] [--limit <n>]
141
- ec directory show <contact-aid> --self <agent-aid>
142
- ec directory list --self <agent-aid> [--type <type>] [--scope internal|external|all]
180
+ console.log(`用法:
181
+ ec directory list [<关键词>] [--filter '<kw1,kw2>']... [--type <type>] [--scope internal|external|all] [--owner <aid|unbound>] [--limit <n>] [--page <n>]
182
+ ec directory info <contact-aid|名字> [--limit <n>]
183
+ ec directory refresh
184
+ ec directory blocked
185
+ ec directory request <target-aid> [--note <申请介绍>]
186
+
187
+ request:向目标发送 app-v1 friend.invite.v1 加好友申请;介绍默认为“你好,我想添加你为联系人。”。
188
+ 发送成功仅表示申请已提交;须等 Evol App 处理并同步联系人名录后再重试原消息。
189
+
190
+ list:
191
+ 列举名录;给关键词时按 AID、名字、备注、描述、exttype 做子串匹配(不区分大小写)。
192
+ --filter 与 ec skill list --filter 同语义:组内逗号分隔为 OR,多个 --filter 之间为 AND;
193
+ 位置参数按“多个词同时命中”处理(旧 find 的写法)。
194
+ 默认每页 20 条,--page / --limit 可翻页;输出包含 type、exttype、描述、备注、
195
+ Owner 绑定关系与 Ownership 核验状态。本地备注正文不在 list 展示。
196
+ 旧名 find 等价于 list <关键词>。
197
+
198
+ info:
199
+ 接受 AID 或名字。AID 大小写不敏感、可带 @ 前缀;名字先做归一后的精确匹配
200
+ (全角/半角、空格、结尾括号称呼不影响),没命中再按名字包含匹配,结果标
201
+ matchKind=fuzzy。返回完整记录(含本地备注正文)。旧名 show 等价于 info。
202
+
203
+ refresh:
204
+ 拉一次最新名录并重算 directory.md / identity.json。拉取需要 channel 在线;
205
+ 没有连接时只做本地重算——手工改完备注后用它把改动刷进名录。
206
+
207
+ blocked:
208
+ 列出被拉黑的主体,合并名录侧(Owner 发布,跨 Agent)与本端(peers.json)两个来源。
143
209
 
144
- ec directory remark get <contact-aid> --self <agent-aid>
145
- ec directory remark set <contact-aid> --self <agent-aid> [--remark <text>] [--body <text> | --body-file <path>]
146
- ec directory remark rm <contact-aid> --self <agent-aid>
147
- ec directory remark list --self <agent-aid>
210
+ 备注不走命令:直接读写自己目录下的 <agent>/directory/remarks/<联系人AID>.md
148
211
 
149
- find:
150
- 按 AID、名字、备注、描述匹配。查询串按空格切成多个词,要求全部命中。
151
- 默认查全部(含外部条目);--scope internal 只看内部,--scope external 只看外部。
152
- 本地没有匹配时会触发一次有界同步再查一遍(B 方案)。
212
+ ---
213
+ aid: <联系人AID>
214
+ remark: <称呼>
215
+ updated_at: <unix 秒>
216
+ ---
153
217
 
154
- show:返回完整记录(描述不截断),本地备注优先。
155
- list:列出条目,默认只列内部联系人。
218
+ <正文>
219
+ 文件名必须与 aid 一致;remark 与正文可只写一个。改完调 ec directory refresh。
156
220
 
157
- remark:
158
- 备注存放在 <agent>/directory/remarks/<contact-aid>.md,frontmatter md:
159
- ---
160
- aid: <contact-aid>
161
- remark: <覆盖远端备注名>
162
- updated_at: <unix 秒>
163
- ---
164
- <正文,覆盖远端描述>
165
- --self 指定被维护备注的 Agent;set / rm 之后会重算该 Agent 的 directory.md。
221
+ 看名片正文(agent.md,下载+验签)用:ec aid agentmd get <AID>
166
222
 
167
223
  选项:
168
- --self <agent-aid> 目标 Agent,缺省取 EVOLCORE_SELF_AID
169
- --format json 以 JSON 输出`);
224
+ --self <agent-aid> 目标 Agent;托管会话缺省取当前任务所属 Agent(委托凭据),
225
+ 否则取 EVOLCORE_SELF_AID
226
+ --format json 以 JSON 输出;失败时同样输出 { ok: false, code, error }
227
+ --json 等价于 --format json(与 ec skill list 对齐)`);
170
228
  }
@@ -4,7 +4,7 @@ import { resolvePaths, agentThreadIndexPath, agentTriggersDir } from '../paths.j
4
4
  import { scanChatDirs, readLastJsonlLine, } from '../core/session/session-fs-store.js';
5
5
  import { isMainTopicId } from '../core/thread/topic-id.js';
6
6
  const HELP_TEXT = `
7
- ec getmeta <id> [选项]
7
+ 用法: ec getmeta <id> [选项]
8
8
 
9
9
  按任意一种标识查询本地会话或触发器的完整元数据(不经过 daemon,直接读存档)。
10
10