evolcore 0.0.43-test.5 → 0.0.43-test.7
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.
- package/CHANGELOG.md +95 -0
- package/bin/ecmsg.js +281 -81
- package/dist/agents/baseagent-availability.js +20 -5
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +36 -3
- package/dist/agents/codex-runner.js +75 -8
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +306 -30
- package/dist/cli/agent-create.js +18 -8
- package/dist/cli/aun-commands.js +9 -1
- package/dist/cli/daemon-commands.js +34 -65
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +38 -3
- package/dist/cli/events-command.js +73 -0
- package/dist/cli/index.js +31 -14
- package/dist/cli/init.js +75 -0
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/provider-command.js +1 -1
- package/dist/cli/restart-monitor.js +67 -50
- package/dist/cli/services-command.js +111 -0
- package/dist/cli/task-context.js +38 -1
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +6 -2
- package/dist/cli/watch-logs.js +6 -4
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +6 -4
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +1 -8
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/peer-role-resolver.js +1 -1
- package/dist/config/provider-identity-migration.js +92 -17
- package/dist/config/provider-local-sync.js +2 -0
- package/dist/config/providers-config.js +13 -0
- package/dist/config/providers-management.js +100 -10
- package/dist/config/role-service.js +8 -8
- package/dist/config/role-store.js +22 -22
- package/dist/config/schema-migration.js +86 -88
- package/dist/config/snapshot.js +70 -41
- package/dist/config-store.js +2 -1
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +146 -15
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-catalog.js +20 -0
- package/dist/core/baseagent-loader.js +75 -42
- package/dist/core/channel-loader.js +45 -13
- package/dist/core/channel-runtime.js +116 -45
- package/dist/core/command/agent-control.js +1 -1
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +58 -16
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +338 -0
- package/dist/core/command/menu-catalog.js +8 -0
- package/dist/core/command/menu-handler.js +206 -87
- package/dist/core/command/menu-protocol.js +142 -22
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/role-menu.js +27 -15
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +45 -15
- package/dist/core/daemon-lifecycle.js +478 -75
- package/dist/core/handoff/dispatcher.js +9 -3
- package/dist/core/handoff/runtime.js +130 -42
- package/dist/core/handoff/store.js +190 -2
- package/dist/core/handoff/types.js +5 -0
- package/dist/core/initialization/service.js +4 -4
- package/dist/core/invoke/executors/index.js +13 -0
- package/dist/core/invoke/executors/media.js +283 -0
- package/dist/core/invoke/executors/text.js +198 -0
- package/dist/core/invoke/invoke-service.js +157 -0
- package/dist/core/invoke/style-router.js +48 -0
- package/dist/core/invoke/types.js +19 -0
- package/dist/core/ipc-registration.js +51 -11
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +149 -19
- package/dist/core/message/im-renderer.js +28 -84
- package/dist/core/message/message-bridge.js +57 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +163 -52
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +55 -7
- package/dist/core/ownership/owner-resolver.js +8 -0
- package/dist/core/permission/ec-command-parser.js +14 -3
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
- package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
- package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +163 -3
- package/dist/core/session/session-idle-monitor.js +9 -1
- package/dist/core/session/session-manager.js +36 -2
- package/dist/core/task/task-recovery-service.js +13 -2
- package/dist/core/thread/command-parser.js +9 -2
- package/dist/core/thread/thread-operation.js +21 -2
- package/dist/core/thread/thread-route.js +13 -2
- package/dist/directory/owner-directory-admission.js +42 -30
- package/dist/directory/owner-directory-cache.js +143 -126
- package/dist/directory/owner-directory-query-operation.js +9 -8
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +14 -8
- package/dist/ecweb/runtime/supervisor.js +62 -30
- package/dist/event-center/admission-materializer.js +114 -0
- package/dist/event-center/bus-gate.js +136 -0
- package/dist/event-center/bus-host.js +290 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +100 -0
- package/dist/event-center/client-factory.js +50 -0
- package/dist/event-center/daemon.js +45 -0
- package/dist/event-center/directory-source.js +53 -0
- package/dist/event-center/dispatcher.js +157 -0
- package/dist/event-center/event-log.js +110 -0
- package/dist/event-center/index-generator.js +63 -0
- package/dist/event-center/ipc-operation.js +308 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +202 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +238 -0
- package/dist/event-center/runtime.js +641 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +35 -0
- package/dist/event-center/validation.js +413 -0
- package/dist/index.js +751 -268
- package/dist/ipc.js +66 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +43 -18
- package/dist/proxy/service-supervisor.js +78 -35
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/modes/single-session/index.js +1 -1
- package/dist/services/dispatcher.js +100 -0
- package/dist/services/idempotency.js +90 -0
- package/dist/services/identity.js +52 -0
- package/dist/services/index-generator.js +70 -0
- package/dist/services/index.js +449 -0
- package/dist/services/ipc-operation.js +458 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +204 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +95 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +21 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +78 -5
- package/dist/trigger/script-sandbox.js +118 -22
- package/dist/utils/cross-platform.js +175 -13
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +109 -10
- package/dist/utils/startup-trace.js +222 -44
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +10 -17
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +5 -2
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/ctl.md +2 -1
- package/kits/docs/evolcore/event-center.md +207 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +3 -2
- package/kits/docs/evolcore/group.md +2 -2
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +21 -0
- package/kits/docs/evolcore/msg.md +27 -8
- package/kits/docs/evolcore/provider.md +23 -3
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +277 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/eck_manifest.json +45 -7
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +5 -6
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/daemon.schema.1.json +5 -0
- package/kits/schemas/daemon.schema.2.json +5 -0
- package/kits/schemas/daemon.schema.3.json +2 -1
- package/kits/schemas/daemon.schema.4.json +2 -1
- package/kits/schemas/daemon.schema.5.json +2 -1
- package/kits/schemas/daemon.schema.6.json +1 -1
- package/kits/schemas/daemon.schema.7.json +1 -1
- package/kits/schemas/daemon.schema.8.json +2 -1
- package/kits/schemas/daemon.schema.9.json +2 -1
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/schemas/role-registry.schema.1.json +2 -2
- package/kits/schemas/single-session.schema.1.json +1 -1
- package/kits/schemas/single-session.schema.2.json +1 -1
- package/kits/schemas/single-session.schema.3.json +1 -1
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-group/SKILL.md +8 -5
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/personal-assistant/SKILL.md +6 -6
- package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
- package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
- package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
- package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +9 -7
- package/kits/templates/system-fragments/reply.md +2 -6
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +11 -9
- package/package.json +5 -6
- package/dist/cli/pa-workspace-command.js +0 -225
- package/dist/core/command/pa-workspace-store.js +0 -468
- package/dist/core/relation/pa-team.js +0 -132
- package/kits/docs/evolcore/pa-workspace.md +0 -51
- package/kits/skills/aid-ability/SKILL.md +0 -244
- package/kits/skills/ec-ability/SKILL.md +0 -67
- package/kits/skills/ec-ability/references/workflows.md +0 -15
|
@@ -7,8 +7,62 @@ import { logger } from '../../utils/logger.js';
|
|
|
7
7
|
import { validateIdleSeconds } from '../session/session-idle-monitor.js';
|
|
8
8
|
import { parseFileSearchArgs } from './file-search.js';
|
|
9
9
|
import { validateProviderMenuRequest } from '../../config/provider-menu-request.js';
|
|
10
|
-
import {
|
|
10
|
+
import { validateTeamWorkspaceItemsArgs } from './team-workspace-items.js';
|
|
11
|
+
import { isTeamMembersMenuRequest, validateTeamMembersMenuRequest } from './team-workspace-members-menu.js';
|
|
11
12
|
import { validateAgentMdMenuRequest } from './agentmd-menu-request.js';
|
|
13
|
+
import { validateEventsMenuRequest } from './eventcenter-menu.js';
|
|
14
|
+
const RETRY_DELAYS_MS = [250, 750, 2_000];
|
|
15
|
+
const RETRY_WINDOW_MS = 5_000;
|
|
16
|
+
export function isRetryableMenuTransportError(error) {
|
|
17
|
+
if (!error || typeof error !== 'object')
|
|
18
|
+
return false;
|
|
19
|
+
const value = error;
|
|
20
|
+
const code = String(value.code ?? '').toUpperCase();
|
|
21
|
+
if (['CONTACT_DENIED', 'CONTACT_OWNERSHIP_CHANGED', 'PERMISSION_DENIED', 'FORBIDDEN'].includes(code))
|
|
22
|
+
return false;
|
|
23
|
+
return value.retryable === true;
|
|
24
|
+
}
|
|
25
|
+
export async function deliverMenuResponse(send, options) {
|
|
26
|
+
const startedAt = performance.now();
|
|
27
|
+
let sendAttempts = 0;
|
|
28
|
+
const fail = (retryStopReason, error) => {
|
|
29
|
+
options.onComplete?.({ sendAttempts, retryStopReason });
|
|
30
|
+
throw error;
|
|
31
|
+
};
|
|
32
|
+
for (let attempt = 0;; attempt++) {
|
|
33
|
+
try {
|
|
34
|
+
sendAttempts++;
|
|
35
|
+
await send();
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
const delay = RETRY_DELAYS_MS[attempt];
|
|
39
|
+
if (!isRetryableMenuTransportError(error))
|
|
40
|
+
fail('transport-error', error);
|
|
41
|
+
if (delay === undefined)
|
|
42
|
+
fail('transport-retry-exhausted', error);
|
|
43
|
+
if (performance.now() - startedAt + delay > RETRY_WINDOW_MS)
|
|
44
|
+
fail('transport-retry-window-expired', error);
|
|
45
|
+
options.onRetry?.(attempt + 1, error, delay);
|
|
46
|
+
await new Promise(resolve => setTimeout(resolve, delay));
|
|
47
|
+
if (performance.now() - startedAt >= RETRY_WINDOW_MS)
|
|
48
|
+
fail('transport-retry-window-expired', error);
|
|
49
|
+
let allowed = false;
|
|
50
|
+
try {
|
|
51
|
+
allowed = await options.canRetry();
|
|
52
|
+
}
|
|
53
|
+
catch (guardError) {
|
|
54
|
+
fail('retry-guard-error', guardError);
|
|
55
|
+
}
|
|
56
|
+
if (!allowed)
|
|
57
|
+
fail('retry-guard-rejected', error);
|
|
58
|
+
if (performance.now() - startedAt >= RETRY_WINDOW_MS)
|
|
59
|
+
fail('transport-retry-window-expired', error);
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
options.onComplete?.({ sendAttempts });
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
12
66
|
export const MENU_REQUEST_TYPES = new Set([
|
|
13
67
|
'menu.token.request',
|
|
14
68
|
'menu.list',
|
|
@@ -151,7 +205,7 @@ export const MENU_NAME_COMMANDS = Object.freeze({
|
|
|
151
205
|
file: '/file',
|
|
152
206
|
'agent-data-root': '/agent-data-root',
|
|
153
207
|
'relation-data-root': '/relation-data-root',
|
|
154
|
-
'
|
|
208
|
+
'team-workspace': '/team-workspace',
|
|
155
209
|
'agent-storage-root': '/agent-storage-root',
|
|
156
210
|
storage: '/storage',
|
|
157
211
|
gateway: '/gateway',
|
|
@@ -159,6 +213,7 @@ export const MENU_NAME_COMMANDS = Object.freeze({
|
|
|
159
213
|
capability: '/capability',
|
|
160
214
|
role: '/role',
|
|
161
215
|
connect: '/connect',
|
|
216
|
+
events: '/events',
|
|
162
217
|
});
|
|
163
218
|
export function menuCommandForName(name) {
|
|
164
219
|
if (typeof name !== 'string')
|
|
@@ -194,6 +249,9 @@ export function normalizeMenuResponseTiming(timing, clock = {}) {
|
|
|
194
249
|
* its own inbound-to-outbound processing time.
|
|
195
250
|
*/
|
|
196
251
|
export function withMenuProcessingTime(response, timing, clock = {}) {
|
|
252
|
+
return { ...response, processing_ms: menuElapsedMs(timing, clock) };
|
|
253
|
+
}
|
|
254
|
+
function menuElapsedMs(timing, clock = {}) {
|
|
197
255
|
const receivedAtMono = typeof timing.receivedAtMono === 'number' && Number.isFinite(timing.receivedAtMono)
|
|
198
256
|
? timing.receivedAtMono
|
|
199
257
|
: undefined;
|
|
@@ -205,9 +263,15 @@ export function withMenuProcessingTime(response, timing, clock = {}) {
|
|
|
205
263
|
: receivedAt !== undefined
|
|
206
264
|
? (clock.wallNow ?? Date.now()) - receivedAt
|
|
207
265
|
: 0;
|
|
208
|
-
return
|
|
209
|
-
|
|
210
|
-
|
|
266
|
+
return Math.max(0, Math.round(Number.isFinite(elapsed) ? elapsed : 0));
|
|
267
|
+
}
|
|
268
|
+
/** Log-only timing: delivery includes all send attempts, retry waits and guard checks. */
|
|
269
|
+
export function beginMenuDeliveryTiming(timing) {
|
|
270
|
+
const started = performance.now();
|
|
271
|
+
const processingMs = menuElapsedMs(timing, { monotonicNow: started });
|
|
272
|
+
return () => {
|
|
273
|
+
const transportMs = Math.max(0, Math.round(performance.now() - started));
|
|
274
|
+
return { processingMs, transportMs, totalMs: processingMs + transportMs };
|
|
211
275
|
};
|
|
212
276
|
}
|
|
213
277
|
export function evaluateEvolMenuVersionGate(input) {
|
|
@@ -241,10 +305,8 @@ export function isAunMenuTokenRequired() {
|
|
|
241
305
|
}
|
|
242
306
|
export function evolMenuResponseTransportMetadata(sdkVersion, volatileCapability) {
|
|
243
307
|
return {
|
|
244
|
-
//
|
|
245
|
-
|
|
246
|
-
// sender from AAD. Do not inherit a plaintext/default transport choice.
|
|
247
|
-
encrypted: true,
|
|
308
|
+
// Clear inherited request state so AUNChannel applies daemon aun.defaultEncrypt.
|
|
309
|
+
encrypted: undefined,
|
|
248
310
|
protectedHeaders: {
|
|
249
311
|
ec_version: readInstalledEvolcoreVersion(),
|
|
250
312
|
...(typeof sdkVersion === 'string' && sdkVersion.trim() ? { sdk_version: sdkVersion.trim() } : {}),
|
|
@@ -376,21 +438,57 @@ export function validateMenuRequest(request) {
|
|
|
376
438
|
if (taskError)
|
|
377
439
|
return taskError;
|
|
378
440
|
}
|
|
441
|
+
if (request.name === 'events' || firstCommandToken(request.cmd) === '/events') {
|
|
442
|
+
const error = validateEventsMenuRequest(request);
|
|
443
|
+
if (error)
|
|
444
|
+
return error;
|
|
445
|
+
}
|
|
379
446
|
if (request.name === 'pa-workspace' || firstCommandToken(request.cmd) === '/pa-workspace') {
|
|
380
|
-
|
|
381
|
-
|
|
447
|
+
return { code: 'NOT_SUPPORTED', message: 'PA Workspace was replaced by Team Workspace' };
|
|
448
|
+
}
|
|
449
|
+
if (request.name === 'team-workspace' || firstCommandToken(request.cmd) === '/team-workspace') {
|
|
382
450
|
const args = request.args;
|
|
383
|
-
|
|
451
|
+
if (isTeamMembersMenuRequest(request))
|
|
452
|
+
return validateTeamMembersMenuRequest(request);
|
|
453
|
+
if (type === 'menu.action') {
|
|
454
|
+
if (request.action !== 'retry-initialization')
|
|
455
|
+
return { code: 'NOT_SUPPORTED', message: 'Unsupported team-workspace action' };
|
|
456
|
+
const unknown = Object.keys(args ?? {}).find(key => !['managementVersion', 'operationId'].includes(key));
|
|
457
|
+
if (unknown)
|
|
458
|
+
return { code: 'INVALID_ARGUMENT', message: `team-workspace does not accept args.${unknown}` };
|
|
459
|
+
if (args?.managementVersion !== 1)
|
|
460
|
+
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Unsupported Team workspace management version' };
|
|
461
|
+
if (typeof args?.operationId !== 'string' || !args.operationId.trim() || args.operationId.length > 200)
|
|
462
|
+
return { code: 'INVALID_ARGUMENT', message: 'retry-initialization requires args.operationId' };
|
|
463
|
+
return null;
|
|
464
|
+
}
|
|
465
|
+
if (type !== 'menu.query')
|
|
466
|
+
return { code: 'NOT_SUPPORTED', message: 'team-workspace only supports menu.query and menu.action' };
|
|
467
|
+
const unknown = Object.keys(args ?? {}).find(key => !['view', 'protocolVersion', 'managementVersion', 'context', 'from', 'to', 'timezone', 'path', 'offset', 'limit', 'indexRevision', 'jobId'].includes(key));
|
|
384
468
|
if (unknown)
|
|
385
|
-
return { code: 'INVALID_ARGUMENT', message: `
|
|
386
|
-
if (typeof args?.view !== 'string' || !['navigation', 'calendar', 'items'].includes(args.view))
|
|
387
|
-
return { code: 'INVALID_ARGUMENT', message: '
|
|
469
|
+
return { code: 'INVALID_ARGUMENT', message: `team-workspace does not accept args.${unknown}` };
|
|
470
|
+
if (typeof args?.view !== 'string' || !['navigation', 'calendar', 'items', 'workspace-info', 'job'].includes(args.view))
|
|
471
|
+
return { code: 'INVALID_ARGUMENT', message: 'team-workspace requires a supported view' };
|
|
472
|
+
if (['workspace-info', 'job'].includes(String(args.view))) {
|
|
473
|
+
if (args.managementVersion !== 1)
|
|
474
|
+
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Management views require managementVersion=1' };
|
|
475
|
+
const managementUnknown = Object.keys(args).find(key => args.view === 'job'
|
|
476
|
+
? !['view', 'managementVersion', 'jobId'].includes(key)
|
|
477
|
+
: !['view', 'managementVersion'].includes(key));
|
|
478
|
+
if (managementUnknown)
|
|
479
|
+
return { code: 'INVALID_ARGUMENT', message: `Management view does not accept args.${managementUnknown}` };
|
|
480
|
+
if (args.view === 'job' && (typeof args.jobId !== 'string' || !args.jobId.trim()))
|
|
481
|
+
return { code: 'INVALID_ARGUMENT', message: 'job view requires args.jobId' };
|
|
482
|
+
if (args.view === 'workspace-info' && args.jobId !== undefined)
|
|
483
|
+
return { code: 'INVALID_ARGUMENT', message: 'workspace-info does not accept args.jobId' };
|
|
484
|
+
return null;
|
|
485
|
+
}
|
|
388
486
|
if (args?.view !== 'items' && ['path', 'offset', 'limit', 'indexRevision'].some(key => args?.[key] !== undefined)) {
|
|
389
487
|
return { code: 'INVALID_ARGUMENT', message: 'items arguments require items view' };
|
|
390
488
|
}
|
|
391
489
|
if (args?.view === 'items') {
|
|
392
490
|
try {
|
|
393
|
-
|
|
491
|
+
validateTeamWorkspaceItemsArgs(args);
|
|
394
492
|
}
|
|
395
493
|
catch (error) {
|
|
396
494
|
return { code: 'INVALID_ARGUMENT', message: error instanceof Error ? error.message : 'Invalid items arguments' };
|
|
@@ -431,8 +529,12 @@ export function validateMenuRequest(request) {
|
|
|
431
529
|
}
|
|
432
530
|
}
|
|
433
531
|
}
|
|
532
|
+
if (args?.managementVersion !== undefined)
|
|
533
|
+
return { code: 'INVALID_ARGUMENT', message: 'managementVersion is only valid for management views' };
|
|
534
|
+
if (args?.jobId !== undefined)
|
|
535
|
+
return { code: 'INVALID_ARGUMENT', message: 'jobId is only valid for job view' };
|
|
434
536
|
if (args?.protocolVersion !== undefined && args.protocolVersion !== 1) {
|
|
435
|
-
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Unsupported
|
|
537
|
+
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Unsupported Team workspace protocol version' };
|
|
436
538
|
}
|
|
437
539
|
}
|
|
438
540
|
if (type === 'menu.list' && Object.hasOwn(request, 'context')) {
|
|
@@ -463,6 +565,7 @@ export function validateMenuRequest(request) {
|
|
|
463
565
|
}
|
|
464
566
|
}
|
|
465
567
|
else if (type === 'menu.update'
|
|
568
|
+
&& !(request.name === 'events' || firstCommandToken(request.cmd) === '/events')
|
|
466
569
|
&& !((request.name === 'session' || request.cmd === '/session')
|
|
467
570
|
&& request.args?.resource === 'fullaccess')
|
|
468
571
|
&& (typeof request.value !== 'string' || request.value.length === 0)) {
|
|
@@ -634,7 +737,7 @@ const STABLE_CODES = new Set([
|
|
|
634
737
|
'TEMPORARILY_UNAVAILABLE', 'INTERNAL_ERROR', 'MISSING_SCOPE', 'UPGRADE_REQUIRED',
|
|
635
738
|
'NO_ACTIVE_UPDATE',
|
|
636
739
|
'MENU_TOKEN_REQUIRED', 'MENU_TOKEN_REJECTED', 'MENU_TOKEN_ENCRYPTION_REQUIRED',
|
|
637
|
-
'INVALID_CONTEXT', 'SCHEMA_VERSION_UNSUPPORTED', 'DEPENDENCY_UNAVAILABLE',
|
|
740
|
+
'INVALID_CONTEXT', 'SCHEMA_VERSION_UNSUPPORTED', 'DEPENDENCY_UNAVAILABLE', 'DEPENDENCY_FAILED',
|
|
638
741
|
'RATE_LIMITED', 'CATALOG_STALE', 'DATA_MIGRATION_REQUIRED',
|
|
639
742
|
'INVALID_CLIENT', 'REMOTE_ACCESS_TOKEN_INVALID', 'ECWEB_TOKEN_INVALID', 'CLIENT_BUSY', 'INVALID_RESPONSE', 'TIMEOUT',
|
|
640
743
|
'RESPONSE_TOO_LARGE',
|
|
@@ -644,6 +747,9 @@ const STABLE_CODES = new Set([
|
|
|
644
747
|
'LOOP_TRIGGER_NOT_FOUND', 'LOOP_TRIGGER_DISABLED', 'LOOP_TRIGGER_INVALID',
|
|
645
748
|
'ROOT_NOT_FOUND', 'ROOT_FORBIDDEN', 'ROOT_EXPIRED', 'ROOT_SCOPE_MISMATCH', 'ROOT_PEER_MISMATCH',
|
|
646
749
|
'NOT_CONFIGURED', 'WORKSPACE_UNAVAILABLE',
|
|
750
|
+
'TEAM_MEMBER_NOT_CONTACT', 'CONTACT_BOOK_INVALID',
|
|
751
|
+
'WORKSPACE_INITIALIZING', 'JOB_EXPIRED', 'OPERATION_ID_REUSED', 'PA_IDENTITY_UNAVAILABLE',
|
|
752
|
+
'DIRECTORY_OCCUPIED', 'STATISTICS_UNAVAILABLE', 'WORKSPACE_IDENTITY_MISMATCH',
|
|
647
753
|
'INVALID_ROOT_ID', 'MISSING_ROOT_ID', 'INVALID_ROOT_PATH', 'NOT_A_DIRECTORY', 'FILE_TOO_LARGE',
|
|
648
754
|
// Agent initialization uses these codes to distinguish a retryable failure,
|
|
649
755
|
// an actor mismatch, and a plan/state conflict at the App boundary.
|
|
@@ -654,6 +760,8 @@ const STABLE_CODES = new Set([
|
|
|
654
760
|
'CONTROL_AID_RESERVED', 'CONTROL_AID_CONFLICT', 'HOST_AID_RESERVED', 'AGENT_IDENTITY_UNVERIFIED',
|
|
655
761
|
'OWNER_UNAVAILABLE', 'OWNERSHIP_CONFLICT', 'PROTECTED_FIELD', 'AGENTMD_UNVERIFIED', 'AGENTMD_NOT_FOUND',
|
|
656
762
|
'REMOTE_VERSION_UNAVAILABLE', 'REMOTE_VERSION_CONFLICT', 'PUBLISH_NOT_CONFIRMED',
|
|
763
|
+
// Event center (menu events)
|
|
764
|
+
'EVENT_CENTER_NOT_STARTED', 'PACK_NOT_FOUND', 'PACK_INVALID', 'BUS_CONFLICT',
|
|
657
765
|
]);
|
|
658
766
|
export function normalizeMenuError(error) {
|
|
659
767
|
const source = error && typeof error === 'object' ? error : {};
|
|
@@ -932,16 +1040,25 @@ export function logMenuRequestReceived(request, context) {
|
|
|
932
1040
|
request: menuRequestBusinessFields(request),
|
|
933
1041
|
});
|
|
934
1042
|
}
|
|
1043
|
+
export function logMenuResponseRetry(request, context, attempt, delayMs, error) {
|
|
1044
|
+
const code = error && typeof error === 'object' && 'code' in error ? String(error.code) : undefined;
|
|
1045
|
+
writeMenuFlowRecord({ ...menuFlowBaseRecord(request, context), event: 'menu.response.retry',
|
|
1046
|
+
phase: 'scheduled', attempt, delayMs, code, retryable: true });
|
|
1047
|
+
}
|
|
935
1048
|
export function logMenuRequestCompleted(request, response, context, options) {
|
|
936
1049
|
const error = response && 'error' in response ? response.error : undefined;
|
|
1050
|
+
const detail = options.transportError && typeof options.transportError === 'object'
|
|
1051
|
+
? options.transportError : undefined;
|
|
937
1052
|
const transportError = options.transportError instanceof Error
|
|
938
|
-
? { message: sanitizeLogString(options.transportError.message)
|
|
1053
|
+
? { message: sanitizeLogString(options.transportError.message),
|
|
1054
|
+
...(detail?.code === undefined ? {} : { code: sanitizeLogString(String(detail.code)) }),
|
|
1055
|
+
...(detail?.retryable === undefined ? {} : { retryable: isRetryableMenuTransportError(options.transportError) }) }
|
|
939
1056
|
: options.transportError === undefined
|
|
940
1057
|
? undefined
|
|
941
1058
|
: { message: sanitizeLogString(String(options.transportError)) };
|
|
942
|
-
const processingMs = response && typeof response.processing_ms === 'number'
|
|
1059
|
+
const processingMs = options.processingMs ?? (response && typeof response.processing_ms === 'number'
|
|
943
1060
|
? response.processing_ms
|
|
944
|
-
: undefined;
|
|
1061
|
+
: undefined);
|
|
945
1062
|
let responseBytes;
|
|
946
1063
|
if (response) {
|
|
947
1064
|
try {
|
|
@@ -954,8 +1071,11 @@ export function logMenuRequestCompleted(request, response, context, options) {
|
|
|
954
1071
|
event: options.delivery === 'failed' ? 'menu.request.failed' : 'menu.request.completed',
|
|
955
1072
|
delivery: options.delivery,
|
|
956
1073
|
processingMs,
|
|
1074
|
+
transportMs: options.transportMs,
|
|
1075
|
+
totalMs: options.totalMs,
|
|
957
1076
|
responseBytes,
|
|
958
|
-
|
|
1077
|
+
sendAttempts: options.sendAttempts,
|
|
1078
|
+
reason: options.retryStopReason ?? options.reason,
|
|
959
1079
|
result: response && 'data' in response ? sanitizeMenuLogValue(response.data) : undefined,
|
|
960
1080
|
warning: response && 'warning' in response ? sanitizeMenuLogValue(response.warning) : undefined,
|
|
961
1081
|
error: error ? sanitizeMenuLogValue(error) : transportError,
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
import { assertMenuSchemaVersion, bindMenuExecutionContextArgs, resolveMenuCatalogContext, } from './menu-catalog.js';
|
|
2
|
+
import { normalizeMenuError, validateMenuRequest } from './menu-protocol.js';
|
|
3
|
+
export const MENU_QUERY_BATCH_MAX_ITEMS = 32;
|
|
4
|
+
export const MENU_QUERY_BATCH_CONCURRENCY = 6;
|
|
5
|
+
// An explicit read-only surface. Never dispatch a client-supplied cmd or verb.
|
|
6
|
+
export const MENU_QUERY_BATCH_NAMES = [
|
|
7
|
+
'role', 'agent', 'baseagent', 'activity', 'effort', 'model', 'chatmode', 'team-workspace',
|
|
8
|
+
];
|
|
9
|
+
const QUERY_NAMES = new Set(MENU_QUERY_BATCH_NAMES);
|
|
10
|
+
const ROLE_VIEWS = new Set(['capabilities', 'target', 'role', 'requester']);
|
|
11
|
+
const UNSAFE_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
|
|
12
|
+
function record(value) {
|
|
13
|
+
return value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
14
|
+
}
|
|
15
|
+
function invalid(message) { throw { code: 'INVALID_ARGUMENT', message }; }
|
|
16
|
+
function pointerParts(path) {
|
|
17
|
+
if (!path.startsWith('/') || path.length > 512 || /~(?![01])/.test(path)) {
|
|
18
|
+
invalid('argsFrom.path must be a JSON Pointer relative to the source item data');
|
|
19
|
+
}
|
|
20
|
+
const parts = path.slice(1).split('/').map(part => part.replace(/~1/g, '/').replace(/~0/g, '~'));
|
|
21
|
+
if (parts.length > 16 || parts.some(part => UNSAFE_KEYS.has(part)))
|
|
22
|
+
invalid('unsupported argsFrom.path');
|
|
23
|
+
return parts;
|
|
24
|
+
}
|
|
25
|
+
function queryItems(value) {
|
|
26
|
+
if (!Array.isArray(value) || value.length < 1 || value.length > MENU_QUERY_BATCH_MAX_ITEMS) {
|
|
27
|
+
invalid(`items must contain 1 to ${MENU_QUERY_BATCH_MAX_ITEMS} queries`);
|
|
28
|
+
}
|
|
29
|
+
const seen = new Set();
|
|
30
|
+
return value.map(raw => {
|
|
31
|
+
if (!record(raw))
|
|
32
|
+
invalid('each query item must be an object');
|
|
33
|
+
if (Object.keys(raw).some(key => !['itemId', 'name', 'args', 'context', 'argsFrom'].includes(key))) {
|
|
34
|
+
invalid('query items only accept itemId, name, args, context and argsFrom');
|
|
35
|
+
}
|
|
36
|
+
const itemId = typeof raw.itemId === 'string' ? raw.itemId.trim() : '';
|
|
37
|
+
const name = typeof raw.name === 'string' ? raw.name.trim() : '';
|
|
38
|
+
if (!itemId || itemId.length > 200 || seen.has(itemId))
|
|
39
|
+
invalid('itemId must be non-empty, unique and at most 200 characters');
|
|
40
|
+
if (!name || name.length > 100)
|
|
41
|
+
invalid('each query requires a name of at most 100 characters');
|
|
42
|
+
if (raw.args !== undefined && !record(raw.args))
|
|
43
|
+
invalid('query args must be an object');
|
|
44
|
+
const args = raw.args;
|
|
45
|
+
if (args && Object.keys(args).some(key => key === 'context' || UNSAFE_KEYS.has(key))) {
|
|
46
|
+
invalid('put context on the query item; unsafe argument keys are not supported');
|
|
47
|
+
}
|
|
48
|
+
if (raw.context !== undefined && !record(raw.context))
|
|
49
|
+
invalid('query context must be an object');
|
|
50
|
+
if (raw.argsFrom !== undefined) {
|
|
51
|
+
if (!record(raw.argsFrom))
|
|
52
|
+
invalid('argsFrom must be an object');
|
|
53
|
+
for (const [key, ref] of Object.entries(raw.argsFrom)) {
|
|
54
|
+
if (!/^[a-zA-Z][a-zA-Z0-9_]*$/.test(key) || UNSAFE_KEYS.has(key) || key === 'context'
|
|
55
|
+
|| Object.prototype.hasOwnProperty.call(args ?? {}, key))
|
|
56
|
+
invalid('argsFrom must define distinct argument names');
|
|
57
|
+
if (!record(ref) || Object.keys(ref).some(field => field !== 'itemId' && field !== 'path')
|
|
58
|
+
|| typeof ref.itemId !== 'string' || !seen.has(ref.itemId) || typeof ref.path !== 'string') {
|
|
59
|
+
invalid('argsFrom must reference an earlier item using itemId and path');
|
|
60
|
+
}
|
|
61
|
+
pointerParts(ref.path);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
seen.add(itemId);
|
|
65
|
+
return { itemId, name, ...(args ? { args } : {}),
|
|
66
|
+
...(raw.context !== undefined ? { context: raw.context } : {}),
|
|
67
|
+
...(raw.argsFrom !== undefined ? { argsFrom: raw.argsFrom } : {}) };
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
export function validateMenuQueryBatchArgs(value) {
|
|
71
|
+
if (!record(value))
|
|
72
|
+
invalid('query batch args must be an object');
|
|
73
|
+
if (Object.keys(value).some(key => !['view', 'schemaVersion', 'consistency', 'context', 'items'].includes(key))) {
|
|
74
|
+
invalid('unsupported query batch argument');
|
|
75
|
+
}
|
|
76
|
+
if (value.view !== 'queries')
|
|
77
|
+
throw { code: 'NOT_SUPPORTED', message: 'query batch requires args.view=queries' };
|
|
78
|
+
assertMenuSchemaVersion(value.schemaVersion);
|
|
79
|
+
if (value.consistency !== undefined && value.consistency !== 'best-effort') {
|
|
80
|
+
throw { code: 'NOT_SUPPORTED', message: 'Only best-effort batch consistency is supported' };
|
|
81
|
+
}
|
|
82
|
+
if (value.context !== undefined && !record(value.context))
|
|
83
|
+
invalid('batch context must be an object');
|
|
84
|
+
queryItems(value.items); // Validate the entire dependency graph before dispatching anything.
|
|
85
|
+
}
|
|
86
|
+
function referencedValue(result, ref) {
|
|
87
|
+
if (!result.ok)
|
|
88
|
+
throw { code: 'DEPENDENCY_FAILED', message: `Query dependency ${ref.itemId} failed`, data: { itemId: ref.itemId } };
|
|
89
|
+
let value = result.data;
|
|
90
|
+
for (const key of pointerParts(ref.path)) {
|
|
91
|
+
if ((!record(value) && !Array.isArray(value)) || !Object.prototype.hasOwnProperty.call(value, key)) {
|
|
92
|
+
throw { code: 'DEPENDENCY_FAILED', message: `Query dependency ${ref.itemId} has no value at ${ref.path}`, data: ref };
|
|
93
|
+
}
|
|
94
|
+
value = value[key];
|
|
95
|
+
}
|
|
96
|
+
return value;
|
|
97
|
+
}
|
|
98
|
+
export async function execMenuQueryBatch(input) {
|
|
99
|
+
validateMenuQueryBatchArgs(input.args);
|
|
100
|
+
const items = queryItems(input.args.items);
|
|
101
|
+
const pending = new Map();
|
|
102
|
+
const contexts = new Map();
|
|
103
|
+
let active = 0;
|
|
104
|
+
const waiters = [];
|
|
105
|
+
const limited = async (run) => {
|
|
106
|
+
if (active >= MENU_QUERY_BATCH_CONCURRENCY)
|
|
107
|
+
await new Promise(resolve => waiters.push(resolve));
|
|
108
|
+
else
|
|
109
|
+
active++;
|
|
110
|
+
try {
|
|
111
|
+
return await run();
|
|
112
|
+
}
|
|
113
|
+
finally {
|
|
114
|
+
const next = waiters.shift();
|
|
115
|
+
if (next)
|
|
116
|
+
next(); // Transfer the existing slot to the next query.
|
|
117
|
+
else
|
|
118
|
+
active--;
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
const run = async (item) => {
|
|
122
|
+
const header = { itemId: item.itemId, name: item.name };
|
|
123
|
+
try {
|
|
124
|
+
if (!QUERY_NAMES.has(item.name))
|
|
125
|
+
throw { code: 'NOT_SUPPORTED', message: `Query batch does not support ${item.name}` };
|
|
126
|
+
const args = { ...(item.args ?? {}) };
|
|
127
|
+
const refs = Object.entries(item.argsFrom ?? {});
|
|
128
|
+
const values = await Promise.all(refs.map(async ([key, ref]) => [key, referencedValue(await pending.get(ref.itemId), ref)]));
|
|
129
|
+
for (const [key, value] of values)
|
|
130
|
+
args[key] = value;
|
|
131
|
+
if (item.name === 'role' && !ROLE_VIEWS.has(String(args.view))) {
|
|
132
|
+
throw { code: 'NOT_SUPPORTED', message: 'Query batch supports role capabilities, target, role and requester views' };
|
|
133
|
+
}
|
|
134
|
+
if (item.name === 'team-workspace' && args.view !== 'members') {
|
|
135
|
+
throw { code: 'NOT_SUPPORTED', message: 'Query batch only supports the team-workspace members view' };
|
|
136
|
+
}
|
|
137
|
+
if (item.name === 'team-workspace'
|
|
138
|
+
&& (input.subject.menuTransportChatType ?? input.subject.chatType) !== 'private') {
|
|
139
|
+
throw { code: 'FORBIDDEN', message: 'Team members require an AUN private Agent conversation' };
|
|
140
|
+
}
|
|
141
|
+
const invalidRequest = validateMenuRequest({ type: 'menu.query', name: item.name, args });
|
|
142
|
+
if (invalidRequest)
|
|
143
|
+
throw invalidRequest;
|
|
144
|
+
return await limited(async () => {
|
|
145
|
+
// Keep the receiving Agent fixed, including for Control requests. The
|
|
146
|
+
// outer request selects its Agent; item arguments cannot impersonate it.
|
|
147
|
+
if (!input.subject.selfAid)
|
|
148
|
+
throw { code: 'MISSING_AID', message: 'Query batch requires a target Agent' };
|
|
149
|
+
for (const key of ['self', 'aid']) {
|
|
150
|
+
if (args[key] !== undefined && args[key] !== input.subject.selfAid) {
|
|
151
|
+
throw { code: 'FORBIDDEN', message: 'Query batch items must target the receiving Agent' };
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
let subject = input.subject;
|
|
155
|
+
let channelId = input.channelId;
|
|
156
|
+
let queryArgs = args;
|
|
157
|
+
const request = item.context ?? input.args.context;
|
|
158
|
+
if (request !== undefined) {
|
|
159
|
+
const key = JSON.stringify(request);
|
|
160
|
+
let contextPromise = contexts.get(key);
|
|
161
|
+
if (!contextPromise) {
|
|
162
|
+
contextPromise = resolveMenuCatalogContext({ ...input, request: request });
|
|
163
|
+
contexts.set(key, contextPromise);
|
|
164
|
+
}
|
|
165
|
+
const context = await contextPromise;
|
|
166
|
+
if (context.kind === 'process')
|
|
167
|
+
throw { code: 'INVALID_CONTEXT', message: 'Query batches require an Agent or relation context' };
|
|
168
|
+
subject = context.subject;
|
|
169
|
+
channelId = context.channelId;
|
|
170
|
+
// These resource queries have their own exact argument contracts.
|
|
171
|
+
if (!['role', 'agent', 'team-workspace'].includes(item.name)) {
|
|
172
|
+
queryArgs = bindMenuExecutionContextArgs(args, context) ?? {};
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
if (item.name === 'agent')
|
|
176
|
+
queryArgs = { ...queryArgs, aid: subject.selfAid };
|
|
177
|
+
if (item.name === 'role' && args.view !== 'requester')
|
|
178
|
+
queryArgs = { ...queryArgs, self: subject.selfAid };
|
|
179
|
+
const result = await input.execQuery(`/${item.name}`, channelId, queryArgs, subject);
|
|
180
|
+
if ('error' in result)
|
|
181
|
+
throw { code: result.code, message: result.error, data: result.data };
|
|
182
|
+
return { ...header, ok: true, data: result.data };
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
return { ...header, ok: false, error: normalizeMenuError(error) };
|
|
187
|
+
}
|
|
188
|
+
};
|
|
189
|
+
for (const item of items)
|
|
190
|
+
pending.set(item.itemId, run(item));
|
|
191
|
+
const results = await Promise.all(pending.values());
|
|
192
|
+
return { $schema_version: 1, kind: 'menu.query_batch', consistency: 'best-effort',
|
|
193
|
+
observedAt: Date.now(), items: results };
|
|
194
|
+
}
|
|
@@ -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
|
-
|
|
481
|
-
|
|
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(
|
|
487
|
-
group: validateAssignableRole(
|
|
488
|
-
|
|
489
|
-
?
|
|
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', '
|
|
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', '
|
|
748
|
-
const current = 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 === '
|
|
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', '
|
|
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,
|
|
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', '
|
|
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', '
|
|
1536
|
-
const roleId = 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' }]);
|
|
@@ -226,7 +226,7 @@ export async function guardIdleCommand(opts) {
|
|
|
226
226
|
return undefined;
|
|
227
227
|
let hasActiveStream = false;
|
|
228
228
|
try {
|
|
229
|
-
hasActiveStream = opts.getAgentForSession(threadSession)
|
|
229
|
+
hasActiveStream = opts.getAgentForSession(threadSession)?.hasActiveStream(threadSession.id) ?? false;
|
|
230
230
|
}
|
|
231
231
|
catch {
|
|
232
232
|
// Runner mismatch should not block recovery commands such as /baseagent.
|