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
@@ -16,6 +16,7 @@ import { isManagementRole } from '../config/builtin-roles.js';
16
16
  import { pendingInterruptHints } from './message/pending-hints.js';
17
17
  import { logger } from '../utils/logger.js';
18
18
  import { sessionLocalTopicId } from './thread/topic-id.js';
19
+ import { StartupTaskQueue } from './daemon-lifecycle.js';
19
20
  export function createAgentStorageClientResolver(channelInstances) {
20
21
  return (channelKey, targetAid) => {
21
22
  const instance = channelInstances.find(candidate => candidate.channelType === 'aun'
@@ -61,58 +62,133 @@ export function preloadChannelThreads(channelInstances, sessionManager) {
61
62
  }
62
63
  export function createChannelConnectionRuntime(dependencies) {
63
64
  const { channelInstances, connectedChannels } = dependencies;
64
- const queuePendingObserverHints = (aid, channelKey) => (pendingInterruptHints(dependencies.sessionsDir, aid)
65
- .filter(pending => pending.channelKey === channelKey)
66
- .map(pending => dependencies.responseEngine.scheduleObserverHint({ ...pending, selfAid: aid })
67
- .then(result => {
68
- if (result === 'SESSION_NOT_FOUND')
69
- logger.warn(`[ObserverHint] recovery target missing hint=${pending.hintId}`);
70
- })
71
- .catch(error => logger.warn(`[ObserverHint] recovery failed hint=${pending.hintId}: ${error}`))));
65
+ const followups = new StartupTaskQueue();
66
+ const connections = new Map();
67
+ const subscriptions = new Map();
68
+ const queuePendingObserverHints = async (aid, channelKey) => {
69
+ const pending = await pendingInterruptHints(dependencies.sessionsDir, aid, channelKey);
70
+ if (dependencies.isCancelled?.())
71
+ return;
72
+ const results = await Promise.allSettled(pending.map(pending => dependencies.responseEngine.scheduleObserverHint({ ...pending, selfAid: aid })
73
+ .then(result => {
74
+ if (result === 'SESSION_NOT_FOUND')
75
+ logger.warn(`[ObserverHint] recovery target missing hint=${pending.hintId}`);
76
+ })
77
+ .catch(error => {
78
+ logger.warn(`[ObserverHint] recovery failed hint=${pending.hintId}: ${error}`);
79
+ throw error;
80
+ })));
81
+ const failure = results.find(result => result.status === 'rejected');
82
+ if (failure?.status === 'rejected')
83
+ throw failure.reason;
84
+ };
72
85
  const markChannelConnected = async (instance) => {
73
86
  const name = instance.adapter.channelName;
74
87
  const key = instance.adapter.channelKey;
75
- if (connectedChannels.has(key))
88
+ if (dependencies.isCancelled?.() || !channelInstances.includes(instance)
89
+ || instance.lifecycle?.signal.aborted || instance.channel.getStatus?.().connected === false)
90
+ return;
91
+ if (connections.get(key)?.instance === instance)
76
92
  return;
93
+ const connection = { instance };
94
+ connections.set(key, connection);
77
95
  connectedChannels.add(name);
78
96
  connectedChannels.add(key);
79
97
  const type = instance.channelType || name;
80
98
  dependencies.eventBus.publish({ type: 'channel:connected', channel: type.toLowerCase(), channelName: name, timestamp: Date.now() });
81
99
  const agent = dependencies.resolveOwningAgent(key, name);
100
+ if (instance.channelType === 'aun' && agent && !dependencies.isStartupRecoveryPending()) {
101
+ void queuePendingObserverHints(agent.aid, key)
102
+ .catch(error => logger.warn(`[ObserverHint] reconnect recovery failed for ${agent.aid}: ${error}`));
103
+ }
104
+ const valid = () => !dependencies.isCancelled?.()
105
+ && connections.get(key) === connection && channelInstances.includes(instance)
106
+ && instance.lifecycle?.signal.aborted !== true
107
+ && instance.channel.getStatus?.().connected !== false;
108
+ const enqueue = (name, run) => followups.run(async () => {
109
+ try {
110
+ await run();
111
+ }
112
+ catch (error) {
113
+ logger.warn(`[ChannelStartup] ${key} ${name} failed: ${error}`);
114
+ }
115
+ }, valid);
116
+ // AUN protocol work and external platform notices have separate assembly.
82
117
  if (instance.channelType === 'aun' && agent) {
83
- const recoveries = queuePendingObserverHints(agent.aid, key);
84
- if (dependencies.isStartupRecoveryPending())
85
- dependencies.startupObserverRecoveries.push(...recoveries);
118
+ let authorizationReady = false;
119
+ while (valid() && !authorizationReady) {
120
+ await enqueue('authorization', async () => {
121
+ authorizationReady = await dependencies.refreshAunAuthorization?.(agent.aid) !== false;
122
+ });
123
+ if (valid() && !authorizationReady) {
124
+ await new Promise(resolve => { const timer = setTimeout(resolve, 1_000); timer.unref?.(); });
125
+ }
126
+ }
127
+ if (valid())
128
+ await enqueue('lifecycle notice', () => dependencies.sendLifecycleNoticeForChannel?.(instance));
86
129
  }
87
- await Promise.all([
88
- dependencies.bootstrapService.tryStartBootstrap({
89
- adapter: instance.adapter,
90
- channelKey: key,
91
- channelType: instance.channelType || type,
92
- source: 'connected',
93
- }),
94
- agent ? dependencies.ensureTriggerSchedulerStarted(agent) : Promise.resolve(),
95
- Promise.resolve().then(() => dependencies.sendOnlineNoticeForChannel(instance)),
96
- Promise.resolve().then(() => dependencies.sendLifecycleNoticeForChannel?.(instance)),
97
- dependencies.trySendPendingRestartNotice(),
98
- ]);
130
+ else {
131
+ await enqueue('online notice', () => dependencies.sendOnlineNoticeForChannel(instance));
132
+ }
133
+ await enqueue('bootstrap', () => dependencies.bootstrapService.tryStartBootstrap({
134
+ adapter: instance.adapter,
135
+ channelKey: key,
136
+ channelType: instance.channelType || type,
137
+ source: 'connected',
138
+ }));
139
+ await enqueue('restart notice', () => dependencies.trySendPendingRestartNotice());
99
140
  };
100
141
  const markChannelDisconnected = (channelName) => {
101
142
  connectedChannels.delete(channelName);
102
- const instance = channelInstances.find(candidate => candidate.adapter.channelName === channelName);
143
+ const instance = channelInstances.find(candidate => candidate.adapter.channelName === channelName
144
+ || candidate.adapter.channelKey === channelName);
103
145
  if (instance)
104
146
  connectedChannels.delete(instance.adapter.channelKey);
147
+ if (instance)
148
+ connectedChannels.delete(instance.adapter.channelName);
149
+ if (instance)
150
+ connections.delete(instance.adapter.channelKey);
105
151
  };
106
152
  const unregisterRuntimeChannel = (channelName) => {
153
+ for (const [instance, unsubscribe] of subscriptions) {
154
+ if (instance.adapter.channelName === channelName || instance.adapter.channelKey === channelName) {
155
+ unsubscribe();
156
+ subscriptions.delete(instance);
157
+ }
158
+ }
107
159
  markChannelDisconnected(channelName);
108
160
  dependencies.processor.unregisterChannel(channelName);
109
161
  dependencies.commandHandler.unregisterChannel(channelName);
110
162
  dependencies.messageBridge.removeChannel(channelName);
111
163
  };
112
- return { markChannelConnected, markChannelDisconnected, unregisterRuntimeChannel, queuePendingObserverHints };
164
+ const observeChannel = (instance) => {
165
+ if (instance.channelType !== 'aun' || subscriptions.has(instance)
166
+ || typeof instance.channel.onTransportState !== 'function')
167
+ return;
168
+ const unsubscribe = instance.channel.onTransportState((ready) => {
169
+ if (!channelInstances.includes(instance) || instance.lifecycle?.signal.aborted)
170
+ return;
171
+ if (ready)
172
+ void markChannelConnected(instance).catch(error => logger.warn(`[ChannelStartup] ${instance.adapter.channelKey}: ${error}`));
173
+ else if (connections.get(instance.adapter.channelKey)?.instance === instance)
174
+ markChannelDisconnected(instance.adapter.channelKey);
175
+ });
176
+ subscriptions.set(instance, unsubscribe);
177
+ instance.lifecycle?.defer(unsubscribe, 'AUN transport readiness');
178
+ };
179
+ return {
180
+ markChannelConnected, markChannelDisconnected, unregisterRuntimeChannel, queuePendingObserverHints, observeChannel,
181
+ stop: () => {
182
+ followups.stop();
183
+ connections.clear();
184
+ for (const unsubscribe of subscriptions.values())
185
+ unsubscribe();
186
+ subscriptions.clear();
187
+ },
188
+ };
113
189
  }
114
190
  export function registerChannelInstance(inst, dependencies) {
115
- const { defaultProjectPath, defaultPolicy, processor, commandHandler, interactionRouter, messageBridge, eventBus, sessionManager, responseEngine, resolveOwningAgent, } = dependencies;
191
+ const { defaultProjectPath, defaultPolicy, processor, commandHandler, interactionRouter, messageBridge, eventBus, sessionManager, resolveOwningAgent, } = dependencies;
116
192
  wrapChannelSend(inst, {
117
193
  eventBus,
118
194
  sessionManager,
@@ -142,21 +218,15 @@ export function registerChannelInstance(inst, dependencies) {
142
218
  const channelType = inst.channelType || inst.adapter.channelName;
143
219
  inst.registerBridge?.(messageBridge, channelType);
144
220
  inst.registerHooks?.({ eventBus, sessionManager, lifecycle: inst.lifecycle });
145
- const channelForObserver = inst.channel;
146
- if (typeof channelForObserver.setObserverConfigResolver === 'function') {
221
+ if (inst.channelType === 'aun') {
147
222
  const channelKey = inst.adapter.channelKey;
148
- channelForObserver.setObserverConfigResolver(() => {
149
- const owningAgent = resolveOwningAgent(channelKey, inst.adapter.channelName);
150
- return {
151
- observable: owningAgent?.getObservable() ?? false,
152
- owners: owningAgent ? getOwners(owningAgent.aid) : [],
153
- };
223
+ inst.channel.setObserverConfigResolver(() => {
224
+ const agent = dependencies.resolveOwningAgent(channelKey, inst.adapter.channelName);
225
+ return { observable: agent?.getObservable() ?? false, owners: agent ? getOwners(agent.aid) : [] };
154
226
  });
155
- }
156
- if (inst.channelType === 'aun') {
157
- channelForObserver.setObserverHintRuntime({
158
- hasSession: target => responseEngine.hasObserverTargetSession(target),
159
- schedule: target => responseEngine.scheduleObserverHint(target),
227
+ inst.channel.setObserverHintRuntime({
228
+ hasSession: (target) => dependencies.responseEngine.hasObserverTargetSession(target),
229
+ schedule: (target) => dependencies.responseEngine.scheduleObserverHint(target),
160
230
  });
161
231
  }
162
232
  inst.channel.onRecall?.((messageId, selfAID) => {
@@ -171,11 +241,11 @@ export function createChannelStartupNotifications({ channelInstances, agentRegis
171
241
  const sendOnlineNoticeForChannel = (inst) => {
172
242
  // AUN 的上线提示改走 volatile 生命周期通知(见 lifecycle-notice.ts),
173
243
  // 这里只保留非 AUN 渠道的 durable 通知,避免同时开启时重复两条。
174
- if (inst.channelType === 'aun')
244
+ if (!upmsg || inst.channelType === 'aun')
175
245
  return;
176
246
  const name = inst.adapter.channelName;
177
247
  const agent = agentRegistry.resolveByChannel(inst.adapter.channelKey) ?? agentRegistry.resolveByChannel(name);
178
- if (!agent || !upmsg)
248
+ if (!agent)
179
249
  return;
180
250
  const ownerAid = getFirstStaticAgentOwner(agent.aid);
181
251
  if (!ownerAid)
@@ -1038,7 +1038,7 @@ export class CommandHandler {
1038
1038
  return false;
1039
1039
  return !!userId && topic.metadata?.peerId === userId;
1040
1040
  }
1041
- buildTopicMenuItem(s, metadataOnly = false) {
1041
+ async buildTopicMenuItem(s, metadataOnly = false) {
1042
1042
  const displayName = displaySessionTitle(s.name, sessionTopicThreadId(s) || s.id.slice(0, 8));
1043
1043
  const item = {
1044
1044
  value: sessionTopicThreadId(s) ?? '',
@@ -1052,10 +1052,10 @@ export class CommandHandler {
1052
1052
  if (s.agentSessionId) {
1053
1053
  item.agentSessionId = s.agentSessionId;
1054
1054
  if (!metadataOnly) {
1055
- const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
1056
- if (fileInfo.turns)
1057
- item.turns = fileInfo.turns;
1058
- const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
1055
+ const summary = await this.sessionManager.readSessionMenuSummary(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
1056
+ if (summary.turns)
1057
+ item.turns = summary.turns;
1058
+ const firstMsg = summary.firstMessage;
1059
1059
  if (firstMsg)
1060
1060
  item.preview = firstMsg.length > 80 ? firstMsg.slice(0, 80) + '...' : firstMsg;
1061
1061
  }
@@ -2032,9 +2032,14 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
2032
2032
  }
2033
2033
  }
2034
2034
  const metadataOnly = args?.metadataOnly === true;
2035
- return sessions
2036
- .filter((s) => isTopicSession(s) && (!hasLabel || s.label === label) && (!topicStatus || s.topicStatus === topicStatus))
2037
- .map((s) => this.buildTopicMenuItem(s, metadataOnly));
2035
+ const topics = sessions.filter((s) => isTopicSession(s)
2036
+ && (!hasLabel || s.label === label) && (!topicStatus || s.topicStatus === topicStatus));
2037
+ const items = [];
2038
+ for (let offset = 0; offset < topics.length; offset += 4) {
2039
+ items.push(...await Promise.all(topics.slice(offset, offset + 4)
2040
+ .map((s) => this.buildTopicMenuItem(s, metadataOnly))));
2041
+ }
2042
+ return items;
2038
2043
  }
2039
2044
  if (cmd === '/s' || cmd === '/session' || cmd === '/del') {
2040
2045
  const sessions = await this.sessionManager.listSessions(channel, channelId);
@@ -9,6 +9,58 @@ import { parseFileSearchArgs } from './file-search.js';
9
9
  import { validateProviderMenuRequest } from '../../config/provider-menu-request.js';
10
10
  import { validatePaWorkspaceItemsArgs } from './pa-workspace-items.js';
11
11
  import { validateAgentMdMenuRequest } from './agentmd-menu-request.js';
12
+ const RETRY_DELAYS_MS = [250, 750, 2_000];
13
+ const RETRY_WINDOW_MS = 5_000;
14
+ export function isRetryableMenuTransportError(error) {
15
+ if (!error || typeof error !== 'object')
16
+ return false;
17
+ const value = error;
18
+ const code = String(value.code ?? '').toUpperCase();
19
+ if (['CONTACT_DENIED', 'CONTACT_OWNERSHIP_CHANGED', 'PERMISSION_DENIED', 'FORBIDDEN'].includes(code))
20
+ return false;
21
+ return value.retryable === true;
22
+ }
23
+ export async function deliverMenuResponse(send, options) {
24
+ const startedAt = performance.now();
25
+ let sendAttempts = 0;
26
+ const fail = (retryStopReason, error) => {
27
+ options.onComplete?.({ sendAttempts, retryStopReason });
28
+ throw error;
29
+ };
30
+ for (let attempt = 0;; attempt++) {
31
+ try {
32
+ sendAttempts++;
33
+ await send();
34
+ }
35
+ catch (error) {
36
+ const delay = RETRY_DELAYS_MS[attempt];
37
+ if (!isRetryableMenuTransportError(error))
38
+ fail('transport-error', error);
39
+ if (delay === undefined)
40
+ fail('transport-retry-exhausted', error);
41
+ if (performance.now() - startedAt + delay > RETRY_WINDOW_MS)
42
+ fail('transport-retry-window-expired', error);
43
+ options.onRetry?.(attempt + 1, error, delay);
44
+ await new Promise(resolve => setTimeout(resolve, delay));
45
+ if (performance.now() - startedAt >= RETRY_WINDOW_MS)
46
+ fail('transport-retry-window-expired', error);
47
+ let allowed = false;
48
+ try {
49
+ allowed = await options.canRetry();
50
+ }
51
+ catch (guardError) {
52
+ fail('retry-guard-error', guardError);
53
+ }
54
+ if (!allowed)
55
+ fail('retry-guard-rejected', error);
56
+ if (performance.now() - startedAt >= RETRY_WINDOW_MS)
57
+ fail('transport-retry-window-expired', error);
58
+ continue;
59
+ }
60
+ options.onComplete?.({ sendAttempts });
61
+ return;
62
+ }
63
+ }
12
64
  export const MENU_REQUEST_TYPES = new Set([
13
65
  'menu.token.request',
14
66
  'menu.list',
@@ -194,6 +246,9 @@ export function normalizeMenuResponseTiming(timing, clock = {}) {
194
246
  * its own inbound-to-outbound processing time.
195
247
  */
196
248
  export function withMenuProcessingTime(response, timing, clock = {}) {
249
+ return { ...response, processing_ms: menuElapsedMs(timing, clock) };
250
+ }
251
+ function menuElapsedMs(timing, clock = {}) {
197
252
  const receivedAtMono = typeof timing.receivedAtMono === 'number' && Number.isFinite(timing.receivedAtMono)
198
253
  ? timing.receivedAtMono
199
254
  : undefined;
@@ -205,9 +260,15 @@ export function withMenuProcessingTime(response, timing, clock = {}) {
205
260
  : receivedAt !== undefined
206
261
  ? (clock.wallNow ?? Date.now()) - receivedAt
207
262
  : 0;
208
- return {
209
- ...response,
210
- processing_ms: Math.max(0, Math.round(Number.isFinite(elapsed) ? elapsed : 0)),
263
+ return Math.max(0, Math.round(Number.isFinite(elapsed) ? elapsed : 0));
264
+ }
265
+ /** Log-only timing: delivery includes all send attempts, retry waits and guard checks. */
266
+ export function beginMenuDeliveryTiming(timing) {
267
+ const started = performance.now();
268
+ const processingMs = menuElapsedMs(timing, { monotonicNow: started });
269
+ return () => {
270
+ const transportMs = Math.max(0, Math.round(performance.now() - started));
271
+ return { processingMs, transportMs, totalMs: processingMs + transportMs };
211
272
  };
212
273
  }
213
274
  export function evaluateEvolMenuVersionGate(input) {
@@ -241,10 +302,8 @@ export function isAunMenuTokenRequired() {
241
302
  }
242
303
  export function evolMenuResponseTransportMetadata(sdkVersion, volatileCapability) {
243
304
  return {
244
- // Menu/control responses are consumed through the SDK classified-control
245
- // path, which requires an authenticated E2EE envelope to recover the
246
- // sender from AAD. Do not inherit a plaintext/default transport choice.
247
- encrypted: true,
305
+ // Clear inherited request state so AUNChannel applies daemon aun.defaultEncrypt.
306
+ encrypted: undefined,
248
307
  protectedHeaders: {
249
308
  ec_version: readInstalledEvolcoreVersion(),
250
309
  ...(typeof sdkVersion === 'string' && sdkVersion.trim() ? { sdk_version: sdkVersion.trim() } : {}),
@@ -932,16 +991,25 @@ export function logMenuRequestReceived(request, context) {
932
991
  request: menuRequestBusinessFields(request),
933
992
  });
934
993
  }
994
+ export function logMenuResponseRetry(request, context, attempt, delayMs, error) {
995
+ const code = error && typeof error === 'object' && 'code' in error ? String(error.code) : undefined;
996
+ writeMenuFlowRecord({ ...menuFlowBaseRecord(request, context), event: 'menu.response.retry',
997
+ phase: 'scheduled', attempt, delayMs, code, retryable: true });
998
+ }
935
999
  export function logMenuRequestCompleted(request, response, context, options) {
936
1000
  const error = response && 'error' in response ? response.error : undefined;
1001
+ const detail = options.transportError && typeof options.transportError === 'object'
1002
+ ? options.transportError : undefined;
937
1003
  const transportError = options.transportError instanceof Error
938
- ? { message: sanitizeLogString(options.transportError.message) }
1004
+ ? { message: sanitizeLogString(options.transportError.message),
1005
+ ...(detail?.code === undefined ? {} : { code: sanitizeLogString(String(detail.code)) }),
1006
+ ...(detail?.retryable === undefined ? {} : { retryable: isRetryableMenuTransportError(options.transportError) }) }
939
1007
  : options.transportError === undefined
940
1008
  ? undefined
941
1009
  : { message: sanitizeLogString(String(options.transportError)) };
942
- const processingMs = response && typeof response.processing_ms === 'number'
1010
+ const processingMs = options.processingMs ?? (response && typeof response.processing_ms === 'number'
943
1011
  ? response.processing_ms
944
- : undefined;
1012
+ : undefined);
945
1013
  let responseBytes;
946
1014
  if (response) {
947
1015
  try {
@@ -954,8 +1022,11 @@ export function logMenuRequestCompleted(request, response, context, options) {
954
1022
  event: options.delivery === 'failed' ? 'menu.request.failed' : 'menu.request.completed',
955
1023
  delivery: options.delivery,
956
1024
  processingMs,
1025
+ transportMs: options.transportMs,
1026
+ totalMs: options.totalMs,
957
1027
  responseBytes,
958
- reason: options.reason,
1028
+ sendAttempts: options.sendAttempts,
1029
+ reason: options.retryStopReason ?? options.reason,
959
1030
  result: response && 'data' in response ? sanitizeMenuLogValue(response.data) : undefined,
960
1031
  warning: response && 'warning' in response ? sanitizeMenuLogValue(response.warning) : undefined,
961
1032
  error: error ? sanitizeMenuLogValue(error) : transportError,
@@ -477,19 +477,31 @@ function updateDefaultRoles(context, args, value) {
477
477
  const self = context.self;
478
478
  if (!isObject(value))
479
479
  throw invalidJsonType(self, 'defaultRoles', 'object');
480
- assertOnlyKeys(value, ['private', 'group', 'paTeam'], 'defaultRoles', self);
481
- if (!Object.prototype.hasOwnProperty.call(value, 'private') || !Object.prototype.hasOwnProperty.call(value, 'group')) {
480
+ // 旧键名兼容:已上线的 App 仍可能发 `defaultRoles.paTeam`。必须在
481
+ // assertOnlyKeys 之前改名,否则旧客户端会被 unknown-key 直接拒掉。
482
+ // 两个键同时出现时以新键为准。
483
+ let fields = value;
484
+ if (Object.prototype.hasOwnProperty.call(fields, 'paTeam')) {
485
+ const legacy = fields.paTeam;
486
+ const renamed = { ...fields };
487
+ delete renamed.paTeam;
488
+ if (!Object.prototype.hasOwnProperty.call(renamed, 'internalContact'))
489
+ renamed.internalContact = legacy;
490
+ fields = renamed;
491
+ }
492
+ assertOnlyKeys(fields, ['private', 'group', 'internalContact'], 'defaultRoles', self);
493
+ if (!Object.prototype.hasOwnProperty.call(fields, 'private') || !Object.prototype.hasOwnProperty.call(fields, 'group')) {
482
494
  throw validationFailed(self, undefined, [{ field: 'defaultRoles', code: 'MISSING_FIELD', message: 'private and group are required' }]);
483
495
  }
484
496
  const registry = readRoleRegistry(self);
485
497
  const nextDefaults = {
486
- private: validateAssignableRole(value.private, self, 'defaultRoles.private'),
487
- group: validateAssignableRole(value.group, self, 'defaultRoles.group'),
488
- paTeam: validateAssignableRole(Object.prototype.hasOwnProperty.call(value, 'paTeam')
489
- ? value.paTeam ?? 'member' : registry.defaultRoles.paTeam ?? 'member', self, 'defaultRoles.paTeam'),
498
+ private: validateAssignableRole(fields.private, self, 'defaultRoles.private'),
499
+ group: validateAssignableRole(fields.group, self, 'defaultRoles.group'),
500
+ internalContact: validateAssignableRole(Object.prototype.hasOwnProperty.call(fields, 'internalContact')
501
+ ? fields.internalContact ?? 'member' : registry.defaultRoles.internalContact ?? 'member', self, 'defaultRoles.internalContact'),
490
502
  };
491
503
  assertPolicyRevision(self, args);
492
- const changesAdminDefault = ['private', 'group', 'paTeam'].some(scene => registry.defaultRoles[scene] !== nextDefaults[scene]
504
+ const changesAdminDefault = ['private', 'group', 'internalContact'].some(scene => registry.defaultRoles[scene] !== nextDefaults[scene]
493
505
  && (registry.defaultRoles[scene] === 'admin' || nextDefaults[scene] === 'admin'));
494
506
  if (!isDaemonOwnerControl(context) && context.actorRole !== 'owner' && changesAdminDefault) {
495
507
  throw roleError('NOT_ALLOWED', 'Only an owner can set or replace an admin default role', self, {
@@ -744,10 +756,10 @@ async function deleteRole(context, args) {
744
756
  const registry = readRoleRegistry(self);
745
757
  const nextRegistry = clone(registry);
746
758
  nextRegistry.roles = nextRegistry.roles.filter(item => item !== roleId);
747
- for (const scene of ['private', 'group', 'paTeam']) {
748
- const current = scene === 'paTeam' ? nextRegistry.defaultRoles[scene] ?? 'member' : nextRegistry.defaultRoles[scene];
759
+ for (const scene of ['private', 'group', 'internalContact']) {
760
+ const current = scene === 'internalContact' ? nextRegistry.defaultRoles[scene] ?? 'member' : nextRegistry.defaultRoles[scene];
749
761
  if (current === roleId)
750
- nextRegistry.defaultRoles[scene] = replacement ?? (scene === 'paTeam' ? 'member' : null);
762
+ nextRegistry.defaultRoles[scene] = replacement ?? (scene === 'internalContact' ? 'member' : null);
751
763
  }
752
764
  const changes = [
753
765
  {
@@ -779,7 +791,7 @@ async function assignmentInventory(context, args, policyRevision) {
779
791
  const items = [];
780
792
  if (args?.includeDefaults !== false) {
781
793
  const defaults = effectiveDefaultRoles(self);
782
- for (const scene of ['private', 'group', 'paTeam']) {
794
+ for (const scene of ['private', 'group', 'internalContact']) {
783
795
  const roleId = defaults[scene];
784
796
  if (roleId && (!roleFilter || roleFilter === roleId)) {
785
797
  items.push({ target: { kind: 'default', scene }, roleId, relationRevision: null });
@@ -1312,7 +1324,7 @@ function readAgent(self) {
1312
1324
  }
1313
1325
  function effectiveDefaultRoles(self) {
1314
1326
  const defaults = readRolesConfig(self).defaultRoles ?? {};
1315
- return { private: defaults.private ?? null, group: defaults.group ?? null, paTeam: defaults.paTeam ?? 'member' };
1327
+ return { private: defaults.private ?? null, group: defaults.group ?? null, internalContact: defaults.internalContact ?? 'member' };
1316
1328
  }
1317
1329
  function policyDocument(agent) {
1318
1330
  const store = readRoleStore(agent.aid);
@@ -1494,7 +1506,7 @@ function relationTargetKind(self, config, channelId, known = { groups: new Set()
1494
1506
  }
1495
1507
  function countRoleUsage(self, relations, roleId) {
1496
1508
  const configuredDefaults = effectiveDefaultRoles(self);
1497
- const defaultScenes = ['private', 'group', 'paTeam'].filter(scene => configuredDefaults[scene] === roleId);
1509
+ const defaultScenes = ['private', 'group', 'internalContact'].filter(scene => configuredDefaults[scene] === roleId);
1498
1510
  let privateRelations = 0;
1499
1511
  let groupRelations = 0;
1500
1512
  for (const relation of relations) {
@@ -1532,8 +1544,8 @@ function validateRoleDomainTransactionChanges(self, registry, changes) {
1532
1544
  })));
1533
1545
  }
1534
1546
  const validatedRegistry = registry;
1535
- for (const scene of ['private', 'group', 'paTeam']) {
1536
- const roleId = scene === 'paTeam' ? validatedRegistry.defaultRoles[scene] ?? 'member' : validatedRegistry.defaultRoles[scene];
1547
+ for (const scene of ['private', 'group', 'internalContact']) {
1548
+ const roleId = scene === 'internalContact' ? validatedRegistry.defaultRoles[scene] ?? 'member' : validatedRegistry.defaultRoles[scene];
1537
1549
  if (roleId !== null && (roleId === 'owner' || !validatedRegistry.roles.includes(roleId))) {
1538
1550
  throw validationFailed(self, roleId, [{ field: `defaultRoles.${scene}`, code: 'INVALID_ROLE',
1539
1551
  message: 'Default role must reference an assignable registered role' }]);
@@ -1,12 +1,13 @@
1
1
  import fs from 'fs';
2
2
  import path from 'path';
3
3
  import { AUNChannel } from '../channels/aun.js';
4
+ import { resolveControlMenuAuthorization } from './command/menu-handler.js';
4
5
  import { ServiceProxyManager } from '../proxy/manager.js';
5
6
  import { formatPairingCodeMessage } from '../ecweb/pairing.js';
6
7
  import { remoteAccessService } from './auth/remote-access-store.js';
7
8
  import { authorizationDenialData, formatAuthorizationDenial } from './auth/authorization-denial.js';
8
9
  import { controlReplyContext } from './message/outbound.js';
9
- import { enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, hasValidMenuId, logMenuRequestCompleted, logMenuRequestReceived, MENU_RESPONSE_MAX_BYTES, MENU_RESPONSE_SAFETY_MARGIN_BYTES, MenuRequestDeduper, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, } from './command/menu-protocol.js';
10
+ import { deliverMenuResponse, enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, hasValidMenuId, logMenuRequestCompleted, logMenuRequestReceived, logMenuResponseRetry, MENU_RESPONSE_MAX_BYTES, MENU_RESPONSE_SAFETY_MARGIN_BYTES, MenuRequestDeduper, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, beginMenuDeliveryTiming, } from './command/menu-protocol.js';
10
11
  import { isProcessLevelOwner } from './command/command-handler.js';
11
12
  import { onShutdown } from '../utils/cross-platform.js';
12
13
  import { logger } from '../utils/logger.js';
@@ -15,7 +16,7 @@ import { ownerResolver, OWNERSHIP_AUTHORIZATION_MAX_AGE_MS, OWNERSHIP_CACHE_MAX_
15
16
  import { subscribeUpgradeJob } from '../utils/upgrade-jobs.js';
16
17
  import { ecwebInitializationService } from './initialization/service.js';
17
18
  const controlMenuDeduper = new MenuRequestDeduper();
18
- export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diagService, getProcessOwners, ecwebSupervisor, onServiceProxyManager, }) {
19
+ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diagService, getProcessOwners, ecwebSupervisor, onServiceProxyManager, connectChannel, startupTrace, waitForServices, }) {
19
20
  if (!daemonCfg.aid)
20
21
  return undefined;
21
22
  const aunPath = resolvePaths().root;
@@ -32,19 +33,22 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
32
33
  aunTrace: daemonCfg.debug?.aunTrace,
33
34
  aunSdkLog: daemonCfg.debug?.aunSdkLog,
34
35
  });
35
- const serviceProxyManager = new ServiceProxyManager({ providerAid: daemonCfg.aid, controlChannel, ecwebSupervisor: ecwebSupervisor ?? undefined });
36
+ const serviceProxyManager = new ServiceProxyManager({ providerAid: daemonCfg.aid, controlChannel, ecwebSupervisor: ecwebSupervisor ?? undefined, startupTrace });
36
37
  onServiceProxyManager?.(serviceProxyManager);
37
- onShutdown(() => serviceProxyManager.stop());
38
- void serviceProxyManager.start().catch((error) => {
38
+ let stopping = false;
39
+ onShutdown(() => { stopping = true; return serviceProxyManager.stop(); });
40
+ const startServices = async () => {
41
+ if (waitForServices && !await waitForServices())
42
+ return;
43
+ if (!stopping)
44
+ await serviceProxyManager.start();
45
+ };
46
+ const proxyStartup = startupTrace
47
+ ? startupTrace.track('daemon.serviceProxyStart', startServices)
48
+ : startServices();
49
+ void proxyStartup.catch((error) => {
39
50
  logger.warn(`ServiceProxy manager 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
40
51
  });
41
- const controlConnectPromise = controlChannel.connect()
42
- .then(() => {
43
- logger.info(`✓ 控制 AID 已连接: ${daemonCfg.aid}`);
44
- })
45
- .catch((e) => {
46
- logger.warn(`控制 AID 首连失败(后台自动重连,不影响 daemon 主流程): ${e?.message || e}`);
47
- });
48
52
  controlChannel.onMessage(async (opts) => {
49
53
  const text = (opts.content || '').trim();
50
54
  let activeMenuRequest;
@@ -79,9 +83,24 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
79
83
  id: response.id,
80
84
  ...(response.name ? { name: response.name } : {}),
81
85
  };
86
+ const owners = getProcessOwners().join('\u0000');
87
+ const deliveryTiming = beginMenuDeliveryTiming(menuTiming);
88
+ let deliveryOutcome;
82
89
  try {
83
- await controlChannel.sendStructuredOrThrow(opts.channelId, timedResponse, menuResponseContext());
84
- logMenuRequestCompleted(request, timedResponse, menuFlowContext, { delivery: 'sent' });
90
+ await deliverMenuResponse(async () => {
91
+ Object.assign(timedResponse, withMenuProcessingTime(timedResponse, menuTiming));
92
+ await controlChannel.sendStructuredOrThrow(opts.channelId, timedResponse, menuResponseContext());
93
+ }, {
94
+ canRetry: () => {
95
+ if (!controlChannel.getStatus().connected || getProcessOwners().join('\u0000') !== owners)
96
+ return false;
97
+ return !!response.error || resolveControlMenuAuthorization({ peerId: opts.peerId,
98
+ owners: getProcessOwners(), auth: { encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders } }).allowed;
99
+ },
100
+ onRetry: (attempt, error, delay) => logMenuResponseRetry(request, menuFlowContext, attempt, delay, error),
101
+ onComplete: outcome => { deliveryOutcome = outcome; },
102
+ });
103
+ logMenuRequestCompleted(request, timedResponse, menuFlowContext, { delivery: 'sent', ...deliveryOutcome, ...deliveryTiming() });
85
104
  menuCompletionLogged = true;
86
105
  }
87
106
  catch (error) {
@@ -89,6 +108,8 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
89
108
  delivery: 'failed',
90
109
  reason: 'transport-error',
91
110
  transportError: error,
111
+ ...deliveryOutcome,
112
+ ...deliveryTiming(),
92
113
  });
93
114
  menuCompletionLogged = true;
94
115
  throw error;
@@ -217,6 +238,12 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
217
238
  logger.warn(`控制 AID 消息处理失败: ${e?.message || e}`);
218
239
  }
219
240
  });
220
- void controlConnectPromise;
241
+ // Install the control handler before admitting the first SDK connection.
242
+ void (connectChannel ? connectChannel(controlChannel) : controlChannel.connect())
243
+ .then(started => { if (started !== false)
244
+ logger.info(`✓ 控制 AID 已连接: ${daemonCfg.aid}`); })
245
+ .catch((e) => {
246
+ logger.warn(`控制 AID 首连失败(后台自动重连,不影响 daemon 主流程): ${e?.message || e}`);
247
+ });
221
248
  return controlChannel;
222
249
  }