evolcore 0.0.32 → 0.0.33

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 (150) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/bin/install-codex-managed-hooks.mjs +124 -37
  3. package/dist/agents/claude-runner.js +29 -2
  4. package/dist/agents/codex/app-server-client.js +3 -0
  5. package/dist/agents/codex/diagnostics.js +76 -44
  6. package/dist/agents/codex-runner.js +23 -19
  7. package/dist/agents/ecagent-runner.js +5 -13
  8. package/dist/aun/group/operations.js +0 -1
  9. package/dist/aun/msg/history.js +1 -0
  10. package/dist/aun/msg/p2p.js +0 -1
  11. package/dist/aun/outbox.js +50 -1
  12. package/dist/channels/aun.js +28 -2
  13. package/dist/channels/daemon.js +257 -2
  14. package/dist/cli/agent-command.js +58 -24
  15. package/dist/cli/agent.js +1 -1
  16. package/dist/cli/aun-commands.js +365 -29
  17. package/dist/cli/contact.js +8 -2
  18. package/dist/cli/daemon-commands.js +81 -12
  19. package/dist/cli/debug-mode.js +154 -0
  20. package/dist/cli/handoff-command.js +3 -0
  21. package/dist/cli/index.js +81 -64
  22. package/dist/cli/init.js +2 -2
  23. package/dist/cli/managed-command-guard.js +5 -0
  24. package/dist/cli/memory-command.js +8 -1
  25. package/dist/cli/queue-command.js +9 -4
  26. package/dist/cli/session-command.js +194 -0
  27. package/dist/cli/skill-command.js +78 -2
  28. package/dist/cli/task-context.js +1 -0
  29. package/dist/cli/thread-command.js +620 -0
  30. package/dist/cli/trigger-command.js +4 -2
  31. package/dist/config/builtin-roles.js +1 -0
  32. package/dist/config/config-field-policy.js +2 -3
  33. package/dist/config/config-manager.js +7 -2
  34. package/dist/config/resolved-config-op.js +3 -0
  35. package/dist/config-store.js +15 -0
  36. package/dist/core/auth/agent-delegation.js +25 -1
  37. package/dist/core/auth/debug-context.js +139 -0
  38. package/dist/core/auth/operation-authorizer.js +24 -1
  39. package/dist/core/auth/operation-catalog.js +33 -0
  40. package/dist/core/background-session/session-cleanup.js +212 -0
  41. package/dist/core/background-session/types.js +10 -0
  42. package/dist/core/bootstrap-messages.js +1 -1
  43. package/dist/core/bootstrap-service.js +6 -3
  44. package/dist/core/command/command-handler.js +60 -24
  45. package/dist/core/command/memory-slash.js +6 -2
  46. package/dist/core/command/menu-catalog.js +48 -1
  47. package/dist/core/command/menu-handler.js +92 -16
  48. package/dist/core/command/menu-protocol.js +24 -1
  49. package/dist/core/command/skill-slash.js +322 -0
  50. package/dist/core/command/slash-gate.js +6 -4
  51. package/dist/core/command/slash-handler.js +193 -13
  52. package/dist/core/command/topic-slash.js +528 -0
  53. package/dist/core/evolagent-registry.js +20 -5
  54. package/dist/core/handoff/runtime.js +5 -11
  55. package/dist/core/handoff/store.js +5 -0
  56. package/dist/core/ipc-registration.js +139 -2
  57. package/dist/core/memory/consolidation-context.js +49 -16
  58. package/dist/core/memory/consolidation-ops-records.js +35 -0
  59. package/dist/core/memory/consolidation-queue-format.js +21 -0
  60. package/dist/core/memory/consolidation.js +174 -180
  61. package/dist/core/message/aun-ipc-sender.js +161 -6
  62. package/dist/core/message/im-renderer.js +149 -6
  63. package/dist/core/message/message-bridge.js +13 -3
  64. package/dist/core/message/message-log.js +1 -0
  65. package/dist/core/message/peer-mode.js +6 -1
  66. package/dist/core/message/response-engine.js +349 -67
  67. package/dist/core/message/subtask-tool-projection.js +140 -0
  68. package/dist/core/model/catalog-service.js +17 -12
  69. package/dist/core/permission/ec-command-parser.js +126 -7
  70. package/dist/core/session/session-idle-monitor.js +249 -22
  71. package/dist/core/session/session-manager.js +54 -9
  72. package/dist/core/skill/command-parser.js +13 -0
  73. package/dist/core/skill/index-generator.js +4 -1
  74. package/dist/core/skill/startup.js +41 -0
  75. package/dist/core/skill/switch-resolver.js +55 -29
  76. package/dist/core/thread/command-parser.js +125 -0
  77. package/dist/core/thread/index.js +1 -0
  78. package/dist/core/thread/ipc-operation.js +95 -0
  79. package/dist/core/thread/thread-context-storage.js +131 -0
  80. package/dist/core/thread/thread-operation.js +258 -0
  81. package/dist/core/thread/thread-route.js +33 -0
  82. package/dist/core/thread/thread-service.js +777 -0
  83. package/dist/core/thread/types.js +1 -0
  84. package/dist/eck/message-renderer.js +35 -0
  85. package/dist/index.js +8 -5
  86. package/dist/ipc.js +89 -10
  87. package/dist/paths.js +23 -0
  88. package/dist/response-system/engines/v1/proactive-flow.js +169 -80
  89. package/dist/trigger/authorization.js +57 -28
  90. package/dist/trigger/feedback.js +7 -1
  91. package/dist/trigger/parser.js +63 -1
  92. package/dist/trigger/validation.js +14 -0
  93. package/dist/utils/error-utils.js +22 -1
  94. package/kits/docs/context-assembly.md +1 -0
  95. package/kits/docs/evolcore/INDEX.md +1 -0
  96. package/kits/docs/evolcore/agent-create.md +39 -28
  97. package/kits/docs/evolcore/agent.md +19 -4
  98. package/kits/docs/evolcore/ec-capabilities.md +4 -0
  99. package/kits/docs/evolcore/group-collaboration.md +3 -5
  100. package/kits/docs/evolcore/group.md +3 -4
  101. package/kits/docs/evolcore/memory-consolidation.md +1 -1
  102. package/kits/docs/evolcore/menu-exec-schema-commands.md +2 -2
  103. package/kits/docs/evolcore/menu-protocol.md +7 -0
  104. package/kits/docs/evolcore/msg.md +5 -8
  105. package/kits/docs/evolcore/thread-chain.md +267 -0
  106. package/kits/docs/prompt-loading-architecture.md +1 -0
  107. package/kits/eck_manifest.json +61 -26
  108. package/kits/eck_message_manifest.json +169 -10
  109. package/kits/rules/05-venue.md +1 -1
  110. package/kits/rules/07-memory-and-thread.md +202 -0
  111. package/kits/schemas/relation-config.schema.9.json +18 -3
  112. package/kits/schemas/role-config.schema.1.json +6 -6
  113. package/kits/schemas/single-session.schema.1.json +6 -6
  114. package/kits/schemas/single-session.schema.2.json +6 -6
  115. package/kits/schemas/single-session.schema.3.json +6 -6
  116. package/kits/skills/.switches.json +12 -1
  117. package/kits/skills/ec-group/SKILL.md +234 -0
  118. package/kits/skills/ec-skill/SKILL.md +10 -1
  119. package/kits/skills/ec-skill/scripts/cli.mjs +15 -1
  120. package/kits/skills/scrapling-article-fetch/SKILL.md +128 -0
  121. package/kits/skills/scrapling-article-fetch/scripts/check_python_env.py +54 -0
  122. package/kits/skills/scrapling-article-fetch/scripts/render_markdown_reply.py +35 -0
  123. package/kits/skills/scrapling-article-fetch/scripts/run_pipeline.sh +16 -0
  124. package/kits/skills/scrapling-article-fetch/scripts/scrapling_fetch.py +344 -0
  125. package/kits/skills/thread-ops/SKILL.md +492 -0
  126. package/kits/skills/wechat-article-media-download/SKILL.md +65 -0
  127. package/kits/skills/wechat-article-media-download/scripts/download.py +163 -0
  128. package/kits/skills/wechat-article-reader/SKILL.md +97 -0
  129. package/kits/skills/wechat-article-reader/scripts/fetch.mjs +256 -0
  130. package/kits/templates/bootstrap-welcome.md +7 -7
  131. package/kits/templates/memory-consolidation/forget.md +5 -0
  132. package/kits/templates/memory-consolidation/generalize.md +5 -0
  133. package/kits/templates/memory-consolidation/profile.md +5 -0
  134. package/kits/templates/memory-consolidation/promote.md +5 -0
  135. package/kits/templates/message-fragments/item.md +2 -1
  136. package/kits/templates/message-fragments/thread-context.md +6 -0
  137. package/kits/templates/message-fragments/trigger-session.md +2 -0
  138. package/kits/templates/message-fragments/trigger-thread-check.md +2 -0
  139. package/kits/templates/roles/member.json +2 -0
  140. package/kits/templates/roles/visitor.json +2 -0
  141. package/kits/templates/system-fragments/bootstrap.md +66 -72
  142. package/kits/templates/system-fragments/channel.md +3 -6
  143. package/kits/templates/system-fragments/commands.md +1 -0
  144. package/kits/templates/system-fragments/managed-runtime.md +15 -0
  145. package/kits/templates/system-fragments/reply.md +3 -2
  146. package/kits/templates/system-fragments/session.md +5 -14
  147. package/package.json +3 -1
  148. package/kits/docs/evolcore/group-fs.md +0 -17
  149. package/kits/docs/venues/aun-group.md +0 -45
  150. package/kits/docs/venues/group.md +0 -43
