evolcore 0.0.43-test.5 → 0.0.43-test.6

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 (116) hide show
  1. package/CHANGELOG.md +47 -0
  2. package/bin/ecmsg.js +126 -43
  3. package/dist/agents/baseagent-availability.js +19 -4
  4. package/dist/agents/baseagent.js +2 -2
  5. package/dist/agents/claude-runner.js +19 -4
  6. package/dist/agents/codex/app-server-client.js +14 -3
  7. package/dist/agents/codex-runner.js +6 -6
  8. package/dist/aun/group/invite-service.js +3 -2
  9. package/dist/aun/service-proxy.js +18 -6
  10. package/dist/channels/aun.js +73 -10
  11. package/dist/cli/agent-create.js +16 -6
  12. package/dist/cli/aun-commands.js +9 -1
  13. package/dist/cli/daemon-commands.js +30 -1
  14. package/dist/cli/ecmsg-gateway.js +3 -1
  15. package/dist/cli/init.js +75 -0
  16. package/dist/cli/provider-command.js +1 -1
  17. package/dist/cli/restart-monitor.js +24 -5
  18. package/dist/cli/task-context.js +38 -1
  19. package/dist/cli/watch-logs.js +6 -4
  20. package/dist/config/boot-log.js +6 -4
  21. package/dist/config/builtin-roles.js +2 -2
  22. package/dist/config/config-manager.js +1 -1
  23. package/dist/config/peer-role-resolver.js +1 -1
  24. package/dist/config/provider-identity-migration.js +92 -17
  25. package/dist/config/provider-local-sync.js +2 -0
  26. package/dist/config/providers-config.js +13 -0
  27. package/dist/config/providers-management.js +100 -10
  28. package/dist/config/role-service.js +8 -8
  29. package/dist/config/role-store.js +22 -22
  30. package/dist/config/schema-migration.js +80 -87
  31. package/dist/config/snapshot.js +70 -41
  32. package/dist/core/agent-runtime.js +44 -7
  33. package/dist/core/baseagent-loader.js +114 -11
  34. package/dist/core/channel-loader.js +36 -13
  35. package/dist/core/channel-runtime.js +112 -42
  36. package/dist/core/command/command-handler.js +5 -5
  37. package/dist/core/command/menu-handler.js +8 -3
  38. package/dist/core/command/menu-protocol.js +82 -11
  39. package/dist/core/command/role-menu.js +27 -15
  40. package/dist/core/daemon-control.js +42 -15
  41. package/dist/core/daemon-lifecycle.js +411 -67
  42. package/dist/core/handoff/dispatcher.js +9 -3
  43. package/dist/core/handoff/runtime.js +130 -42
  44. package/dist/core/handoff/store.js +190 -2
  45. package/dist/core/handoff/types.js +5 -0
  46. package/dist/core/initialization/service.js +4 -4
  47. package/dist/core/ipc-registration.js +5 -4
  48. package/dist/core/lifecycle-notice.js +10 -4
  49. package/dist/core/message/aun-ipc-sender.js +2 -2
  50. package/dist/core/message/message-bridge.js +53 -4
  51. package/dist/core/message/message-queue.js +46 -4
  52. package/dist/core/message/pending-hints.js +4 -10
  53. package/dist/core/message/response-engine.js +10 -2
  54. package/dist/core/message/send-routing.js +12 -2
  55. package/dist/core/ownership/owner-resolver.js +1 -0
  56. package/dist/core/permission/ec-command-parser.js +11 -1
  57. package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
  58. package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
  59. package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
  60. package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
  61. package/dist/core/session/session-fs-store.js +164 -3
  62. package/dist/core/session/session-idle-monitor.js +9 -1
  63. package/dist/core/session/session-manager.js +36 -2
  64. package/dist/directory/owner-directory-admission.js +26 -1
  65. package/dist/directory/owner-directory-cache.js +57 -16
  66. package/dist/directory/owner-directory-query-operation.js +4 -1
  67. package/dist/ecweb/runtime/lifecycle.js +9 -7
  68. package/dist/ecweb/runtime/supervisor.js +44 -27
  69. package/dist/index.js +548 -251
  70. package/dist/proxy/manager.js +38 -17
  71. package/dist/proxy/service-supervisor.js +65 -31
  72. package/dist/trigger/application-service.js +3 -1
  73. package/dist/trigger/audit.js +19 -4
  74. package/dist/trigger/authorization.js +14 -5
  75. package/dist/trigger/history.js +176 -7
  76. package/dist/trigger/manager.js +1 -3
  77. package/dist/trigger/scheduler.js +78 -5
  78. package/dist/utils/cross-platform.js +152 -4
  79. package/dist/utils/host-info.js +11 -8
  80. package/dist/utils/npm-ops.js +48 -0
  81. package/dist/utils/process-introspect.js +64 -1
  82. package/dist/utils/startup-trace.js +160 -19
  83. package/kits/docs/aun/ABILITY_CALLING.md +3 -3
  84. package/kits/docs/evolcore/INDEX.md +3 -2
  85. package/kits/docs/evolcore/ctl.md +2 -1
  86. package/kits/docs/evolcore/group.md +2 -2
  87. package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
  88. package/kits/docs/evolcore/msg.md +13 -6
  89. package/kits/docs/evolcore/provider.md +21 -3
  90. package/kits/docs/evolcore/response.md +1 -1
  91. package/kits/eck_manifest.json +19 -7
  92. package/kits/eck_message_manifest.json +3 -3
  93. package/kits/rules/06-channel.md +5 -6
  94. package/kits/schemas/daemon.schema.1.json +5 -0
  95. package/kits/schemas/daemon.schema.2.json +5 -0
  96. package/kits/schemas/daemon.schema.3.json +2 -1
  97. package/kits/schemas/daemon.schema.4.json +2 -1
  98. package/kits/schemas/daemon.schema.5.json +2 -1
  99. package/kits/schemas/daemon.schema.6.json +1 -1
  100. package/kits/schemas/daemon.schema.7.json +1 -1
  101. package/kits/schemas/daemon.schema.8.json +2 -1
  102. package/kits/schemas/daemon.schema.9.json +2 -1
  103. package/kits/schemas/role-registry.schema.1.json +2 -2
  104. package/kits/schemas/single-session.schema.1.json +1 -1
  105. package/kits/schemas/single-session.schema.2.json +1 -1
  106. package/kits/schemas/single-session.schema.3.json +1 -1
  107. package/kits/skills/aid-ability/SKILL.md +7 -7
  108. package/kits/skills/ec-group/SKILL.md +8 -5
  109. package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
  110. package/kits/skills/ec-trigger/SKILL.md +4 -4
  111. package/kits/skills/thread-ops/SKILL.md +10 -10
  112. package/kits/templates/system-fragments/commands.md +5 -5
  113. package/kits/templates/system-fragments/reply.md +2 -1
  114. package/kits/templates/system-fragments/session.md +1 -1
  115. package/kits/templates/system-fragments/thread.md +1 -1
  116. package/package.json +4 -3
