evolcore 0.0.41-test.0 → 0.0.41-test.2

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 (235) hide show
  1. package/CHANGELOG.md +62 -0
  2. package/dist/agents/baseagent-availability.js +1 -1
  3. package/dist/agents/baseagent.js +88 -49
  4. package/dist/agents/claude-runner.js +177 -92
  5. package/dist/agents/codex-runner.js +146 -71
  6. package/dist/agents/ecagent-runner.js +1 -1
  7. package/dist/agents/gemini-runner.js +1 -1
  8. package/dist/aun/aid/agentmd.js +98 -11
  9. package/dist/aun/aid/client.js +1 -1
  10. package/dist/aun/aid/control-aid.js +26 -2
  11. package/dist/aun/aid/identity.js +91 -0
  12. package/dist/aun/aid/index.js +1 -1
  13. package/dist/aun/aid/managed-operation.js +1 -1
  14. package/dist/aun/aid/ownership-operation.js +23 -22
  15. package/dist/aun/group/fs-download.js +39 -0
  16. package/dist/aun/group/identity.js +36 -21
  17. package/dist/aun/group/operations.js +5 -0
  18. package/dist/aun/menu/client.js +27 -0
  19. package/dist/aun/msg/managed-operation.js +68 -7
  20. package/dist/aun/msg/p2p.js +8 -8
  21. package/dist/aun/service-proxy.js +53 -12
  22. package/dist/channels/aun.js +633 -32
  23. package/dist/channels/daemon.js +15 -1
  24. package/dist/cli/agent-command.js +5 -2
  25. package/dist/cli/agent-create.js +991 -233
  26. package/dist/cli/agent.js +49 -10
  27. package/dist/cli/aid-bind-command.js +48 -19
  28. package/dist/cli/aun-commands.js +48 -36
  29. package/dist/cli/daemon-commands.js +679 -697
  30. package/dist/cli/fs-command.js +64 -2
  31. package/dist/cli/index.js +72 -5
  32. package/dist/cli/init-channel.js +1 -1
  33. package/dist/cli/init.js +75 -1
  34. package/dist/cli/managed-command-guard.js +17 -1
  35. package/dist/cli/model.js +40 -40
  36. package/dist/cli/provider-command.js +57 -0
  37. package/dist/cli/proxy-command.js +92 -0
  38. package/dist/cli/restart-monitor.js +4 -2
  39. package/dist/cli/role.js +85 -0
  40. package/dist/cli/stats.js +10 -3
  41. package/dist/cli/task-context.js +19 -0
  42. package/dist/config/access-policy.js +7 -2
  43. package/dist/config/boot-log.js +39 -1
  44. package/dist/config/config-field-policy.js +17 -39
  45. package/dist/config/config-manager.js +183 -44
  46. package/dist/config/config-operation-service.js +5 -19
  47. package/dist/config/contact-book-store.js +47 -21
  48. package/dist/config/contact-book.js +18 -12
  49. package/dist/config/contact-operation-service.js +3 -4
  50. package/dist/config/contact-request-service.js +11 -0
  51. package/dist/config/daemon-services.js +11 -0
  52. package/dist/config/gateway-config.js +88 -594
  53. package/dist/config/owner-config.js +2 -2
  54. package/dist/config/peer-role-resolver.js +15 -12
  55. package/dist/config/provider-ipc-service.js +132 -0
  56. package/dist/config/provider-menu-request.js +58 -0
  57. package/dist/config/providers-config.js +12 -7
  58. package/dist/config/providers-import.js +3 -21
  59. package/dist/config/providers-management.js +78 -5
  60. package/dist/config/resolved-config-op.js +11 -1
  61. package/dist/config/role-command-service.js +166 -0
  62. package/dist/config/role-request-service.js +193 -0
  63. package/dist/config/schema-migration.js +1000 -25
  64. package/dist/config-store.js +89 -4
  65. package/dist/contracts/ecweb-instance.js +41 -0
  66. package/dist/contracts/ecweb-service-protocol.js +4 -1
  67. package/dist/core/agent-application-service.js +60 -11
  68. package/dist/core/agent-create-status.js +203 -0
  69. package/dist/core/agent-creation-claim.js +177 -0
  70. package/dist/core/agent-ipc-registration.js +39 -18
  71. package/dist/core/agent-runtime.js +194 -24
  72. package/dist/core/auth/agent-delegation.js +6 -3
  73. package/dist/core/auth/auth-gateway.js +67 -2
  74. package/dist/core/auth/authorization-audit.js +58 -11
  75. package/dist/core/auth/delegation-authorization.js +5 -2
  76. package/dist/core/auth/operation-authorizer.js +43 -6
  77. package/dist/core/auth/operation-catalog.js +45 -7
  78. package/dist/core/channel-loader.js +2 -0
  79. package/dist/core/command/agent-control.js +260 -21
  80. package/dist/core/command/agent-storage-menu.js +5 -3
  81. package/dist/core/command/cli-intent-parser.js +8 -3
  82. package/dist/core/command/command-handler.js +112 -154
  83. package/dist/core/command/connect-menu.js +11 -3
  84. package/dist/core/command/data-root-resolver.js +5 -4
  85. package/dist/core/command/memory-slash.js +16 -8
  86. package/dist/core/command/menu-catalog.js +10 -6
  87. package/dist/core/command/menu-handler.js +106 -73
  88. package/dist/core/command/menu-protocol.js +15 -1
  89. package/dist/core/command/provider-menu.js +46 -0
  90. package/dist/core/command/role-menu.js +147 -30
  91. package/dist/core/command/slash-handler.js +125 -255
  92. package/dist/core/daemon-control.js +26 -27
  93. package/dist/core/event-catalog.js +10 -0
  94. package/dist/core/evolagent-registry.js +7 -5
  95. package/dist/core/evolagent.js +10 -8
  96. package/dist/core/file-integrity/store.js +11 -0
  97. package/dist/core/handoff/ipc-registration.js +3 -0
  98. package/dist/core/inference/text-inference.js +31 -40
  99. package/dist/core/initialization/service.js +491 -0
  100. package/dist/core/ipc-registration.js +40 -24
  101. package/dist/core/memory/consolidation-context.js +51 -5
  102. package/dist/core/memory/consolidation-ops-records.js +96 -1
  103. package/dist/core/memory/consolidation-trigger.js +208 -191
  104. package/dist/core/memory/consolidation.js +333 -35
  105. package/dist/core/memory/index-manager.js +27 -5
  106. package/dist/core/memory/memory-admin.js +45 -5
  107. package/dist/core/memory/memory-writer.js +163 -18
  108. package/dist/core/memory/relation-idle-monitor.js +119 -58
  109. package/dist/core/memory/relation-sweep.js +55 -45
  110. package/dist/core/message/aun-ipc-sender.js +81 -69
  111. package/dist/core/message/im-renderer.js +25 -4
  112. package/dist/core/message/message-admission.js +89 -4
  113. package/dist/core/message/message-bridge.js +66 -21
  114. package/dist/core/message/response-engine.js +108 -35
  115. package/dist/core/model/catalog-service.js +5 -3
  116. package/dist/core/model/config-scope.js +29 -71
  117. package/dist/core/model/field-scope.js +1 -1
  118. package/dist/core/model/model-catalog.js +30 -41
  119. package/dist/core/model/model-diagnostics.js +4 -3
  120. package/dist/core/model/model-fallback.js +10 -7
  121. package/dist/core/model/model-permission.js +3 -2
  122. package/dist/core/ownership/owner-resolver.js +772 -158
  123. package/dist/core/permission/approval-gateway.js +103 -403
  124. package/dist/core/permission/ec-command-parser.js +62 -6
  125. package/dist/core/permission/index.js +1 -0
  126. package/dist/core/permission/permission-result.js +78 -0
  127. package/dist/core/permission/sandbox-runtime.js +18 -1
  128. package/dist/core/permission/tool-policy.js +21 -46
  129. package/dist/core/relation/peer-identity.js +64 -1
  130. package/dist/core/role/runtime-policy.js +72 -13
  131. package/dist/core/session/session-capsule.js +1 -1
  132. package/dist/core/session/session-idle-monitor.js +1 -1
  133. package/dist/core/session/session-manager.js +20 -0
  134. package/dist/core/session/session-renew.js +3 -3
  135. package/dist/core/skill/index-generator.js +15 -5
  136. package/dist/core/system-session/memory.js +43 -8
  137. package/dist/core/thread/thread-service.js +19 -6
  138. package/dist/directory/owner-directory-admission.js +95 -0
  139. package/dist/directory/owner-directory-authorization.js +309 -0
  140. package/dist/directory/owner-directory-cache.js +635 -0
  141. package/dist/eck/kit-renderer.js +2 -2
  142. package/dist/ecweb/basic-settings-service.js +33 -40
  143. package/dist/ecweb/init-menu.js +32 -0
  144. package/dist/ecweb/message-context-service.js +110 -0
  145. package/dist/index.js +93 -19
  146. package/dist/ipc.js +247 -29
  147. package/dist/paths.js +7 -0
  148. package/dist/proxy/command.js +122 -0
  149. package/dist/proxy/ipc-service.js +68 -0
  150. package/dist/proxy/manager.js +484 -0
  151. package/dist/proxy/service-supervisor.js +603 -0
  152. package/dist/response-system/engines/v1/proactive-flow.js +16 -6
  153. package/dist/trigger/authorization.js +27 -17
  154. package/dist/trigger/feedback.js +2 -3
  155. package/dist/trigger/ipc-service.js +105 -78
  156. package/dist/trigger/local-files.js +2 -1
  157. package/dist/trigger/manager.js +5 -3
  158. package/dist/trigger/scheduler.js +88 -6
  159. package/dist/utils/atomic-write.js +28 -0
  160. package/dist/utils/cross-platform.js +14 -0
  161. package/dist/utils/ecweb-supervisor.js +258 -83
  162. package/dist/utils/error-utils.js +26 -2
  163. package/dist/utils/logger.js +92 -6
  164. package/dist/utils/package-version-info.js +4 -2
  165. package/dist/utils/welcome.js +1 -1
  166. package/kits/docs/INDEX.md +1 -0
  167. package/kits/docs/aun/SDK.md +4 -1
  168. package/kits/docs/channels/aun.md +9 -0
  169. package/kits/docs/evolcore/INDEX.md +1 -0
  170. package/kits/docs/evolcore/agent.md +8 -1
  171. package/kits/docs/evolcore/aid.md +67 -17
  172. package/kits/docs/evolcore/config.md +28 -7
  173. package/kits/docs/evolcore/contact.md +3 -0
  174. package/kits/docs/evolcore/fs.md +11 -0
  175. package/kits/docs/evolcore/group.md +1 -1
  176. package/kits/docs/evolcore/memory-architecture.md +2 -2
  177. package/kits/docs/evolcore/memory-consolidation.md +32 -8
  178. package/kits/docs/evolcore/memory.md +1 -1
  179. package/kits/docs/evolcore/menu-protocol.md +4 -0
  180. package/kits/docs/evolcore/model.md +23 -20
  181. package/kits/docs/evolcore/msg.md +4 -7
  182. package/kits/docs/evolcore/provider.md +50 -0
  183. package/kits/docs/identity/AID_PROFILE_SPEC.md +52 -17
  184. package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
  185. package/kits/rules/01-overview.md +3 -0
  186. package/kits/rules/04-relation.md +1 -1
  187. package/kits/schemas/_meta.json +37 -4
  188. package/kits/schemas/agent-config.schema.13.json +8 -3
  189. package/kits/schemas/agent-config.schema.16.json +891 -0
  190. package/kits/schemas/daemon.schema.9.json +366 -0
  191. package/kits/schemas/defaults.schema.5.json +406 -127
  192. package/kits/schemas/relation-config.schema.11.json +277 -0
  193. package/kits/schemas/role-config.schema.1.json +7 -7
  194. package/kits/skills/.switches.json +4 -0
  195. package/kits/skills/ec-agent-create/SKILL.md +3 -0
  196. package/kits/skills/ec-identity/SKILL.md +2 -2
  197. package/kits/skills/ec-service-proxy/SKILL.md +118 -0
  198. package/kits/skills/ec-skill/scripts/skill.mjs +6 -0
  199. package/kits/skills/personal-assistant/SKILL.md +176 -0
  200. package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
  201. package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
  202. package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
  203. package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
  204. package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
  205. package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
  206. package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
  207. package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
  208. package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
  209. package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
  210. package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
  211. package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
  212. package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
  213. package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
  214. package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
  215. package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
  216. package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
  217. package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
  218. package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
  219. package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
  220. package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
  221. package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
  222. package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
  223. package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
  224. package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
  225. package/kits/skills/thread-ops/SKILL.md +5 -0
  226. package/kits/templates/memory-consolidation/forget.md +19 -6
  227. package/kits/templates/memory-consolidation/notes.md +1 -1
  228. package/kits/templates/memory-consolidation/profile.md +2 -2
  229. package/kits/templates/memory-consolidation/promote.md +20 -3
  230. package/kits/templates/roles/member.json +8 -1
  231. package/kits/templates/system-fragments/baseagent.md +2 -2
  232. package/kits/templates/system-fragments/memory.md +4 -4
  233. package/kits/templates/system-fragments/venue.md +1 -1
  234. package/package.json +7 -3
  235. package/dist/core/message/create-status.js +0 -96