@@ -1,14 +1,17 @@
1
+ import crypto from 'crypto';
1
2
  import { authorizeDelegatedAunMsgSend, } from '../auth/agent-delegation.js';
2
- import { tryParseChannelKey } from '../channel-loader.js';
3
+ import { formatChannelKey, tryParseChannelKey } from '../channel-loader.js';
3
4
  import { AUN_HANDOFF_MARKER_FIELD } from '../../channels/aun.js';
4
5
  import { classifyAunPayloadForLog } from './message-log.js';
5
6
  import { isValidAunDeliveryForChannel } from './outbound.js';
6
7
  import { isHClassPath } from '../permission/protected-paths.js';
7
8
  import { evaluateOutboundContactAdmission } from './message-admission.js';
8
9
  import { normalizeAunMentionEntries, withAunAttention } from '../../aun/msg/mention-schema.js';
9
- import { resolveManagedSendArgv } from '../../cli/aun-commands.js';
10
+ import { buildThreadCheckTrigger, resolveManagedSendArgv } from '../../cli/aun-commands.js';
10
11
  import { readTriggerLocalFile, resolveTriggerLocalPath } from '../../trigger/local-files.js';
11
12
  import { sameGroupAid } from '../../aun/group/identity.js';
13
+ import { resolveThreadRouteTarget } from '../thread/thread-route.js';
14
+ import { ThreadService } from '../thread/thread-service.js';
12
15
  export function createAunHandoffSender(sessionManager, channelInstances) {
13
16
  return async (handoff) => {
14
17
  const targetSession = await sessionManager.getSessionById(handoff.target_session_id);
@@ -58,7 +61,92 @@ export function createAunHandoffSender(sessionManager, channelInstances) {
58
61
  return { ok: result.ok, message_id: result.message_id, error: result.error };
59
62
  };
60
63
  }
61
- export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegationRegistry, responseEngine, handoffRuntime, }) {
64
+ async function applyManagedCrossThreadSendEffects(input) {
65
+ const originSessionId = input.runtime?.sessionId;
66
+ if (!originSessionId)
67
+ return undefined;
68
+ const originThreadId = input.runtime?.threadId || 'main';
69
+ const originPeer = input.runtime?.channelId || input.targetChannelId;
70
+ const originChatType = input.runtime?.chatType === 'group' ? 'group' : 'private';
71
+ const originChannelKey = input.runtime?.channelKey;
72
+ const originChannelId = input.runtime?.channelId;
73
+ const originPeerId = input.runtime?.peerId || (originChatType === 'private' ? originChannelId : undefined);
74
+ const origin = originChannelKey && originChannelId && originPeerId
75
+ ? {
76
+ channelKey: originChannelKey,
77
+ channelType: input.runtime?.channel || 'aun',
78
+ channelId: originChannelId,
79
+ session: input.runtime?.threadId ? 'thread' : 'main',
80
+ ...(input.runtime?.threadId ? { threadId: input.runtime.threadId } : {}),
81
+ peerId: originPeerId,
82
+ delivery: originChatType === 'group'
83
+ ? { chatType: 'group', groupId: originChannelId }
84
+ : { chatType: 'private' },
85
+ }
86
+ : undefined;
87
+ const triggerSeed = `${Date.now()}_${crypto.randomBytes(4).toString('hex')}`;
88
+ const triggerId = `trig_${triggerSeed}`;
89
+ const triggerName = `check-${input.targetThreadId}-from-${originThreadId}-${triggerSeed.split('_')[1]}`;
90
+ const prompt = [
91
+ `【Trigger 复查】话题 ${input.targetThreadId}(对端 ${input.targetChannelId})`,
92
+ `这是周期复查:每 ${input.checkEveryLabel} 唤醒一次,直到你显式结束它。`,
93
+ '',
94
+ input.triggerPromptExtra
95
+ || `请检查该话题的最新进度,根据情况:继续等待、调整周期(ec trigger update ${triggerId} --every <时长>)或结束复查(ec trigger cancel ${triggerId})。`,
96
+ '',
97
+ '参考命令:',
98
+ ` ec thread history ${input.targetChannelId}/${input.targetThreadId} --limit 10`,
99
+ ` ec thread history ${originPeer}/${originThreadId} --after ${Date.now()}`,
100
+ ` ec trigger cancel ${triggerId}`,
101
+ ` ec trigger update ${triggerId} --every <时长>`,
102
+ `Trigger id:${triggerId}`,
103
+ `Trigger 名称:${triggerName}`,
104
+ ].join('\n');
105
+ let createdTriggerId;
106
+ try {
107
+ if (!origin)
108
+ throw new Error('managed task runtime context is missing a trusted Trigger origin');
109
+ const scheduler = input.triggerSchedulers.get(input.selfAid);
110
+ if (!scheduler)
111
+ throw new Error(`trigger scheduler not found for agent: ${input.selfAid}`);
112
+ const definition = buildThreadCheckTrigger({
113
+ agentAid: input.selfAid,
114
+ id: triggerId,
115
+ name: triggerName,
116
+ prompt,
117
+ everyMs: input.durationMs,
118
+ checkEvery: input.checkEveryLabel,
119
+ channelKey: formatChannelKey({ type: 'aun', selfAID: input.selfAid, name: 'main' }),
120
+ targetChannelId: input.targetChannelId,
121
+ targetThreadId: input.targetThreadId,
122
+ originThreadId,
123
+ originPeer,
124
+ origin,
125
+ feedbackChatType: input.feedbackChatType,
126
+ });
127
+ createdTriggerId = scheduler.create(definition, [], { enable: true }).id;
128
+ }
129
+ catch (error) {
130
+ console.warn(`⚠ Trigger 创建失败: ${error instanceof Error ? error.message : String(error)}(inbox 仍会写入)`);
131
+ }
132
+ try {
133
+ ThreadService.appendInbox(input.selfAid, {
134
+ messageId: input.messageId,
135
+ content: input.contentSummary,
136
+ timestamp: input.timestamp,
137
+ originThreadId,
138
+ originPeer,
139
+ originSessionId,
140
+ targetSessionId: input.targetSessionId,
141
+ ...(createdTriggerId ? { triggerId: createdTriggerId } : {}),
142
+ });
143
+ }
144
+ catch (error) {
145
+ console.warn(`⚠ 话题 inbox 写入失败: ${error instanceof Error ? error.message : String(error)}`);
146
+ }
147
+ return createdTriggerId;
148
+ }
149
+ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegationRegistry, responseEngine, handoffRuntime, triggerSchedulers, }) {
62
150
  const sender = async (params) => {
63
151
  let textFile;
64
152
  try {
@@ -76,6 +164,12 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
76
164
  }
77
165
  const runtime = params.originSessionId ? responseEngine.getTaskRuntimeContext(params.originSessionId) : undefined;
78
166
  const runtimeCausation = runtime?.causation;
167
+ const threadRoute = params.thread
168
+ ? resolveThreadRouteTarget(params.aid, params.thread, params.scope, params.to)
169
+ : undefined;
170
+ if (params.thread && !threadRoute) {
171
+ return { ok: false, code: 'TOPIC_NOT_FOUND', error: `话题不存在或不属于目标对端: ${params.thread}` };
172
+ }
79
173
  if (params.argv !== undefined && !params.delegationCommandHash) {
80
174
  return { ok: false, code: 'INVALID_DELEGATION', error: 'Managed AUN sends require an approved command hash' };
81
175
  }
@@ -88,6 +182,7 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
88
182
  to: params.to,
89
183
  scope: params.scope,
90
184
  action: params.file ? 'file' : 'send',
185
+ threadRouted: !!threadRoute,
91
186
  });