@@ -7,6 +7,7 @@ import path from 'path';
7
7
  import { agentStorageMenuService, isAgentStorageMenuRequest } from '../command/agent-storage-menu.js';
8
8
  import { agentMdMenuService } from '../command/agentmd-menu.js';
9
9
  import { containsAgentMdMenuRequest } from '../command/agentmd-menu-request.js';
10
+ import { currentContactBinding, sameContactBinding } from './contact-admission.js';
10
11
  import { logger, logPreview } from '../../utils/logger.js';
11
12
  import { StreamDebouncer } from './stream-debouncer.js';
12
13
  import { appendMessageLog, appendMessageLogStrict, buildInboundEntry, isTransientProtocolMessage } from './message-log.js';
@@ -29,7 +30,7 @@ import { AutoMentionGate } from './auto-mention-gate.js';
29
30
  import { syncGroupRulesContext } from '../../eck/group-rules-sync.js';
30
31
  import { readSoulContent } from '../soul.js';
31
32
  import { authorizeAccess, buildAuthSubject } from '../auth/auth-gateway.js';
32
- import { MenuDiagnosticLimiter, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, isAunMenuTokenRequired, menuCommandForName, normalizeMenuResponseTiming, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived, } from '../command/menu-protocol.js';
33
+ import { MenuDiagnosticLimiter, deliverMenuResponse, isRetryableMenuTransportError, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, isAunMenuTokenRequired, menuCommandForName, normalizeMenuResponseTiming, withMenuProcessingTime, beginMenuDeliveryTiming, logMenuRequestCompleted, logMenuRequestReceived, logMenuResponseRetry, } from '../command/menu-protocol.js';
33
34
  import { resolveExplicitMenuExecutionContext, validateMenuCatalogArgs, validateMenuValueBatchArgs } from '../command/menu-catalog.js';
34
35
  import { MenuTokenStore } from '../command/menu-token-store.js';
35
36
  import { SessionRenewService } from '../session/session-renew.js';
@@ -1785,7 +1786,11 @@ export class MessageBridge {
1785
1786
  }
1786
1787
  }
1787
1788
  catch (error) {
1788
- logger.error(`[MessageBridge] Error in onMessage handler for ${channelName}:`, error);
1789
+ if (isRetryableMenuTransportError(error)) {
1790
+ logger.warn(`[MessageBridge] Retryable response delivery unavailable for ${channelName}:`, error);
1791
+ }
1792
+ else
1793
+ logger.error(`[MessageBridge] Error in onMessage handler for ${channelName}:`, error);
1789
1794
  }
1790
1795
  finally {
1791
1796
  releaseAdmission?.();
@@ -2182,9 +2187,51 @@ export class MessageBridge {
2182
2187
  agentName,
2183
2188
  replyContext,
2184
2189
  });