@@ -1,18 +1,25 @@
1
1
  /**
2
2
  * relation-idle-monitor.ts — 关系级空闲 / 兜底计时
3
3
  *
4
- * 记忆整理一律以关系为单位(selfAid + peerKey;群聊按 groupId 算一个关系)。
5
- * 每个关系一个计时器,到期时间取两者较早者:
4
+ * 内容驱动的记忆整理(notes → generalize → promote)以关系为单位(selfAid + peerKey;
5
+ * 群聊按 groupId 算一个关系)。每个关系一个计时器,看两个时间点:
6
6
  *
7
- * 空闲 lastInboundAt + idleHours(默认 1) 最后一条入站后没有新入站
8
- * 兜底 firstUnsweptInboundAt + maxUnconsolidatedHours(默认 8) 最早一条未整理入站等太久
7
+ * 空闲 lastActivityAt + idleHours(默认 1) 每次活动往后推
8
+ * 兜底 firstUnsweptAt + maxUnconsolidatedHours(默认 8) 不往后推
9
9
  *
10
- * 兜底从「最早未整理入站」起算而不是「上次整理时间」:沉寂多日的关系一来消息不会立刻被强整。
11
- * 只计真实入站:owner 插话(owner-inject)、系统渠道、后台会话、trigger 不算。
10
+ * 「活动」= 真实入站、往该关系 pending/ 写了一条 note、群链按发言人写入了该关系。
11
+ * owner 插话(owner-inject)、系统渠道、后台会话、trigger 的入站本身不算;但这些轮次里写的 note 算,
12
+ * 所以它们产出的 note 同样进入计时。
12
13
  *
13
- * 到期后交给 startSweep(关系整理链,见 relation-sweep.ts),链跑完回调 onSweepFinished。
14
- * 同一关系同时只跑一条链;链开始时清空 firstUnsweptInboundAt,期间的入站算新一轮。
15
- * 状态落盘,重启后恢复;中断的链按「有未整理入站」处理,启动后立即重跑。
14
+ * 空闲到期拉起的链只跑候选攒够一批的步骤,兜底到期拉起的链有 1 条候选就跑(见 relation-sweep.ts)。
15
+ * 链结束后按结果续兜底时钟:
16
+ * - 有步骤被推迟:兜底按原起点继续;链运行期间没有新活动时,这一轮空闲记为已消费
17
+ * (空闲早已过期,不记会立刻再触发),等下一次活动或兜底
18
+ * - 有步骤失败:从现在起重新计兜底时钟,最快 maxUnconsolidatedHours 后重试,不会连环重试
19
+ *
20
+ * 到期后交给 startSweep(关系整理链),链跑完回调 onSweepFinished。同一关系同时只跑一条链;
21
+ * 链开始时清空 firstUnsweptAt,链运行期间的活动算新一轮。
22
+ * 状态落盘,重启后恢复;中断的链按「原兜底时钟仍在」处理,启动后立即重跑。
16
23
  */