92
187
  if (!delegation.ok) {
93
188
  return { ok: false, error: delegation.reason, code: delegation.code };
@@ -219,13 +314,33 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
219
314
  });
220
315
  targetSessionId = created.targetSession.id;
221
316
  if (created.crossSession && created.handoff) {
222
- return {
317
+ const response = {
223
318
  ok: true,
224
319
  status: created.handoff.state === 'target_sent' ? 'delivered' : 'queued',
225
320
  message_id: created.handoff.target_message_id ?? undefined,
226
321
  handoff_id: created.handoff.handoff_id,
227
322
  target_session_id: created.targetSession.id,
228
323
  };
324
+ if (params.thread && params.checkEveryMs !== undefined && response.message_id && threadRoute) {
325
+ const triggerId = await applyManagedCrossThreadSendEffects({
326
+ triggerSchedulers,
327
+ runtime,
328
+ selfAid: params.aid,
329
+ targetThreadId: params.thread,
330
+ targetSessionId: threadRoute.sessionId,
331
+ targetChannelId: params.to,
332
+ feedbackChatType: params.scope === 'group' ? 'group' : 'private',
333
+ messageId: response.message_id,
334
+ contentSummary: params.log?.content ?? classifyAunPayloadForLog(payload).content,
335
+ timestamp: response.timestamp ?? Date.now(),
336
+ durationMs: params.checkEveryMs,
337
+ checkEveryLabel: params.checkEvery ?? '5m',
338
+ triggerPromptExtra: params.triggerPromptExtra,
339
+ });
340
+ if (triggerId)
341
+ response.trigger_id = triggerId;
342
+ }
343
+ return response;
229
344
  }
230
345
  if (params.scope === 'msg' && !payload.ref_message_id) {
231
346
  payload.ref_message_id = params.originMessageId;
@@ -247,24 +362,64 @@ export function registerAunIpcSender({ ipcServer, channelInstances, agentDelegat
247
362
  if (typeof ch.sendDaemonGroupMsg !== 'function') {
248
363
  return { ok: false, error: 'AUN channel does not support daemon group sends', code: 'AUN_GROUP_UNSUPPORTED' };
249
364
  }
250
- return await ch.sendDaemonGroupMsg({
365
+ const sent = await ch.sendDaemonGroupMsg({
251
366
  groupId: params.to,
252
367
  payload,
253
368
  mentions: params.mentions,
254
369
  encrypt,
255
370
  log: params.log ? { ...params.log, sessionId: targetSessionId ?? params.log.sessionId } : undefined,
256
371
  });
372
+ if (params.thread && params.checkEveryMs !== undefined && sent.ok && sent.message_id && threadRoute) {
373
+ const triggerId = await applyManagedCrossThreadSendEffects({
374
+ triggerSchedulers,
375
+ runtime,
376
+ selfAid: params.aid,
377
+ targetThreadId: params.thread,
378
+ targetSessionId: threadRoute.sessionId,
379
+ targetChannelId: params.to,
380
+ feedbackChatType: 'group',
381
+ messageId: sent.message_id,
382
+ contentSummary: params.log?.content ?? classifyAunPayloadForLog(payload).content,
383
+ timestamp: sent.timestamp ?? Date.now(),
384
+ durationMs: params.checkEveryMs,
385
+ checkEveryLabel: params.checkEvery ?? '5m',
386
+ triggerPromptExtra: params.triggerPromptExtra,
387
+ });
388
+ if (triggerId)
389
+ sent.trigger_id = triggerId;
390
+ }
391
+ return sent;
257
392
  }
258
393
  if (typeof ch.sendDaemonMsg !== 'function') {
259
394
  return { ok: false, error: 'AUN channel does not support daemon private sends', code: 'AUN_MSG_UNSUPPORTED' };
260
395
  }
261
- return await ch.sendDaemonMsg({
396
+ const sent = await ch.sendDaemonMsg({
262
397
  to: params.to,
263
398
  payload,
264
399
  encrypt,
265
400
  causation: runtimeCausation,
266
401
  log: params.log ? { ...params.log, sessionId: targetSessionId ?? params.log.sessionId } : undefined,
267
402
  });
403
+ if (params.thread && params.checkEveryMs !== undefined && sent.ok && sent.message_id && threadRoute) {
404
+ const triggerId = await applyManagedCrossThreadSendEffects({
405
+ triggerSchedulers,
406
+ runtime,
407
+ selfAid: params.aid,
408
+ targetThreadId: params.thread,
409
+ targetSessionId: threadRoute.sessionId,
410
+ targetChannelId: params.to,
411
+ feedbackChatType: 'private',
412
+ messageId: sent.message_id,
413
+ contentSummary: params.log?.content ?? classifyAunPayloadForLog(payload).content,
414
+ timestamp: sent.timestamp ?? Date.now(),
415
+ durationMs: params.checkEveryMs,
416
+ checkEveryLabel: params.checkEvery ?? '5m',
417
+ triggerPromptExtra: params.triggerPromptExtra,
418
+ });
419
+ if (triggerId)
420
+ sent.trigger_id = triggerId;
421
+ }
422
+ return sent;
268
423
  };
269
424
  ipcServer.setAunMsgSender(sender);
270
425
  }
@@ -4,6 +4,7 @@ import { getErrorMessage, isContextTooLongText } from '../../utils/error-utils.j
4
4
  import { tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
5
5
  import { DEFAULT_FLUSH_DELAY_MS } from '../../types.js';
6
6
  import { classifyAunToolErrorCode, normalizeToolErrorClassification } from '../permission/tool-error-code.js';
7
+ import { foldSubtaskTerminal } from './subtask-tool-projection.js';
7
8
  export class IMRenderer {
8
9
  opts;
9
10
  itemsQueue = [];
@@ -22,6 +23,16 @@ export class IMRenderer {
22
23
  syntheticCallSeq = 0;
23
24
  currentAssistantUuid;
24
25
  currentTextPhase;
26
+ /** 无来源工具时合成的子任务卡片;与 lifecycle 边界一样,不算抑制兜底错误的正文/过程内容。 */
27
+ subtaskItems = new WeakSet();
28
+ /** 本轮已投影的工具调用 call_id → 工具名;子任务只归拢到本轮可见的来源工具卡片。 */
29
+ toolCallNames = new Map();
30
+ /**
31
+ * 归拢到来源工具的子任务:call_id → 状态。
32
+ * running 期间到达的 tool_result(后台占位结果)先扣住,等终态合并后再发;
33
+ * 终态先到(前台)时记下终态,等真实 tool_result 到达时合并。
34
+ */
35
+ parentSubtasks = new Map();
25
36
  constructor(opts) {
26
37
  this.opts = opts;
27
38
  }
@@ -66,7 +77,8 @@ export class IMRenderer {
66
77
  /** 强制刷新所有 pending 事件 */
67
78
  async flush(isFinal, attention) {
68
79
  if (this.opts.envelope.chatmode === 'proactive') {
69
- // proactive 是 fire-and-forget,无 pending buffer
80
+ // proactive 是 fire-and-forget,无 pending buffer;只需放出仍被扣住的工具结果
81
+ this.releaseHeldToolResults();
70
82
  return;
71
83
  }
72
84
  return this.flushInternal(isFinal, attention);
@@ -79,16 +91,24 @@ export class IMRenderer {
79
91
  }
80
92
  /** 是否有 pending 内容 */
81
93
  hasContent() {
82
- return this.textBuffer.length > 0 || this.itemsQueue.some(it => it.kind !== 'text');
94
+ return this.textBuffer.length > 0 || this.itemsQueue.some(it => it.kind !== 'text') || this.hasHeldToolResults();
83
95
  }
84
96
  /** 是否有会抑制兜底错误消息的正文/过程内容;lifecycle 边界不算。 */
85
97
  hasNonLifecycleContent() {
86
- return this.textBuffer.trim().length > 0 || this.itemsQueue.some(it => {
98
+ return this.textBuffer.trim().length > 0 || this.hasHeldToolResults() || this.itemsQueue.some(it => {
87
99
  if (it.kind === 'text')
88
100
  return it.text.trim().length > 0;
101
+ if (this.subtaskItems.has(it))
102
+ return false;
89
103
  return it.kind !== 'started' && it.kind !== 'completed';
90
104
  });
91
105
  }
106
+ hasHeldToolResults() {
107
+ for (const state of this.parentSubtasks.values())
108
+ if (state.held)
109
+ return true;
110
+ return false;
111
+ }
92
112
  /** 是否有待发送的文本 */
93
113
  hasTextPending() {
94
114
  return this.textBuffer.length > 0;
@@ -234,6 +254,7 @@ export class IMRenderer {
234
254
  ...(evolCommand ? { evolCommand } : {}),
235
255
  ...(assistantUuid ? { forkAnchor: { assistantMessageId: assistantUuid } } : {}),
236
256
  };
257
+ this.toolCallNames.set(item.call_id, name);
237
258
  this.recordActivity(item);
238
259
  if (this.suppressActivityItems())
239
260
  return;
@@ -245,7 +266,6 @@ export class IMRenderer {
245
266
  addToolResult(name, ok, result, error, callId, durationMs, descText, classification, assistantUuid) {
246
267
  if (this.opts.envelope.chatmode === 'proactive')
247
268
  return;
248
- this.emitProgress('tool_result', undefined, undefined, { toolName: name, callId, ok, durationMs });
249
269
  const normalizedClassification = !ok
250
270
  ? normalizeToolErrorClassification(classification ?? {})
251
271
  : undefined;
@@ -269,6 +289,22 @@ export class IMRenderer {
269
289
  ...(descText !== undefined && { text: descText }),
270
290
  ...(assistantUuid ? { forkAnchor: { assistantMessageId: assistantUuid } } : {}),
271
291
  };
292
+ const resolved = this.resolveParentToolResult(item);
293
+ if (!resolved)
294
+ return;
295
+ this.deliverToolResult(resolved);
296
+ }
297
+ /** 投递一条工具结果(interactive 入队 / proactive 直发),并记录任务活动。 */
298
+ deliverToolResult(item) {
299
+ if (item.kind !== 'tool_result')
300
+ return;
301
+ if (this.opts.envelope.chatmode === 'proactive') {
302
+ this.emitProactiveItem(item);
303
+ return;
304
+ }
305
+ this.emitProgress('tool_result', undefined, undefined, {
306
+ toolName: item.name, callId: item.call_id, ok: item.ok, durationMs: item.duration_ms,
307
+ });
272
308
  this.recordActivity(item);
273
309
  if (this.suppressActivityItems())
274
310
  return;
@@ -276,6 +312,73 @@ export class IMRenderer {
276
312
  this.messageTimestamps.push(Date.now());
277
313
  this.scheduleFlush();
278
314
  }
315
+ /**
316
+ * 工具结果与归拢子任务的会合点。
317
+ * - 无归拢子任务:原样放行
318
+ * - 子任务已终态(前台:通知先于真实结果到达):合并终态后放行
319
+ * - 子任务仍在跑(后台:先到的是占位结果):扣住,返回 null,等 endParentSubtask 合并后发出
320
+ */
321
+ resolveParentToolResult(item) {
322
+ if (item.kind !== 'tool_result')
323
+ return item;
324
+ const state = this.parentSubtasks.get(item.call_id);
325
+ if (!state)
326
+ return item;
327
+ if (state.terminal) {
328
+ this.parentSubtasks.delete(item.call_id);
329
+ return foldSubtaskTerminal(item, state.terminal);
330
+ }
331
+ state.held = item;
332
+ return null;
333
+ }
334
+ /**
335
+ * 子任务开始:若来源工具卡片在本轮可见,登记归拢,不另出卡片。
336
+ * 返回 false 表示无法归拢(无来源工具或卡片不在本轮),调用方应改发独立卡片。
337
+ */
338
+ beginParentSubtask(toolUseId) {
339
+ if (!toolUseId || !this.toolCallNames.has(toolUseId))
340
+ return false;
341
+ if (!this.parentSubtasks.has(toolUseId))
342
+ this.parentSubtasks.set(toolUseId, {});
343
+ return true;
344
+ }
345
+ /**
346
+ * 子任务终态:合并进来源工具的 tool_result。
347
+ * - 已扣住占位结果(后台):合并后立即发出
348
+ * - 结果尚未到达(前台):记下终态,等结果到达时合并
349
+ * 返回 false 表示本轮没有登记该归拢(卡片已提前释放或不在本轮),调用方应补发一条同 call_id 的终态结果。
350
+ */
351
+ endParentSubtask(toolUseId, terminal) {
352
+ if (!toolUseId)
353
+ return false;
354
+ const state = this.parentSubtasks.get(toolUseId);
355
+ if (!state)
356
+ return false;
357
+ if (state.held) {
358
+ this.parentSubtasks.delete(toolUseId);
359
+ this.deliverToolResult(foldSubtaskTerminal(state.held, terminal));
360
+ }
361
+ else {
362
+ state.terminal = terminal;
363
+ }
364
+ return true;
365
+ }
366
+ /** 来源工具的名称(本轮可见时);补发终态结果时用来对齐卡片名。 */
367
+ toolNameForCall(callId) {
368
+ return callId ? this.toolCallNames.get(callId) : undefined;
369
+ }
370
+ /**
371
+ * 放出仍被扣住的工具结果(不带子任务终态,原样发出)。
372
+ * 轮次结束或出错收尾时调用,避免来源工具卡片停在"执行中"。
373
+ */
374
+ releaseHeldToolResults() {
375
+ for (const [callId, state] of this.parentSubtasks) {
376
+ if (!state.held)
377
+ continue;
378
+ this.parentSubtasks.delete(callId);
379
+ this.deliverToolResult(state.held);
380
+ }
381
+ }
279
382
  /** 添加进度提示 */
280
383
  addProgress(text, opts = {}) {
281
384
  if (this.opts.envelope.chatmode === 'proactive')
@@ -348,6 +451,26 @@ export class IMRenderer {
348
451
  this.messageTimestamps.push(Date.now());
349
452
  this.scheduleFlush();
350
453
  }
454
+ /**
455
+ * 添加子任务活动(由 subtask-tool-projection 构造的 tool_call / tool_result)。
456
+ *
457
+ * 与 addToolCall/addToolResult 不同:不发 status.progress(子任务不是本轮模型正在发起的工具调用),
458
+ * 且 proactive 下照常投影为 thought(mapEventToItem 不处理 task_* 事件,不会重复)。
459
+ * 活动记录与 addToolCall 一致,在抑制前写入,保证任务活动 Menu 历史完整。
460
+ */
461
+ addSubtaskActivity(item) {
462
+ this.subtaskItems.add(item);
463
+ if (this.opts.envelope.chatmode === 'proactive') {
464
+ this.emitProactiveItem(item);
465
+ return;
466
+ }
467
+ this.recordActivity(item);
468
+ if (this.suppressActivityItems())
469
+ return;
470
+ this.itemsQueue.push(item);
471
+ this.messageTimestamps.push(Date.now());
472
+ this.scheduleFlush();
473
+ }
351
474
  /**
352
475
  * proactive 下放行为 thought 的 notice subtype 白名单——仅"真·终态错误":
353
476
  * - context-too-long:上下文超限且无法 auto-compact,任务到此终止
@@ -553,6 +676,16 @@ export class IMRenderer {
553
676
  clearTimeout(this.timer);
554
677
  this.timer = undefined;
555
678
  }
679
+ // 显式 flush(轮次结束、出错收尾)时放出被扣住的后台占位结果;定时 flush 不放,
680
+ // 否则长时间后台任务会在终态到达前就把占位结果发出去。放出的结果随本次 flush 一起发,
681
+ // 不需要它重新挂上的定时器。
682
+ if (!scheduled) {
683
+ this.releaseHeldToolResults();
684
+ if (this.timer) {
685
+ clearTimeout(this.timer);
686
+ this.timer = undefined;
687
+ }
688
+ }
556
689
  // 文件标记过滤:marker 任何时候都不该出现在用户文本里,必须在 *每次* flush
557
690
  // (含非最终的定时 flush)执行。否则文本块若滞留 buffer 后被定时器触发,会走
558
691
  // 下方非-final 的 result.text 路径,把 [SEND_FILE:...] 原样发给用户。
@@ -717,6 +850,16 @@ export class IMRenderer {
717
850
  if (item.kind === 'progress') {
718
851
  return;
719
852
  }
853
+ if (item.kind === 'tool_call') {
854
+ this.toolCallNames.set(item.call_id, item.name);
855
+ }
856
+ else if (item.kind === 'tool_result') {
857
+ const resolved = this.resolveParentToolResult(item);
858
+ if (!resolved)
859
+ return;
860
+ this.emitProactiveItem(resolved);
861
+ return;
862
+ }
720
863
  this.emitProactiveItem(item);
721
864
  }
722
865
  /** proactive 模式逐条投影:单个 ThoughtItem 包成 activity.batch[1] 发出(fire-and-forget)。 */
@@ -814,7 +957,7 @@ export class IMRenderer {
814
957
  // 上下文过长错误不输出(留给外层 auto-compact 处理)
815
958
  if (isContextTooLongText(event.error || ''))
816
959
  return null;
817
- const text = getErrorMessage(new Error(event.error || '任务执行失败'), undefined, false);
960
+ const text = getErrorMessage(new Error(event.error), undefined, false);
818
961
  return { kind: 'notice', text: tagErrorTextWithEvolcoreVersion(text), severity: 'warn' };
819
962
  }
820
963
  case 'complete': {
@@ -828,7 +971,7 @@ export class IMRenderer {
828
971
  return null;
829
972
  }
830
973
  if (event.isError) {
831
- const errText = event.errors?.join('; ') || event.result || '任务失败';
974
+ const errText = event.errors?.join('; ') || event.result || '';
832
975
  const text = getErrorMessage(new Error(errText), event.terminalReason, false);
833
976
  const item = {
834
977
  kind: 'summary',
@@ -1895,9 +1895,19 @@ export class MessageBridge {
1895
1895
  case 'menu.list':
1896
1896
  if (args?.view === 'catalog') {
1897
1897
  validateMenuCatalogArgs(args);
1898
- const data = await this.cmdHandler.getMenuCatalog(channel, msg.channelId, authSubject, args.context, msg.isControlChannel ? 'control' : 'agent', !msg.isControlChannel || (msg.encrypted === true
1899
- && msg.protectedHeaders?.auth_method !== 'remote-access-token'
1900
- && msg.protectedHeaders?.auth_method !== 'ecweb-token'));
1898
+ const catalogArgs = [
1899
+ channel,
1900
+ msg.channelId,
1901
+ authSubject,
1902
+ args.context,
1903
+ msg.isControlChannel ? 'control' : 'agent',
1904
+ !msg.isControlChannel || (msg.encrypted === true
1905
+ && msg.protectedHeaders?.auth_method !== 'remote-access-token'
1906
+ && msg.protectedHeaders?.auth_method !== 'ecweb-token'),
1907
+ ];
1908
+ const data = msg.threadId
1909
+ ? await this.cmdHandler.getMenuCatalog(...catalogArgs, transportReplyContext)
1910
+ : await this.cmdHandler.getMenuCatalog(...catalogArgs);
1901
1911
  return menuSuccess(header, data);
1902
1912
  }
1903
1913
  if (args?.view !== undefined) {
@@ -20,6 +20,7 @@ const TRANSIENT_PROTOCOL_TYPES = new Set([
20
20
  'thought',
21
21
  'handoff_state',
22
22
  'handoff_result',
23
+ 'topic-created', // 话题创建系统消息,不进大模型上下文
23
24
  ]);
24
25
  const KNOWN_AUN_PAYLOAD_TYPES = new Set([
25
26
  'text',
@@ -14,8 +14,11 @@ export function resolveChatMode(params) {
14
14
  configured = undefined;
15
15
  }
16
16
  const kind = normalizePeerType(params.peerType);
17
+ // 运行时硬约束(非配置项):system/service 始终 interactive;agent 始终 proactive
17
18
  if (kind === 'system' || kind === 'service')
18
19
  return 'interactive';
20
+ if (kind === 'agent')
21
+ return 'proactive';
19
22
  const field = chatmodeFieldForPeer(params.chatType, params.peerType);
20
23
  const decision = resolveRuntimeStringField({
21
24
  selfAid: params.self,
@@ -70,9 +73,11 @@ export function isSystemOrServicePeer(peerType) {
70
73
  */
71
74
  export function resolveChatModeForPeer(params) {
72
75
  const kind = normalizePeerType(params.peerType);
73
- // 运行时硬约束(非配置项):system/service 对端始终同步交互
76
+ // 运行时硬约束(非配置项):system/service 对端始终同步交互;agent 对端始终主动响应
74
77
  if (kind === 'system' || kind === 'service')
75
78
  return 'interactive';
79
+ if (kind === 'agent')
80
+ return 'proactive';
76
81
  // 合并后的场景表 → 出厂默认表
77
82
  const field = chatmodeFieldForPeer(params.chatType, params.peerType);
78
83
  return params.configured?.[field] ?? chatmodeFactoryDefaults()[field];