2190
+ const selfAid = this.menuTokenOwnerAid(channel, msg);
2191
+ const binding = selfAid ? currentContactBinding(selfAid) : undefined;
2192
+ const currentSubject = () => buildAuthSubject({
2193
+ selfAid, actorId: msg.peerId, channel, channelType: msg.channelType || 'aun',
2194
+ channelId: msg.channelId, chatType: msg.chatType || 'private', conversationId: msg.channelId,
2195
+ peerType: msg.peerType,
2196
+ roleDetail: this.resolveInboundRole({ selfAid, channelKey: channel, channelType: msg.channelType || 'aun',
2197
+ chatType: msg.chatType || 'private', actorId: msg.peerId, conversationId: msg.channelId, peerType: msg.peerType }),
2198
+ fromControlChannel: msg.isControlChannel, processOwners: [...(this.processOwnersProvider?.() ?? [])],
2199
+ });
2200
+ // A changed role must not receive a cached response authorized by its old role.
2201
+ const initialSubject = msg.channelType === 'aun' && !response.error ? currentSubject() : undefined;
2202
+ const deliveryTiming = beginMenuDeliveryTiming(msg);
2203
+ let deliveryOutcome;
2185
2204
  try {
2186
- await adapter.send(envelope, { kind: 'custom', channelType: channel, payload: timedResponse });
2187
- logMenuRequestCompleted(request, timedResponse, flowContext, { delivery: 'sent' });
2205
+ await deliverMenuResponse(async () => {
2206
+ Object.assign(timedResponse, withMenuProcessingTime(timedResponse, msg));
2207
+ await adapter.send(envelope, { kind: 'custom', channelType: channel, payload: timedResponse });
2208
+ }, {
2209
+ canRetry: async () => {
2210
+ if (msg.channelType !== 'aun' || !selfAid || !binding
2211
+ || !sameContactBinding(binding, currentContactBinding(selfAid)))
2212
+ return false;
2213
+ if (this.processor.getChannelInfo?.(channel)?.adapter !== adapter)
2214
+ return false;
2215
+ if (response.error)
2216
+ return true;
2217
+ const subject = currentSubject();
2218
+ if (!authorizeAccess(subject).allow || subject.role !== initialSubject?.role
2219
+ || subject.processRole !== initialSubject.processRole)
2220
+ return false;
2221
+ if (isAunMenuTokenRequired() && request.type !== 'menu.token.request'
2222
+ && !this.menuTokenStore.use(selfAid, msg.peerId, request.menu_token, { deviceId: msg.peerDeviceId, slotId: msg.peerSlotId }))
2223
+ return false;
2224
+ if (isAgentStorageMenuRequest(request))
2225
+ agentStorageMenuService.preflight(request, { ...subject, menuEncrypted: msg.encrypted === true }, false);
2226
+ if (containsAgentMdMenuRequest(request))
2227
+ await agentMdMenuService.preflight({ ...subject, menuEncrypted: msg.encrypted === true, menuTransportChatType: msg.chatType || 'private' });
2228
+ return sameContactBinding(binding, currentContactBinding(selfAid))
2229
+ && this.processor.getChannelInfo?.(channel)?.adapter === adapter;
2230
+ },
2231
+ onRetry: (attempt, error, delay) => logMenuResponseRetry(request, flowContext, attempt, delay, error),
2232
+ onComplete: outcome => { deliveryOutcome = outcome; },
2233
+ });
2234
+ logMenuRequestCompleted(request, timedResponse, flowContext, { delivery: 'sent', ...deliveryOutcome, ...deliveryTiming() });
2188
2235
  const upgradeData = 'data' in response ? response.data : undefined;
2189
2236
  if (request.type === 'menu.action' && request.action === 'upgrade' && (request.name === 'system' || request.cmd === '/system') && upgradeData?.jobId) {
2190
2237
  const jobId = upgradeData.jobId;
@@ -2201,6 +2248,8 @@ export class MessageBridge {
2201
2248
  delivery: 'failed',
2202
2249
  reason: 'transport-error',
2203
2250
  transportError: error,
2251
+ ...deliveryOutcome,
2252
+ ...deliveryTiming(),
2204
2253
  });
2205
2254
  throw error;
2206
2255
  }