17
24
  import fs from 'fs';
18
25
  import path from 'path';
@@ -20,15 +27,28 @@ import { formatPeerKey } from '../relation/peer-identity.js';
20
27
  import { isNonAgentSessionChannel } from '../system-channels.js';
21
28
  import { atomicWriteJson, decodeDirSegment, tryParseChannelSessionKey } from '../session/session-fs-store.js';
22
29
  import { logger } from '../../utils/logger.js';
23
- import { DEFAULT_MAX_UNCONSOLIDATED_HOURS, DEFAULT_RELATION_IDLE_HOURS } from './consolidation-trigger.js';
30
+ import { DEFAULT_MAX_UNCONSOLIDATED_HOURS, DEFAULT_RELATION_IDLE_HOURS, isConsolidatableRelation, } from './consolidation-trigger.js';
24
31
  const HOUR_MS = 60 * 60 * 1000;
25
32
  /** setTimeout 的上限约 24.8 天;更远的到期时间分段等。 */
26
33
  const MAX_TIMER_MS = 2 ** 31 - 1;
27
- /** 没有待整理入站、超过这么久没动静的条目不再落盘(路由信息下次入站会重新带上)。 */
34
+ /** 没有待整理活动、超过这么久没动静的条目不再落盘(路由信息下次入站会重新带上)。 */
28
35
  const PRUNE_AFTER_MS = 7 * 24 * HOUR_MS;
29
36
  const SAVE_DEBOUNCE_MS = 1000;
37
+ /** 路由换成整理会话的任务上下文字段(channel / channelId / peerId / chatType …);没有路由时为空。 */
38
+ export function taskContextOfRoute(route) {
39
+ if (!route)
40
+ return {};
41
+ return {
42
+ channel: route.channel,
43
+ channelId: route.channelId,
44
+ peerId: route.peerId,
45
+ chatType: route.chatType,
46
+ ...(route.channelKey ? { channelKey: route.channelKey } : {}),
47
+ ...(route.threadId ? { threadId: route.threadId } : {}),
48
+ };
49
+ }
30
50
  /**
31
- * 把一条入站日志换算成关系入站信号;不是真实关系入站时返回 undefined。
51
+ * 把一条入站日志换算成关系活动;不是真实关系入站时返回 undefined。
32
52
  *
33
53
  * chatDir 形如 `<sessionsDir>/<selfAid>/sessions/<type>#<name>#<channelId>`,
34
54
  * channelType / 渠道实例名 / selfAid 都从路径取——日志条目本身只有 from/to。
@@ -80,6 +100,9 @@ function relationKey(selfAid, peerKey) {
80
100
  function positiveHours(value, fallback) {
81
101
  return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : fallback;
82
102
  }
103
+ function numberOrUndefined(value) {
104
+ return typeof value === 'number' ? value : undefined;
105
+ }
83
106
  export class RelationIdleMonitor {
84
107
  deps;
85
108
  entries = new Map();
@@ -90,7 +113,7 @@ export class RelationIdleMonitor {
90
113
  this.deps = deps;
91
114
  this.now = deps.now ?? Date.now;
92
115
  }
93
- /** 加载落盘状态。中断的链按「有未整理入站」恢复。 */
116
+ /** 加载落盘状态。中断的链按「原兜底时钟仍在」恢复。兼容 version 1(lastInboundAt)。 */
94
117
  load() {
95
118
  let raw;
96
119
  try {
@@ -99,21 +122,27 @@ export class RelationIdleMonitor {
99
122
  catch {
100
123
  return;
101
124
  }
102
- if (!raw || raw.version !== 1 || !Array.isArray(raw.entries))
125
+ if (!raw || (raw.version !== 1 && raw.version !== 2) || !Array.isArray(raw.entries))
103
126
  return;
104
127
  for (const item of raw.entries) {
105
128
  if (!item?.selfAid || !item?.peerKey)
106
129
  continue;
130
+ const lastActivityAt = numberOrUndefined(item.lastActivityAt) ?? numberOrUndefined(item.lastInboundAt);
131
+ const firstUnsweptAt = numberOrUndefined(item.firstUnsweptAt);
107
132
  const entry = {
108
133
  selfAid: item.selfAid,
109
134
  peerKey: item.peerKey,
110
- ...(typeof item.lastInboundAt === 'number' ? { lastInboundAt: item.lastInboundAt } : {}),
111
- ...(typeof item.firstUnsweptAt === 'number' ? { firstUnsweptAt: item.firstUnsweptAt } : {}),
135
+ ...(lastActivityAt !== undefined ? { lastActivityAt } : {}),
136
+ ...(firstUnsweptAt !== undefined ? { firstUnsweptAt } : {}),
137
+ ...(item.idleConsumed === true ? { idleConsumed: true } : {}),
112
138
  ...(item.route ? { route: item.route } : {}),
113
139
  };
114
- // 上次进程退出时链还在跑:那一轮没跑完,当作它覆盖的入站还没整理
115
- if (typeof item.sweepingSince === 'number') {
116
- entry.firstUnsweptAt = Math.min(entry.firstUnsweptAt ?? item.sweepingSince, item.sweepingSince);
140
+ // 上次进程退出时链还在跑:那一轮没跑完,兜底时钟按链开始前的起点恢复,空闲立即到期重跑
141
+ const sweepingSince = numberOrUndefined(item.sweepingSince);
142
+ if (sweepingSince !== undefined) {
143
+ const clock = numberOrUndefined(item.sweepClockFrom) ?? sweepingSince;
144
+ entry.firstUnsweptAt = Math.min(entry.firstUnsweptAt ?? clock, clock);
145
+ entry.idleConsumed = undefined;
117
146
  }
118
147
  this.entries.set(relationKey(entry.selfAid, entry.peerKey), entry);
119
148
  }
@@ -136,53 +165,74 @@ export class RelationIdleMonitor {
136
165
  this.saveTimer = undefined;
137
166
  this.saveNow();
138
167
  }
139
- /** 关系有一条真实入站。 */
140
- recordInbound(inbound) {
168
+ /** 关系有一次活动(入站、写 note、被群链写入)。 */
169
+ recordActivity(activity) {
170
+ if (!isConsolidatableRelation(activity.peerKey))
171
+ return;
141
172
  const at = this.now();
142
- const entry = this.ensureEntry(inbound.selfAid, inbound.peerKey);
143
- entry.lastInboundAt = at;
173
+ const entry = this.ensureEntry(activity.selfAid, activity.peerKey);
174
+ entry.lastActivityAt = at;
144
175
  if (entry.firstUnsweptAt === undefined)
145
176
  entry.firstUnsweptAt = at;
146
- entry.route = inbound.route;
177
+ entry.idleConsumed = undefined;
178
+ if (activity.route)
179
+ entry.route = activity.route;
147
180
  this.schedule(entry);
148
181
  this.scheduleSave();
149
182
  }
150
183
  /**
151
- * 要求尽快整理某个关系(群链写入了发言人关系、pending 堆积兜底等),不等计时。
152
- * 链在跑时记一笔,链结束后再跑一轮。
184
+ * 启动时补登:关系 pending/ 里有 note 却没有兜底时钟(部署前写的、计时状态丢失、
185
+ * 上一轮因不能整理而作废后没有新活动)时,按最老 note 的时间补一次活动。
186
+ * 已有时钟或链在跑的不动。最老 note 已满兜底时长的,start() 后立即强制整理。
153
187
  */
154
- requestSweep(selfAid, peerKey, propagate) {
155
- // 与计时到期同一道门:开关关闭、首次设定未完成时不起链
156
- if (!this.deps.canSweep(selfAid, peerKey))
188
+ seedPending(selfAid, peerKey, oldestNoteAt) {
189
+ if (!isConsolidatableRelation(peerKey))
157
190
  return;
158
191
  const entry = this.ensureEntry(selfAid, peerKey);
159
- if (entry.sweepingSince !== undefined) {
160
- entry.sweepRequested = true;
192
+ if (entry.firstUnsweptAt !== undefined || entry.sweepingSince !== undefined)
161
193
  return;
162
- }
163
- this.begin(entry, propagate);
194
+ entry.firstUnsweptAt = oldestNoteAt;
195
+ entry.lastActivityAt = Math.max(entry.lastActivityAt ?? 0, oldestNoteAt);
196
+ entry.idleConsumed = undefined;
197
+ this.schedule(entry);
198
+ this.scheduleSave();
164
199
  }
165
200
  /** 整理链结束(无论成败、无论起没起会话)。 */
166
- onSweepFinished(selfAid, peerKey) {
201
+ onSweepFinished(selfAid, peerKey, outcome = {}) {
167
202
  const entry = this.entries.get(relationKey(selfAid, peerKey));
168
203
  if (!entry || entry.sweepingSince === undefined)
169
204
  return;
205
+ const startedAt = entry.sweepingSince;
206
+ const clockFrom = entry.sweepClockFrom;
170
207
  entry.sweepingSince = undefined;
171
- if (entry.sweepRequested) {
172
- entry.sweepRequested = false;
173
- this.begin(entry, false);
174
- return;
208
+ entry.sweepClockFrom = undefined;
209
+ let restoreAt;
210
+ // 推迟:这一轮没整理完,兜底按原起点继续
211
+ if (outcome.deferred && clockFrom !== undefined)
212
+ restoreAt = clockFrom;
213
+ // 失败:从现在起重新计兜底,避免原起点早已过期导致连环重试
214
+ if (outcome.failed)
215
+ restoreAt = Math.min(restoreAt ?? this.now(), this.now());
216
+ if (restoreAt !== undefined) {
217
+ entry.firstUnsweptAt = Math.min(entry.firstUnsweptAt ?? restoreAt, restoreAt);
218
+ // 链运行期间没有新活动:这一轮空闲已经用掉,等下一次活动或兜底
219
+ if ((entry.lastActivityAt ?? 0) <= startedAt)
220
+ entry.idleConsumed = true;
175
221
  }
176
222
  this.schedule(entry);
177
223
  this.scheduleSave();
178
224
  }
225
+ /** 关系最近一次入站记下的路由(定时检查拉起 profile / forget 时复用)。 */
226
+ routeOf(selfAid, peerKey) {
227
+ return this.entries.get(relationKey(selfAid, peerKey))?.route;
228
+ }
179
229
  /** 测试与诊断用:当前状态快照。 */
180
230
  snapshot(selfAid, peerKey) {
181
231
  const entry = this.entries.get(relationKey(selfAid, peerKey));
182
232
  if (!entry)
183
233
  return undefined;
184
234
  const { timer: _timer, ...rest } = entry;
185
- return { ...rest, dueAt: this.dueAt(entry) };
235
+ return { ...rest, dueAt: this.due(entry)?.at };
186
236
  }
187
237
  ensureEntry(selfAid, peerKey) {
188
238
  const key = relationKey(selfAid, peerKey);
@@ -193,15 +243,18 @@ export class RelationIdleMonitor {
193
243
  }
194
244
  return entry;
195
245
  }
196
- /** 没有待整理入站时不计时。 */
197
- dueAt(entry) {
246
+ /** 下一次到期:空闲(已消费则不计)与兜底取较早者。没有待整理活动时不计时。 */
247
+ due(entry) {
198
248
  if (entry.firstUnsweptAt === undefined)
199
249
  return undefined;
200
250
  const timing = this.deps.getTiming(entry.selfAid);
201
251
  const idleMs = positiveHours(timing?.idleHours, DEFAULT_RELATION_IDLE_HOURS) * HOUR_MS;
202
252
  const maxMs = positiveHours(timing?.maxUnconsolidatedHours, DEFAULT_MAX_UNCONSOLIDATED_HOURS) * HOUR_MS;
203
- const last = entry.lastInboundAt ?? entry.firstUnsweptAt;
204
- return Math.min(last + idleMs, entry.firstUnsweptAt + maxMs);
253
+ const forceAt = entry.firstUnsweptAt + maxMs;
254
+ const idleAt = entry.idleConsumed
255
+ ? Infinity
256
+ : (entry.lastActivityAt ?? entry.firstUnsweptAt) + idleMs;
257
+ return { at: Math.min(idleAt, forceAt), forceAt };
205
258
  }
206
259
  schedule(entry) {
207
260
  if (entry.timer)
@@ -209,46 +262,52 @@ export class RelationIdleMonitor {
209
262
  entry.timer = undefined;
210
263
  if (!this.active || entry.sweepingSince !== undefined)
211
264
  return;
212
- const due = this.dueAt(entry);
213
- if (due === undefined)
265
+ const due = this.due(entry);
266
+ if (!due)
214
267
  return;
215
- const delay = Math.max(0, Math.min(due - this.now(), MAX_TIMER_MS));
268
+ const delay = Math.max(0, Math.min(due.at - this.now(), MAX_TIMER_MS));
216
269
  entry.timer = setTimeout(() => {
217
270
  entry.timer = undefined;
218
271
  // 分段等待:还没到真正的到期时间就再排一次
219
- if ((this.dueAt(entry) ?? Infinity) > this.now()) {
272
+ const current = this.due(entry);
273
+ if (!current)
274
+ return;
275
+ if (current.at > this.now()) {
220
276
  this.schedule(entry);
221
277
  return;
222
278
  }
223
- this.fire(entry);
279
+ this.fire(entry, this.now() >= current.forceAt);
224
280
  }, delay);
225
281
  entry.timer.unref?.();
226
282
  }
227
- fire(entry) {
283
+ fire(entry, force) {
228
284
  if (!this.active || entry.sweepingSince !== undefined)
229
285
  return;
230
286
  if (!this.deps.canSweep(entry.selfAid, entry.peerKey)) {
231
- // 现在整理不了(开关关闭、首次设定未完成等):这一轮作废,等下一条入站重新计时
287
+ // 现在整理不了(开关关闭、首次设定未完成等):这一轮作废,等下一次活动重新计时
232
288
  entry.firstUnsweptAt = undefined;
289
+ entry.idleConsumed = undefined;
233
290
  this.scheduleSave();
234
291
  return;
235
292
  }
236
- this.begin(entry, true);
293
+ this.begin(entry, force);
237
294
  }
238
- begin(entry, propagate) {
295
+ begin(entry, force) {
239
296
  if (entry.timer)
240
297
  clearTimeout(entry.timer);
241
298
  entry.timer = undefined;
242
299
  entry.sweepingSince = this.now();
300
+ entry.sweepClockFrom = entry.firstUnsweptAt;
243
301
  entry.firstUnsweptAt = undefined;
302
+ entry.idleConsumed = undefined;
244
303
  this.scheduleSave();
245
- logger.info(`[Memory] 关系整理链开始(aid=${entry.selfAid},peerKey=${entry.peerKey})`);
304
+ logger.info(`[Memory] 关系整理链开始(aid=${entry.selfAid},peerKey=${entry.peerKey},${force ? '兜底到期' : '空闲到期'})`);
246
305
  try {
247
- this.deps.startSweep({ selfAid: entry.selfAid, peerKey: entry.peerKey, route: entry.route, propagate });
306
+ this.deps.startSweep({ selfAid: entry.selfAid, peerKey: entry.peerKey, route: entry.route, force });
248
307
  }
249
308
  catch (error) {
250
309
  logger.warn(`[Memory] 关系整理链启动失败(peerKey=${entry.peerKey}): ${error?.message}`);
251
- this.onSweepFinished(entry.selfAid, entry.peerKey);
310
+ this.onSweepFinished(entry.selfAid, entry.peerKey, { failed: true });
252
311
  }
253
312
  }
254
313
  scheduleSave() {
@@ -265,20 +324,22 @@ export class RelationIdleMonitor {
265
324
  const entries = [];
266
325
  for (const entry of this.entries.values()) {
267
326
  const pending = entry.firstUnsweptAt !== undefined || entry.sweepingSince !== undefined;
268
- if (!pending && (entry.lastInboundAt === undefined || now - entry.lastInboundAt > PRUNE_AFTER_MS))
327
+ if (!pending && (entry.lastActivityAt === undefined || now - entry.lastActivityAt > PRUNE_AFTER_MS))
269
328
  continue;
270
329
  entries.push({
271
330
  selfAid: entry.selfAid,
272
331
  peerKey: entry.peerKey,
273
- ...(entry.lastInboundAt !== undefined ? { lastInboundAt: entry.lastInboundAt } : {}),
332
+ ...(entry.lastActivityAt !== undefined ? { lastActivityAt: entry.lastActivityAt } : {}),
274
333
  ...(entry.firstUnsweptAt !== undefined ? { firstUnsweptAt: entry.firstUnsweptAt } : {}),
334
+ ...(entry.idleConsumed ? { idleConsumed: true } : {}),
275
335
  ...(entry.sweepingSince !== undefined ? { sweepingSince: entry.sweepingSince } : {}),
336
+ ...(entry.sweepClockFrom !== undefined ? { sweepClockFrom: entry.sweepClockFrom } : {}),
276
337
  ...(entry.route ? { route: entry.route } : {}),
277
338
  });
278
339
  }
279
340
  try {
280
341
  fs.mkdirSync(path.dirname(this.deps.statePath), { recursive: true });
281
- atomicWriteJson(this.deps.statePath, { version: 1, entries });
342
+ atomicWriteJson(this.deps.statePath, { version: 2, entries });
282
343
  }
283
344
  catch (error) {
284
345
  logger.warn(`[Memory] 关系空闲状态落盘失败: ${error?.message}`);
@@ -1,22 +1,27 @@
1
1
  /**
2
2
  * relation-sweep.ts — 关系整理链
3
3
  *
4
- * 一个关系空闲 / 兜底到期后,对它依次跑:
4
+ * 一个关系空闲 / 兜底到期后,对它依次跑内容驱动的三步:
5
5
  *
6
- * notes → generalize → promote(仅 owner 关系)→ profile → forget(关系层)
6
+ * notes → generalize → promote(仅 owner 关系)
7
7
  *
8
- * 每一步在上一步收尾之后才判定要不要做(notes 新产出的 to-generalize 要被第 2 步看到),
9
- * 没有候选的步骤跳过,一个候选都没有就一个会话都不起。所有步骤走同一个整理队列,同 agent 串行。
10
- * 触发来源记为 `relation-idle`,静默不反馈。
8
+ * 每一步在上一步收尾之后才判定要不要做(notes 新产出的 to-generalize 要被第 2 步看到):
9
+ * - 兜底到期(force):有 1 条候选就跑
10
+ * - 空闲到期:候选攒够 memory.minBatchItems 才跑,不够的推迟(结果标 deferred)
11
+ * 没有候选的步骤跳过,一个都不跑就一个会话都不起。所有步骤走同一个整理队列,同 agent 串行。
12
+ * 触发来源记为 `relation-idle`,静默不反馈。画像与关系层遗忘是时间驱动的,由全局定时检查负责。
13
+ *
14
+ * 结果里的 deferred / failed 交给监视器决定兜底时钟怎么续(见 relation-idle-monitor.ts)。
11
15
  *
12
16
  * 链中途收到新入站不中断:兜底本就发生在聊天进行中,主会话只写 pending,链写 consolidated。
13
17
  *
14
- * 群聊 notes 会按发言人用 `--peer` 把记忆写进发言人自己的关系。那些关系不一定有入站
15
- * (发言人从不私聊),所以链结束时把它们交给 onSweepFinished 的 touchedPeerKeys,
16
- * 由调用方各自补一轮整理(不再继续传播)。
18
+ * 群聊 notes 会按发言人用 `--peer` 把记忆写进发言人自己的关系。链结束时把这些关系交给
19
+ * onSweepFinished 的 touchedPeerKeys,由调用方记为该关系的一次活动。
17
20
  */
18
21
  import { logger } from '../../utils/logger.js';
19
- import { RELATION_SWEEP_ORDER, isRelationModeDue } from './consolidation-trigger.js';
22
+ import { RELATION_SWEEP_ORDER, judgeRelationMode } from './consolidation-trigger.js';
23
+ import { taskContextOfRoute } from './relation-idle-monitor.js';
24
+ import { parsePeerKey } from '../relation/peer-identity.js';
20
25
  /** 单步整理会话迟迟不收尾时,链最多等这么久就放弃(整理会话自身 15 分钟超时,留余量)。 */
21
26
  const DEFAULT_STEP_WATCHDOG_MS = 30 * 60_000;
22
27
  /**
@@ -40,11 +45,11 @@ let sweepSeq = 0;
40
45
  export class RelationSweepRunner {
41
46
  deps;
42
47
  sweeps = new Map();
43
- isModeDue;
48
+ judgeMode;
44
49
  stepWatchdogMs;
45
50
  constructor(deps) {
46
51
  this.deps = deps;
47
- this.isModeDue = deps.isModeDue ?? isRelationModeDue;
52
+ this.judgeMode = deps.judgeMode ?? judgeRelationMode;
48
53
  this.stepWatchdogMs = deps.stepWatchdogMs ?? DEFAULT_STEP_WATCHDOG_MS;
49
54
  }
50
55
  /** 开始一条整理链。保证之后恰好调用一次 onSweepFinished。 */
@@ -55,28 +60,25 @@ export class RelationSweepRunner {
55
60
  request,
56
61
  remaining: [...RELATION_SWEEP_ORDER],
57
62
  ran: [],
63
+ deferred: false,
64
+ failed: false,
58
65
  touched: new Set(),
59
66
  step: 0,
60
67
  };
61
68
  this.sweeps.set(id, state);
62
- void this.deps.resolveOwner(request.selfAid)
63
- .catch(() => undefined)
64
- .then(ownerAid => {
65
- state.ownerAid = ownerAid;
66
- return this.advance(state);
67
- });
69
+ void this.advance(state);
68
70
  }
69
71
  /** 整理会话收尾回调(来自 finalizer 的 onSessionFinalized)。 */
70
72
  onSessionFinalized(info) {
71
73
  const state = this.currentStep(info.relationSweepId, info.sessionId);
72
74
  if (!state)
73
75
  return;
74
- if (state.request.propagate) {
75
- for (const peerKey of info.touchedPeerKeys) {
76
- if (peerKey !== state.request.peerKey)
77
- state.touched.add(peerKey);
78
- }
76
+ for (const peerKey of info.touchedPeerKeys) {
77
+ if (peerKey !== state.request.peerKey)
78
+ state.touched.add(peerKey);
79
79
  }
80
+ if (!info.success)
81
+ state.failed = true;
80
82
  this.stepDone(state);
81
83
  }
82
84
  /** 排队后拉起失败的通知(来自 ConsolidationQueue.setLaunchFailedListener)。 */
@@ -84,6 +86,7 @@ export class RelationSweepRunner {
84
86
  const state = this.currentStep(params.relationSweepId);
85
87
  if (!state)
86
88
  return;
89
+ state.failed = true;
87
90
  this.stepDone(state);
88
91
  }
89
92
  /** 回调对应的是某条链**正在等的那一步**时返回该链;过期步骤、无关会话返回 undefined。 */
@@ -119,35 +122,38 @@ export class RelationSweepRunner {
119
122
  void this.advance(state);
120
123
  }
121
124
  async advance(state) {
122
- const { selfAid, peerKey, route } = state.request;
125
+ const { selfAid, peerKey, route, force } = state.request;
123
126
  while (state.remaining.length > 0) {
124
127
  const mode = state.remaining.shift();
125
128
  const agent = this.deps.getAgent(selfAid);
126
129
  const memoryConfig = agent?.config?.memory;
127
- let due = false;
130
+ let verdict = 'none';
128
131
  try {
129
- due = this.isModeDue({ mode, selfAid, peerKey, ownerAid: state.ownerAid, config: memoryConfig });
132
+ if (mode === 'promote') {
133
+ const candidateOwner = parsePeerKey(peerKey).channelId;
134
+ if (this.judgeMode({ mode, selfAid, peerKey, ownerAid: candidateOwner, config: memoryConfig, force }) === 'none')
135
+ continue;
136
+ state.ownerAid = await this.deps.resolveOwner(selfAid).catch(() => undefined);
137
+ }
138
+ verdict = this.judgeMode({ mode, selfAid, peerKey, ownerAid: state.ownerAid, config: memoryConfig, force });
130
139
  }
131
140
  catch (error) {
132
141
  logger.warn(`[Memory] 关系整理链判定失败(peerKey=${peerKey},mode=${mode}): ${error?.message}`);
133
142
  }
134
- if (!due)
143
+ if (verdict === 'defer') {
144
+ state.deferred = true;
135
145
  continue;
136
- if (!agent?.baseagent)
146
+ }
147
+ if (verdict !== 'run')
148
+ continue;
149
+ if (!agent?.baseagent) {
150
+ state.failed = true;
137
151
  break;
138
- const taskCtx = {
139
- selfAid,
140
- peerKey,
141
- baseagent: agent.baseagent,
142
- ...(route ? {
143
- channel: route.channel,
144
- channelId: route.channelId,
145
- peerId: route.peerId,
146
- chatType: route.chatType,
147
- ...(route.channelKey ? { channelKey: route.channelKey } : {}),
148
- ...(route.threadId ? { threadId: route.threadId } : {}),
149
- } : {}),
150
- };
152
+ }
153
+ if (mode !== 'promote' && state.ownerAid === undefined) {
154
+ state.ownerAid = await this.deps.resolveOwner(selfAid).catch(() => undefined);
155
+ }
156
+ const taskCtx = { selfAid, peerKey, baseagent: agent.baseagent, ...taskContextOfRoute(route) };
151
157
  // 先挂上等待标记再入队:会话可能在 enqueue 返回前就收尾,收尾回调要能认出这一步
152
158
  const token = ++state.step;
153
159
  state.waiting = mode;
@@ -158,8 +164,6 @@ export class RelationSweepRunner {
158
164
  mode,
159
165
  triggeredBy: 'relation-idle',
160
166
  ownerAid: state.ownerAid,
161
- forgetAfterDays: memoryConfig?.forgetAfterDays,
162
- ...(mode === 'forget' ? { scopeOverride: 'relation' } : {}),
163
167
  relationSweepId: stepTag(state.id, token),
164
168
  });
165
169
  }
@@ -175,6 +179,7 @@ export class RelationSweepRunner {
175
179
  if (!launched) {
176
180
  // 立即拉起失败:这一步作废,继续下一步
177
181
  state.waiting = undefined;
182
+ state.failed = true;
178
183
  continue;
179
184
  }
180
185
  state.ran.push(mode);
@@ -182,6 +187,7 @@ export class RelationSweepRunner {
182
187
  state.waitingSessionId = launched.executionSessionId;
183
188
  state.watchdog = setTimeout(() => {
184
189
  logger.warn(`[Memory] 关系整理链等待收尾超时,跳过该步(peerKey=${peerKey},mode=${mode})`);
190
+ state.failed = true;
185
191
  this.stepDone(state);
186
192
  }, this.stepWatchdogMs);
187
193
  state.watchdog.unref?.();
@@ -193,11 +199,15 @@ export class RelationSweepRunner {
193
199
  if (!this.sweeps.delete(state.id))
194
200
  return;
195
201
  const { selfAid, peerKey } = state.request;
196
- if (state.ran.length > 0) {
197
- logger.info(`[Memory] 关系整理链结束(aid=${selfAid},peerKey=${peerKey}):${state.ran.join(' → ')}`);
202
+ if (state.ran.length > 0 || state.deferred) {
203
+ logger.info(`[Memory] 关系整理链结束(aid=${selfAid},peerKey=${peerKey}):${state.ran.join(' → ') || '无'}`
204
+ + `${state.deferred ? ',有步骤候选不足已推迟' : ''}${state.failed ? ',有步骤失败' : ''}`);
198
205
  }
199
206
  try {
200
- this.deps.onSweepFinished({ selfAid, peerKey, ran: state.ran, touchedPeerKeys: [...state.touched] });
207
+ this.deps.onSweepFinished({
208
+ selfAid, peerKey, ran: state.ran, deferred: state.deferred, failed: state.failed,
209
+ touchedPeerKeys: [...state.touched],
210
+ });
201
211
  }
202
212
  catch (error) {
203
213
  logger.warn(`[Memory] 关系整理链结束回调失败(peerKey=${peerKey}): ${error?.message}`);