@@ -50,12 +50,16 @@ export class MessageQueue {
50
50
  queueKeyToSessionKey = new Map(); // queueKey → sessionKey(human-readable 格式)
51
51
  droppedTriggerSessionIds = new Set();
52
52
  shuttingDown = false;
53
+ blockedReason;
54
+ blockedQueues = new Map();
55
+ readinessRetry;
53
56
  shutdownPromise;
54
57
  /** 逻辑队列桥接:管理出队顺序(响应模式可注入自定义策略,默认 FIFO) */
55
58
  logicalQueue = new LogicalQueueBridge();
56
59
  enqueueSequence = 0;
57
60
  constructor(handler, options) {
58
61
  this.handler = handler;
62
+ this.blockedReason = options?.blockedReason;
59
63
  this.persistencePath = options?.persistencePath;
60
64
  this.dedupPath = options?.dedupPath
61
65
  ?? (this.persistencePath ? `${this.persistencePath}.dedup.json` : undefined);
@@ -694,6 +698,9 @@ export class MessageQueue {
694
698
  if (this.shutdownPromise)
695
699
  return this.shutdownPromise;
696
700
  this.shuttingDown = true;
701
+ if (this.readinessRetry)
702
+ clearTimeout(this.readinessRetry);
703
+ this.readinessRetry = undefined;
697
704
  const allActive = Array.from(this.activeBatches.entries());
698
705
  const active = allActive.filter(([queueKey]) => !this.activeTerminalReasons.has(queueKey));
699
706
  const barriers = [];
@@ -942,11 +949,32 @@ export class MessageQueue {
942
949
  return restored;
943
950
  }
944
951
  startRestored() {
952
+ if (this.shuttingDown)
953
+ return;
945
954
  for (const [queueKey, queue] of this.queues) {
946
955
  if (queue.length > 0 && !this.processing.has(queueKey))
947
956
  void this.processNext(queueKey);
948
957
  }
949
958
  }
959
+ retryBlockedQueues() {
960
+ if (this.readinessRetry || this.shuttingDown)
961
+ return;
962
+ this.readinessRetry = setTimeout(() => {
963
+ this.readinessRetry = undefined;
964
+ for (const key of this.blockedQueues.keys()) {
965
+ const head = this.queues.get(key)?.[0];
966
+ if (!head) {
967
+ this.blockedQueues.delete(key);
968
+ continue;
969
+ }
970
+ if (!this.processing.has(key) && !this.blockedReason?.(head.message))
971
+ void this.processNext(key);
972
+ }
973
+ if (this.blockedQueues.size)
974
+ this.retryBlockedQueues();
975
+ }, 1000);
976
+ this.readinessRetry.unref?.();
977
+ }
950
978
  consumeDroppedTriggerSessionIds() {
951
979
  const sessionIds = [...this.droppedTriggerSessionIds];
952
980
  this.droppedTriggerSessionIds.clear();
@@ -1221,6 +1249,7 @@ export class MessageQueue {
1221
1249
  }
1222
1250
  const queue = this.queues.get(queueKey);
1223
1251
  if (!queue || queue.length === 0) {
1252
+ this.blockedQueues.delete(queueKey);
1224
1253
  logger.info(`[Queue] processNext: queue empty, releasing key=${queueKey}`);
1225
1254
  this.processing.delete(queueKey);
1226
1255
  this.processingAgent.delete(queueKey);
@@ -1239,6 +1268,19 @@ export class MessageQueue {
1239
1268
  // 逻辑队列重排:让响应模式的出队策略决定队首(默认 FIFO,不改变顺序)
1240
1269
  if (queue[0]?.message.source !== 'owner-inject' && queue[0]?.message.attentionPolicy !== 'interrupt')
1241
1270
  this.logicalQueue.reorderPhysical(queueKey, queue);
1271
+ const blocked = this.blockedReason?.(queue[0].message);
1272
+ if (blocked) {
1273
+ if (this.blockedQueues.get(queueKey) !== blocked) {
1274
+ logger.info(`[Queue] waiting: key=${queueKey} dependency=${blocked}`);
1275
+ }
1276
+ this.blockedQueues.set(queueKey, blocked);
1277
+ this.processing.delete(queueKey);
1278
+ this.processingAgent.delete(queueKey);
1279
+ this.activeStates.delete(queueKey);
1280
+ this.retryBlockedQueues();
1281
+ return;
1282
+ }
1283
+ this.blockedQueues.delete(queueKey);
1242
1284
  // 贪心合并:群聊按完整时间线,旧路径/私聊按 peerId
1243
1285
  const items = this.dequeueGreedy(queue);
1244
1286
  // 同步逻辑队列:移除所有被合并处理的消息
@@ -1385,7 +1427,7 @@ export class MessageQueue {
1385
1427
  const first = queue.shift();
1386
1428
  const result = [first];
1387
1429
  if (this.isOriginHandoff(first.message)) {
1388
- while (queue.length > 0 && this.canMergeOriginHandoffs(first, queue[0])) {
1430
+ while (queue.length > 0 && !this.blockedReason?.(queue[0].message) && this.canMergeOriginHandoffs(first, queue[0])) {
1389
1431
  result.push(queue.shift());
1390
1432
  }
1391
1433
  if (result.length > 1) {
@@ -1401,7 +1443,7 @@ export class MessageQueue {
1401
1443
  if (mergeSubmittedResume) {
1402
1444
  const remaining = [];
1403
1445
  for (const item of queue) {
1404
- if (!this.isMergeBarrier(item.message) && this.canDequeueAfterSubmittedResume(first, item)) {
1446
+ if (!this.blockedReason?.(item.message) && !this.isMergeBarrier(item.message) && this.canDequeueAfterSubmittedResume(first, item)) {
1405
1447
  result.push(item);
1406
1448
  }
1407
1449
  else {
@@ -1421,7 +1463,7 @@ export class MessageQueue {
1421
1463
  else if (mergeGroupTimeline) {
1422
1464
  const remaining = [];
1423
1465
  for (const item of queue) {
1424
- if (!this.isMergeBarrier(item.message) && this.canDequeueGroupTimeline(first, item)) {
1466
+ if (!this.blockedReason?.(item.message) && !this.isMergeBarrier(item.message) && this.canDequeueGroupTimeline(first, item)) {
1425
1467
  result.push(item);
1426
1468
  }
1427
1469
  else {
@@ -1433,7 +1475,7 @@ export class MessageQueue {
1433
1475
  result.sort((a, b) => this.firstTimestamp(a) - this.firstTimestamp(b));
1434
1476
  }
1435
1477
  else {
1436
- while (queue.length > 0 && !this.isMergeBarrier(queue[0].message) && queue[0].message.peerId === mergeKey) {
1478
+ while (queue.length > 0 && !this.blockedReason?.(queue[0].message) && !this.isMergeBarrier(queue[0].message) && queue[0].message.peerId === mergeKey) {
1437
1479
  result.push(queue.shift());
1438
1480
  }
1439
1481
  }
@@ -4,7 +4,7 @@
4
4
  import fs from 'fs';
5
5
  import path from 'path';
6
6
  import crypto from 'crypto';
7
- import { chatDirPath, appendJsonl, readAllJsonlLines, scanChatDirs } from '../session/session-fs-store.js';
7
+ import { chatDirPath, appendJsonl, readAllJsonlLines, readAllJsonlLinesAsync, scanAgentChatDirsAsync } from '../session/session-fs-store.js';
8
8
  import { logger } from '../../utils/logger.js';
9
9
  const PENDING_HINTS_FILE = 'pending-hints.jsonl';
10
10
  export const OBSERVER_HINT_FAILURE_MESSAGES = {
@@ -121,18 +121,12 @@ function deleteFile(fp) {
121
121
  function claimKey(claim) {
122
122
  return targetKey(claim.sessionsDir, claim.channelType, claim.channelId, claim.selfAID, claim.chatType, claim.threadId, claim.channelKey);
123
123
  }
124
- export function pendingInterruptHints(sessionsDir, selfAID) {
124
+ export async function pendingInterruptHints(sessionsDir, selfAID, channelKey) {
125
125
  const pending = [];
126
- for (const chat of scanChatDirs(sessionsDir)) {
126
+ for (const chat of await scanAgentChatDirsAsync(sessionsDir, selfAID, channelKey)) {
127
127
  if (chat.selfAID !== selfAID || chat.channelType !== 'aun' || !chat.channelKey)
128
128
  continue;
129
- let events;
130
- try {
131
- events = readEvents(path.join(chat.dirPath, PENDING_HINTS_FILE));
132
- }
133
- catch {
134
- continue;
135
- }
129
+ const events = await readAllJsonlLinesAsync(path.join(chat.dirPath, PENDING_HINTS_FILE));
136
130
  const keys = new Set(events.filter(event => event.action === 'add')
137
131
  .map(event => `${eventChatType(event)}\u0000${normThread(event.threadId)}`));
138
132
  for (const key of keys) {
@@ -12,7 +12,7 @@ import { evaluateInboundAdmissionPreflight, evaluateOrdinaryInboundAdmission } f
12
12
  import { authorizeAccess, authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
13
13
  import { prepareSameOwnerProof, sameOwnerQualification, requiresSameOwnerProof } from '../relation/same-owner-proof.js';
14
14
  import { getRoleDefinition } from '../../config/roles.js';
15
- import { buildTaskRuntimeEnv, ensureRuntimeLockDir, ensureSessionRuntimeDir } from '../../cli/task-context.js';
15
+ import { buildTaskRuntimeEnv, ensureRuntimeLockDir, ensureSessionRuntimeDirAsync } from '../../cli/task-context.js';
16
16
  import { BUILTIN_SESSION_PATH_GRANTS, mergeRuntimeGrantsForSession, resolveGrantedReadRoots, } from '../permission/session-path-grants.js';
17
17
  import { buildSystemSessionContext, getSystemSessionModule, isSystemSessionType, readSystemSessionMarker } from '../system-session/registry.js';
18
18
  import { IMRenderer } from './im-renderer.js';
@@ -2156,6 +2156,10 @@ export class ResponseEngine {
2156
2156
  setHandoffRuntime(runtime) {
2157
2157
  this.handoffRuntime = runtime;
2158
2158
  }
2159
+ runnerReadiness;
2160
+ setRunnerReadiness(wait) {
2161
+ this.runnerReadiness = wait;
2162
+ }
2159
2163
  getTaskRuntimeContext(sessionId) {
2160
2164
  return this.activeTaskRuntimeContexts.get(sessionId) ?? null;
2161
2165
  }
@@ -3161,6 +3165,8 @@ export class ResponseEngine {
3161
3165
  const runnerSelfAid = this.agentRegistry?.resolveByChannel(channelKey)?.aid
3162
3166
  || session.selfAID
3163
3167
  || message.selfAID;
3168
+ if (runnerSelfAid)
3169
+ await this.runnerReadiness?.(runnerSelfAid, session.baseagent);
3164
3170
  agent = this.getAgent(channelKey, session.baseagent, runnerSelfAid);
3165
3171
  }
3166
3172
  catch (error) {
@@ -3564,6 +3570,8 @@ export class ResponseEngine {
3564
3570
  let agent;
3565
3571
  let turnLease;
3566
3572
  try {
3573
+ if (runnerSelfAid)
3574
+ await this.runnerReadiness?.(runnerSelfAid, session.baseagent);
3567
3575
  agent = this.getAgent(channelKey, session.baseagent, runnerSelfAid);
3568
3576
  }
3569
3577
  catch (error) {
@@ -4528,7 +4536,7 @@ export class ResponseEngine {
4528
4536
  // Allocate the stable session-owned root before any runner preflight
4529
4537
  // context is installed. Every runner for this EvolCore session receives
4530
4538
  // the same directory, independent of daemon or runner lifetimes.
4531
- const sessionRuntimeDir = ensureSessionRuntimeDir(session.id);
4539
+ const sessionRuntimeDir = await ensureSessionRuntimeDirAsync(session.id);
4532
4540
  const recordExecutionAnomaly = triggerRunId
4533
4541
  ? (anomaly) => {
4534
4542
  recordTriggerExecutionAnomaly(triggerRunId, {
@@ -108,7 +108,10 @@ function resolveThreadOption(raw, self, deps) {
108
108
  return fail('IDENTITY_MISMATCH', `主话题 ${value} 不属于当前本端 ${self}——主话题 id 由本端与对端共同构成`);
109
109
  }
110
110
  const threadId = canonicalizeMainTopicId(value) ?? value;
111
- return { peer: { channelType: 'aun', peerKind: 'private', id: peerId }, threadId };
111
+ // 主话题 id 里只有两个 AID,没有类型信息:群的主话题同样写成 main:<self>:<群AID>。
112
+ // 类型由调用方按关系证据注入;没有注入时才按私聊,保持旧行为。
113
+ const peerKind = deps.resolvePeerKind?.(peerId) ?? 'private';
114
+ return { peer: { channelType: 'aun', peerKind, id: peerId }, threadId };
112
115
  }
113
116
  if (isThreadTopicId(value)) {
114
117
  const info = deps.resolveThread?.(value);
@@ -159,6 +162,7 @@ export function resolveSendRoute(input, session, deps = {}) {
159
162
  let peer;
160
163
  let threadId;
161
164
  let source;
165
+ let firstContact = false;
162
166
  if (input.thread !== undefined) {
163
167
  const resolved = resolveThreadOption(input.thread, self, deps);
164
168
  if ('ok' in resolved)
@@ -193,6 +197,11 @@ export function resolveSendRoute(input, session, deps = {}) {
193
197
  }
194
198
  threadId = derived;
195
199
  source = { peer: 'to', thread: 'derived' };
200
+ // 还没有主会话 = 首次联系:话题还没被创建,不能要求它存在。
201
+ // 交给投递侧按普通私聊发出,会话随首条消息建立。
202
+ firstContact = deps.mainSessionExists !== undefined
203
+ && peer.peerKind === 'private'
204
+ && !deps.mainSessionExists(peer);
196
205
  }
197
206
  }
198
207
  else {
@@ -218,7 +227,7 @@ export function resolveSendRoute(input, session, deps = {}) {
218
227
  let checkEveryMs;
219
228
  let checkEveryDefaulted = false;
220
229
  let checkEveryIgnored = false;
221
- if (crossTopic) {
230
+ if (crossTopic && !firstContact) {
222
231
  if (input.checkEvery === undefined) {
223
232
  checkEveryMs = DEFAULT_CROSS_TOPIC_CHECK_EVERY_MS;
224
233
  checkEveryDefaulted = true;
@@ -260,6 +269,7 @@ export function resolveSendRoute(input, session, deps = {}) {
260
269
  peer,
261
270
  threadId,
262
271
  crossTopic,
272
+ firstContact,
263
273
  ...(checkEveryMs !== undefined ? { checkEveryMs } : {}),
264
274
  checkEveryDefaulted,
265
275
  checkEveryIgnored,
@@ -1714,6 +1714,7 @@ export async function refreshOwnershipForAuthorization(subjectAid, options = {})
1714
1714
  throw new OwnershipError('OWNER_REFRESH_FAILED', `Ownership refresh failed (${failure.refreshFailure.code}): ${failure.refreshFailure.reason}`);
1715
1715
  }
1716
1716
  }
1717
+ return views;
1717
1718
  }
1718
1719
  export async function assertOwnershipAuthorization(context) {
1719
1720
  if (context?.internalContactAuthorization && context.selfAid && context.actor?.principalId) {
@@ -1691,7 +1691,17 @@ function resolveCodexPowerShellCarrierString(command) {
1691
1691
  // PowerShell credential-prefix parser sees them.
1692
1692
  const quote = nested[0];
1693
1693
  if (nested.length >= 2 && nested.endsWith(quote)) {
1694
- nested = nested.slice(1, -1);
1694
+ if (quote === '"' && /\\[\\"$`]/u.test(nested)) {
1695
+ const decoded = parseLiteralShellCommand(nested, { dialect: 'posix' });
1696
+ if (decoded.ok && decoded.argv.length === 1)
1697
+ nested = decoded.argv[0];
1698
+ else {
1699
+ failure = parseFailure('invalid-quote', nested, 0, 0, 'powershell');
1700
+ nested = nested.slice(1, -1);
1701
+ }
1702
+ }
1703
+ else
1704
+ nested = nested.slice(1, -1);
1695
1705
  }
1696
1706
  else {
1697
1707
  failure = parseFailure('invalid-quote', nested, 0, 0, 'powershell');
@@ -11,6 +11,7 @@ import { buildCliSessionPreview } from '../session-title.js';
11
11
  import path from 'path';
12
12
  import fs from 'fs';
13
13
  import os from 'os';
14
+ import { visitSessionHistory } from '../session-fs-store.js';
14
15
  export class ClaudeSessionFileAdapter {
15
16
  baseagent = 'claude';
16
17
  getSessionFilePath(projectPath, agentSessionId) {
@@ -60,6 +61,29 @@ export class ClaudeSessionFileAdapter {
60
61
  return null;
61
62
  return this.readSessionPreview(sessionFile).title;
62
63
  }
64
+ async readMenuSummary(projectPath, agentSessionId) {
65
+ let turns = 0;
66
+ let validInfo = true;
67
+ const messages = [];
68
+ try {
69
+ await visitSessionHistory(this.getSessionFilePath(projectPath, agentSessionId), event => {
70
+ if (event?.type !== 'user' || event.message?.role !== 'user')
71
+ return;
72
+ const content = event.message.content;
73
+ if (!(Array.isArray(content) && content.every((part) => part.type === 'tool_result')))
74
+ turns++;
75
+ const text = this.extractRawUserText(content);
76
+ if (text)
77
+ messages.push(text);
78
+ }, () => { validInfo = false; });
79
+ return { turns: validInfo ? turns : 0, firstMessage: buildCliSessionPreview(messages, 'claude').title };
80
+ }
81
+ catch (error) {
82
+ if (error.code !== 'ENOENT')
83
+ logger.warn('[ClaudeAdapter] Failed to read menu summary', error);
84
+ return { turns: 0, firstMessage: null };
85
+ }
86
+ }
63
87
  /**
64
88
  * 单遍扫描会话文件,返回预览标题及是否含真人消息。
65
89
  * - title:第一条真人消息(跳过脚手架 prompt);全是脚手架时退回首条脚手架文本作兜底
@@ -15,6 +15,7 @@ import { logger } from '../../../utils/logger.js';
15
15
  import path from 'path';
16
16
  import fs from 'fs';
17
17
  import os from 'os';
18
+ import { visitSessionHistory } from '../session-fs-store.js';
18
19
  const requireFromHere = createRequire(import.meta.url);
19
20
  let sqliteModule; // undefined = not tried, null = unavailable
20
21
  export const sanitizeCodexThreadTitle = sanitizeSessionTitle;
@@ -37,6 +38,7 @@ export class CodexSessionFileAdapter {
37
38
  db = null;
38
39
  dbInitialized = false;
39
40
  rolloutPathCache = new Map();
41
+ rolloutFilesScan;
40
42
  constructor(codexHome = path.join(os.homedir(), '.codex')) {
41
43
  this.codexHome = codexHome;
42
44
  }
@@ -235,6 +237,84 @@ export class CodexSessionFileAdapter {
235
237
  return null;
236
238
  return this.readUserMessageFromRollout(rolloutPath, 'first');
237
239
  }
240
+ async findRolloutFileAsync(agentSessionId, preferred) {
241
+ for (const candidate of [preferred, this.rolloutPathCache.get(agentSessionId)]) {
242
+ if (typeof candidate !== 'string' || !candidate)
243
+ continue;
244
+ try {
245
+ await fs.promises.access(candidate);
246
+ return candidate;
247
+ }
248
+ catch { /* Rescan moved rollouts. */ }
249
+ }
250
+ this.rolloutPathCache.delete(agentSessionId);
251
+ const scan = async (dir) => {
252
+ const files = [];
253
+ let entries;
254
+ try {
255
+ entries = await fs.promises.readdir(dir, { withFileTypes: true });
256
+ }
257
+ catch {
258
+ return files;
259
+ }
260
+ for (const entry of entries) {
261
+ const file = path.join(dir, entry.name);
262
+ if (entry.isDirectory())
263
+ files.push(...await scan(file));
264
+ else if (entry.name.endsWith('.jsonl')) {
265
+ files.push(file);
266
+ const id = /([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\.jsonl$/i.exec(entry.name)?.[1];
267
+ if (id && !this.rolloutPathCache.has(id))
268
+ this.rolloutPathCache.set(id, file);
269
+ }
270
+ }
271
+ return files;
272
+ };
273
+ // Concurrent topic reads share discovery. Misses are never cached across scans.
274
+ const pending = this.rolloutFilesScan ??= scan(path.join(this.codexHome, 'sessions'));
275
+ try {
276
+ const file = (await pending).find(file => path.basename(file).includes(agentSessionId)) ?? null;
277
+ if (file)
278
+ this.rolloutPathCache.set(agentSessionId, file);
279
+ return file;
280
+ }
281
+ finally {
282
+ if (this.rolloutFilesScan === pending)
283
+ this.rolloutFilesScan = undefined;
284
+ }
285
+ }
286
+ async readMenuSummary(_projectPath, agentSessionId) {
287
+ let row;
288
+ try {
289
+ row = this.getDb()?.prepare('SELECT first_user_message, rollout_path FROM threads WHERE id = ?').get(agentSessionId);
290
+ }
291
+ catch (error) {
292
+ logger.warn('[CodexAdapter] menu summary DB query failed:', error);
293
+ }
294
+ const rollout = await this.findRolloutFileAsync(agentSessionId, row?.rollout_path);
295
+ let turns = 0;
296
+ let rolloutRead = false;
297
+ const messages = [];
298
+ if (rollout) {
299
+ try {
300
+ await visitSessionHistory(rollout, event => {
301
+ if (event?.type === 'turn_context')
302
+ turns++;
303
+ if (event?.type === 'event_msg' && event.payload?.type === 'user_message' && event.payload.message) {
304
+ messages.push(String(event.payload.message));
305
+ }
306
+ });
307
+ rolloutRead = true;
308
+ }
309
+ catch {
310
+ turns = 0;
311
+ messages.length = 0;
312
+ }
313
+ }
314
+ const initial = buildCliSessionPreview([row?.first_user_message], 'codex');
315
+ return { turns, firstMessage: row && (initial.hasReal || !rollout || !rolloutRead)
316
+ ? initial.title : buildCliSessionPreview(messages, 'codex').title };
317
+ }
238
318
  readLastUserMessage(projectPath, agentSessionId) {
239
319
  // 1. 优先查 state DB 获取 rollout_path
240
320
  const db = this.getDb();
@@ -1,5 +1,6 @@
1
1
  import fs from 'fs';
2
2
  import path from 'path';
3
+ import { visitSessionHistory } from '../session-fs-store.js';
3
4
  import { agentSessionsDir } from '../../../paths.js';
4
5
  function projectDirectory(projectPath, agentAid) {
5
6
  if (!agentAid?.trim())
@@ -72,6 +73,27 @@ export class EcagentSessionFileAdapter {
72
73
  .find(item => item.type === 'message' && item.message?.role === 'user');
73
74
  return preview(messageText(entry?.message?.content));
74
75
  }
76
+ async readMenuSummary(projectPath, agentSessionId, agentAid) {
77
+ let turns = 0;
78
+ let firstMessage = null;
79
+ const dir = projectDirectory(projectPath, agentAid);
80
+ if (!dir)
81
+ return { turns, firstMessage };
82
+ try {
83
+ const name = (await fs.promises.readdir(dir)).find(name => name.endsWith(`_${agentSessionId}.jsonl`));
84
+ if (name)
85
+ await visitSessionHistory(path.join(dir, name), (entry, line) => {
86
+ if (line === 0 || entry?.type !== 'message' || entry.message?.role !== 'user')
87
+ return;
88
+ if (turns++ === 0)
89
+ firstMessage = preview(messageText(entry.message.content));
90
+ });
91
+ return { turns, firstMessage };
92
+ }
93
+ catch {
94
+ return { turns: 0, firstMessage: null };
95
+ }
96
+ }
75
97
  readLastUserMessage(projectPath, agentSessionId, agentAid) {
76
98
  const entries = this.readEntries(projectPath, agentSessionId, agentAid)
77
99
  .filter(item => item.type === 'message' && item.message?.role === 'user');
@@ -120,6 +120,45 @@ export class GeminiSessionFileAdapter {
120
120
  readFirstMessage(projectPath, agentSessionId) {
121
121
  return this.readUserMessage(projectPath, agentSessionId, 'first');
122
122
  }
123
+ async readMenuSummary(projectPath, agentSessionId) {
124
+ const home = this.getGeminiHome();
125
+ let projectKey;
126
+ try {
127
+ const data = JSON.parse(await fs.promises.readFile(path.join(home, 'projects.json'), 'utf8'));
128
+ const mapped = data?.projects?.[projectPath];
129
+ if (typeof mapped === 'string' && mapped.trim())
130
+ projectKey = mapped;
131
+ }
132
+ catch { /* Match the existing project-root fallback. */ }
133
+ if (!projectKey) {
134
+ try {
135
+ for (const entry of await fs.promises.readdir(path.join(home, 'tmp'), { withFileTypes: true })) {
136
+ if (!entry.isDirectory())
137
+ continue;
138
+ try {
139
+ if ((await fs.promises.readFile(path.join(home, 'tmp', entry.name, '.project_root'), 'utf8')).trim() === projectPath) {
140
+ projectKey = entry.name;
141
+ break;
142
+ }
143
+ }
144
+ catch { /* Ignore broken project roots. */ }
145
+ }
146
+ }
147
+ catch { /* Use the basename fallback. */ }
148
+ }
149
+ const dir = path.join(home, 'tmp', projectKey ?? path.basename(projectPath), 'chats');
150
+ try {
151
+ const name = (await fs.promises.readdir(dir)).find(name => name.includes(agentSessionId.slice(0, 8)) && name.endsWith('.json'));
152
+ if (!name)
153
+ return { turns: 0, firstMessage: null };
154
+ const data = JSON.parse(await fs.promises.readFile(path.join(dir, name), 'utf8'));
155
+ return { turns: (data.messages || []).filter((message) => message.type === 'user').length,
156
+ firstMessage: this.buildSessionPreview(data).title };
157
+ }
158
+ catch {
159
+ return { turns: 0, firstMessage: null };
160
+ }
161
+ }
123
162
  readLastUserMessage(projectPath, agentSessionId) {
124
163
  return this.readUserMessage(projectPath, agentSessionId, 'last');
125
164
  }