evolcore 0.0.43-test.6 → 0.0.43-test.8
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 +188 -58
- package/dist/agent-template/jobs.js +62 -0
- package/dist/agent-template/runtime.js +214 -0
- package/dist/agent-template/service.js +465 -0
- package/dist/agent-template/tool-runner.js +45 -0
- package/dist/agent-template/types.js +5 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/claude-runner.js +1 -1
- package/dist/agents/codex/app-server-client.js +22 -0
- package/dist/agents/codex-runner.js +69 -2
- package/dist/aun/aid/agentmd.js +56 -1
- package/dist/aun/aid/client.js +3 -1
- package/dist/aun/menu/client.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/channels/aun.js +277 -49
- package/dist/cli/agent-command.js +5 -0
- package/dist/cli/agent-create.js +7 -3
- package/dist/cli/agent-template.js +124 -0
- package/dist/cli/aun-commands.js +2 -2
- package/dist/cli/ctl-command.js +2 -1
- package/dist/cli/daemon-commands.js +11 -66
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +35 -2
- package/dist/cli/events-command.js +109 -0
- package/dist/cli/index.js +60 -14
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/net-check.js +1 -1
- package/dist/cli/restart-monitor.js +160 -83
- package/dist/cli/services-command.js +137 -0
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +103 -13
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +8 -8
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +0 -7
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/schema-migration.js +45 -15
- package/dist/config-store.js +2 -1
- package/dist/core/agent-ipc-registration.js +25 -4
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +106 -10
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-authorizer.js +2 -0
- package/dist/core/auth/operation-catalog.js +29 -0
- package/dist/core/baseagent-loader.js +60 -130
- package/dist/core/channel-loader.js +10 -1
- package/dist/core/channel-runtime.js +20 -12
- package/dist/core/command/agent-control.js +12 -2
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/agent-template-menu.js +147 -0
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +80 -17
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +468 -0
- package/dist/core/command/menu-catalog.js +15 -0
- package/dist/core/command/menu-handler.js +216 -90
- package/dist/core/command/menu-protocol.js +71 -13
- package/dist/core/command/menu-query-batch.js +194 -0
- 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 +22 -5
- package/dist/core/daemon-lifecycle.js +323 -191
- package/dist/core/handoff/runtime.js +45 -13
- 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 +50 -7
- package/dist/core/legacy-rename.js +41 -0
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +252 -17
- package/dist/core/message/im-renderer.js +116 -85
- package/dist/core/message/message-bridge.js +4 -0
- package/dist/core/message/message-queue.js +66 -15
- 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 +29 -5
- package/dist/core/message/response-engine.js +194 -61
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +50 -5
- package/dist/core/ownership/owner-resolver.js +7 -0
- package/dist/core/pack-auth.js +94 -0
- package/dist/core/pack-install.js +194 -0
- package/dist/core/permission/ec-command-parser.js +51 -17
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/rate-window.js +48 -0
- package/dist/core/relation/peer-identity.js +28 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +67 -28
- package/dist/core/session/session-idle-monitor.js +59 -19
- package/dist/core/session/session-manager.js +13 -4
- 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/core/thread/thread-service.js +52 -3
- package/dist/directory/owner-directory-admission.js +40 -53
- package/dist/directory/owner-directory-cache.js +89 -113
- package/dist/directory/owner-directory-query-operation.js +8 -10
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/eck/message-renderer.js +2 -0
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +6 -2
- package/dist/ecweb/runtime/supervisor.js +19 -4
- package/dist/event-center/admission-materializer.js +124 -0
- package/dist/event-center/bus-gate.js +154 -0
- package/dist/event-center/bus-host.js +307 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +127 -0
- package/dist/event-center/daemon.js +44 -0
- package/dist/event-center/directory-source.js +55 -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 +73 -0
- package/dist/event-center/ipc-operation.js +423 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +207 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +463 -0
- package/dist/event-center/runtime.js +837 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +51 -0
- package/dist/event-center/validation.js +435 -0
- package/dist/index.js +424 -135
- package/dist/ipc.js +106 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +5 -1
- package/dist/proxy/service-supervisor.js +13 -4
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/engines/v1/proactive-flow.js +4 -2
- 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 +550 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +215 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +98 -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 +18 -0
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/scheduler.js +38 -0
- package/dist/trigger/script-sandbox.js +170 -24
- package/dist/utils/cross-platform.js +24 -10
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +2 -1
- package/dist/utils/package-version-info.js +6 -3
- package/dist/utils/process-introspect.js +45 -9
- package/dist/utils/startup-trace.js +74 -37
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +9 -15
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +3 -1
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/agent.md +22 -1
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/event-center.md +227 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +5 -3
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-protocol.md +28 -1
- package/kits/docs/evolcore/msg.md +21 -9
- package/kits/docs/evolcore/provider.md +3 -1
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +294 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/docs/evolcore/thread-chain.md +15 -3
- package/kits/eck_manifest.json +26 -0
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +1 -0
- 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/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- 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 +5 -8
- 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/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +5 -3
- package/kits/templates/system-fragments/reply.md +1 -5
- package/kits/templates/system-fragments/thread.md +13 -10
- package/package.json +5 -6
- package/scripts/agent-template/index.mjs +40 -0
- package/scripts/agent-template/inspect.mjs +240 -0
- package/scripts/agent-template/overlay.mjs +71 -0
- package/scripts/agent-template/pack.mjs +169 -0
- package/scripts/agent-template/shared/common.mjs +235 -0
- package/scripts/agent-template/shared/evolcore.mjs +75 -0
- package/scripts/agent-template/shared/plan.mjs +129 -0
- package/scripts/agent-template/shared/team-schema.json +70 -0
- package/scripts/agent-template/shared/template-contract.mjs +154 -0
- package/scripts/agent-template/shared/template-package.mjs +265 -0
- package/scripts/agent-template/shared/template-runtime.mjs +80 -0
- package/scripts/agent-template/shared/template.mjs +142 -0
- 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,11 @@ 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 { isTemplateRequest, validateTemplateRequest } from './agent-template-menu.js';
|
|
11
|
+
import { validateTeamWorkspaceItemsArgs } from './team-workspace-items.js';
|
|
12
|
+
import { isTeamMembersMenuRequest, validateTeamMembersMenuRequest } from './team-workspace-members-menu.js';
|
|
11
13
|
import { validateAgentMdMenuRequest } from './agentmd-menu-request.js';
|
|
14
|
+
import { validateEventsMenuRequest } from './eventcenter-menu.js';
|
|
12
15
|
const RETRY_DELAYS_MS = [250, 750, 2_000];
|
|
13
16
|
const RETRY_WINDOW_MS = 5_000;
|
|
14
17
|
export function isRetryableMenuTransportError(error) {
|
|
@@ -73,14 +76,20 @@ export function parseMenuEvent(value) {
|
|
|
73
76
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
74
77
|
throw Object.assign(new Error('Menu event must be an object'), { code: 'INVALID_EVENT' });
|
|
75
78
|
const event = value;
|
|
76
|
-
if (event.type !== 'menu.event' || !['upgrade.progress', 'upgrade.result'].includes(String(event.event))
|
|
79
|
+
if (event.type !== 'menu.event' || !['upgrade.progress', 'upgrade.result', 'template.progress', 'template.result'].includes(String(event.event))
|
|
77
80
|
|| typeof event.requestId !== 'string' || !event.requestId.trim()
|
|
78
81
|
|| typeof event.jobId !== 'string' || !/^job_[a-f0-9-]{36}$/.test(event.jobId)
|
|
79
82
|
|| !Number.isSafeInteger(event.seq) || event.seq < 1
|
|
80
|
-
|| !
|
|
83
|
+
|| !(String(event.event).startsWith('template.')
|
|
84
|
+
? ['building', 'scanning', 'uploading', 'downloading', 'verifying', 'preflight', 'backup', 'applying', 'reloading', 'publishing-profile', 'rollback']
|
|
85
|
+
: ['upgrade-check', 'downloading', 'tarball-check', 'preflight', 'restart']).includes(String(event.phase))
|
|
81
86
|
|| typeof event.status !== String.name.toLowerCase() || typeof event.message !== String.name.toLowerCase()) {
|
|
82
87
|
throw Object.assign(new Error('Invalid Menu event'), { code: 'INVALID_EVENT' });
|
|
83
88
|
}
|
|
89
|
+
if (String(event.event).startsWith('template.') && ((event.event === 'template.progress' && event.status !== 'running')
|
|
90
|
+
|| event.event === 'template.result' && !['succeeded', 'failed'].includes(String(event.status)))) {
|
|
91
|
+
throw Object.assign(new Error('Invalid template event status'), { code: 'INVALID_EVENT' });
|
|
92
|
+
}
|
|
84
93
|
return value;
|
|
85
94
|
}
|
|
86
95
|
export function buildMenuClientProtectedHeaders(input) {
|
|
@@ -203,7 +212,7 @@ export const MENU_NAME_COMMANDS = Object.freeze({
|
|
|
203
212
|
file: '/file',
|
|
204
213
|
'agent-data-root': '/agent-data-root',
|
|
205
214
|
'relation-data-root': '/relation-data-root',
|
|
206
|
-
'
|
|
215
|
+
'team-workspace': '/team-workspace',
|
|
207
216
|
'agent-storage-root': '/agent-storage-root',
|
|
208
217
|
storage: '/storage',
|
|
209
218
|
gateway: '/gateway',
|
|
@@ -211,6 +220,7 @@ export const MENU_NAME_COMMANDS = Object.freeze({
|
|
|
211
220
|
capability: '/capability',
|
|
212
221
|
role: '/role',
|
|
213
222
|
connect: '/connect',
|
|
223
|
+
events: '/events',
|
|
214
224
|
});
|
|
215
225
|
export function menuCommandForName(name) {
|
|
216
226
|
if (typeof name !== 'string')
|
|
@@ -415,6 +425,8 @@ export function validateMenuRequest(request) {
|
|
|
415
425
|
if (request.args !== undefined && (!request.args || typeof request.args !== 'object' || Array.isArray(request.args))) {
|
|
416
426
|
return { code: 'INVALID_ARGUMENT', message: 'Menu request args must be an object' };
|
|
417
427
|
}
|
|
428
|
+
if (isTemplateRequest(request))
|
|
429
|
+
return validateTemplateRequest(request);
|
|
418
430
|
if ((request.name === 'aid' || firstCommandToken(request.cmd) === '/aid')
|
|
419
431
|
&& (request.args?.view === 'agentmd'
|
|
420
432
|
|| (typeof request.action === 'string' && request.action.startsWith('agentmd.')))) {
|
|
@@ -435,21 +447,57 @@ export function validateMenuRequest(request) {
|
|
|
435
447
|
if (taskError)
|
|
436
448
|
return taskError;
|
|
437
449
|
}
|
|
450
|
+
if (request.name === 'events' || firstCommandToken(request.cmd) === '/events') {
|
|
451
|
+
const error = validateEventsMenuRequest(request);
|
|
452
|
+
if (error)
|
|
453
|
+
return error;
|
|
454
|
+
}
|
|
438
455
|
if (request.name === 'pa-workspace' || firstCommandToken(request.cmd) === '/pa-workspace') {
|
|
439
|
-
|
|
440
|
-
|
|
456
|
+
return { code: 'NOT_SUPPORTED', message: 'PA Workspace was replaced by Team Workspace' };
|
|
457
|
+
}
|
|
458
|
+
if (request.name === 'team-workspace' || firstCommandToken(request.cmd) === '/team-workspace') {
|
|
441
459
|
const args = request.args;
|
|
442
|
-
|
|
460
|
+
if (isTeamMembersMenuRequest(request))
|
|
461
|
+
return validateTeamMembersMenuRequest(request);
|
|
462
|
+
if (type === 'menu.action') {
|
|
463
|
+
if (request.action !== 'retry-initialization')
|
|
464
|
+
return { code: 'NOT_SUPPORTED', message: 'Unsupported team-workspace action' };
|
|
465
|
+
const unknown = Object.keys(args ?? {}).find(key => !['managementVersion', 'operationId'].includes(key));
|
|
466
|
+
if (unknown)
|
|
467
|
+
return { code: 'INVALID_ARGUMENT', message: `team-workspace does not accept args.${unknown}` };
|
|
468
|
+
if (args?.managementVersion !== 1)
|
|
469
|
+
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Unsupported Team workspace management version' };
|
|
470
|
+
if (typeof args?.operationId !== 'string' || !args.operationId.trim() || args.operationId.length > 200)
|
|
471
|
+
return { code: 'INVALID_ARGUMENT', message: 'retry-initialization requires args.operationId' };
|
|
472
|
+
return null;
|
|
473
|
+
}
|
|
474
|
+
if (type !== 'menu.query')
|
|
475
|
+
return { code: 'NOT_SUPPORTED', message: 'team-workspace only supports menu.query and menu.action' };
|
|
476
|
+
const unknown = Object.keys(args ?? {}).find(key => !['view', 'protocolVersion', 'managementVersion', 'context', 'from', 'to', 'timezone', 'path', 'offset', 'limit', 'indexRevision', 'jobId'].includes(key));
|
|
443
477
|
if (unknown)
|
|
444
|
-
return { code: 'INVALID_ARGUMENT', message: `
|
|
445
|
-
if (typeof args?.view !== 'string' || !['navigation', 'calendar', 'items'].includes(args.view))
|
|
446
|
-
return { code: 'INVALID_ARGUMENT', message: '
|
|
478
|
+
return { code: 'INVALID_ARGUMENT', message: `team-workspace does not accept args.${unknown}` };
|
|
479
|
+
if (typeof args?.view !== 'string' || !['navigation', 'calendar', 'items', 'workspace-info', 'job'].includes(args.view))
|
|
480
|
+
return { code: 'INVALID_ARGUMENT', message: 'team-workspace requires a supported view' };
|
|
481
|
+
if (['workspace-info', 'job'].includes(String(args.view))) {
|
|
482
|
+
if (args.managementVersion !== 1)
|
|
483
|
+
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Management views require managementVersion=1' };
|
|
484
|
+
const managementUnknown = Object.keys(args).find(key => args.view === 'job'
|
|
485
|
+
? !['view', 'managementVersion', 'jobId'].includes(key)
|
|
486
|
+
: !['view', 'managementVersion'].includes(key));
|
|
487
|
+
if (managementUnknown)
|
|
488
|
+
return { code: 'INVALID_ARGUMENT', message: `Management view does not accept args.${managementUnknown}` };
|
|
489
|
+
if (args.view === 'job' && (typeof args.jobId !== 'string' || !args.jobId.trim()))
|
|
490
|
+
return { code: 'INVALID_ARGUMENT', message: 'job view requires args.jobId' };
|
|
491
|
+
if (args.view === 'workspace-info' && args.jobId !== undefined)
|
|
492
|
+
return { code: 'INVALID_ARGUMENT', message: 'workspace-info does not accept args.jobId' };
|
|
493
|
+
return null;
|
|
494
|
+
}
|
|
447
495
|
if (args?.view !== 'items' && ['path', 'offset', 'limit', 'indexRevision'].some(key => args?.[key] !== undefined)) {
|
|
448
496
|
return { code: 'INVALID_ARGUMENT', message: 'items arguments require items view' };
|
|
449
497
|
}
|
|
450
498
|
if (args?.view === 'items') {
|
|
451
499
|
try {
|
|
452
|
-
|
|
500
|
+
validateTeamWorkspaceItemsArgs(args);
|
|
453
501
|
}
|
|
454
502
|
catch (error) {
|
|
455
503
|
return { code: 'INVALID_ARGUMENT', message: error instanceof Error ? error.message : 'Invalid items arguments' };
|
|
@@ -490,8 +538,12 @@ export function validateMenuRequest(request) {
|
|
|
490
538
|
}
|
|
491
539
|
}
|
|
492
540
|
}
|
|
541
|
+
if (args?.managementVersion !== undefined)
|
|
542
|
+
return { code: 'INVALID_ARGUMENT', message: 'managementVersion is only valid for management views' };
|
|
543
|
+
if (args?.jobId !== undefined)
|
|
544
|
+
return { code: 'INVALID_ARGUMENT', message: 'jobId is only valid for job view' };
|
|
493
545
|
if (args?.protocolVersion !== undefined && args.protocolVersion !== 1) {
|
|
494
|
-
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Unsupported
|
|
546
|
+
return { code: 'SCHEMA_VERSION_UNSUPPORTED', message: 'Unsupported Team workspace protocol version' };
|
|
495
547
|
}
|
|
496
548
|
}
|
|
497
549
|
if (type === 'menu.list' && Object.hasOwn(request, 'context')) {
|
|
@@ -522,6 +574,7 @@ export function validateMenuRequest(request) {
|
|
|
522
574
|
}
|
|
523
575
|
}
|
|
524
576
|
else if (type === 'menu.update'
|
|
577
|
+
&& !(request.name === 'events' || firstCommandToken(request.cmd) === '/events')
|
|
525
578
|
&& !((request.name === 'session' || request.cmd === '/session')
|
|
526
579
|
&& request.args?.resource === 'fullaccess')
|
|
527
580
|
&& (typeof request.value !== 'string' || request.value.length === 0)) {
|
|
@@ -693,7 +746,7 @@ const STABLE_CODES = new Set([
|
|
|
693
746
|
'TEMPORARILY_UNAVAILABLE', 'INTERNAL_ERROR', 'MISSING_SCOPE', 'UPGRADE_REQUIRED',
|
|
694
747
|
'NO_ACTIVE_UPDATE',
|
|
695
748
|
'MENU_TOKEN_REQUIRED', 'MENU_TOKEN_REJECTED', 'MENU_TOKEN_ENCRYPTION_REQUIRED',
|
|
696
|
-
'INVALID_CONTEXT', 'SCHEMA_VERSION_UNSUPPORTED', 'DEPENDENCY_UNAVAILABLE',
|
|
749
|
+
'INVALID_CONTEXT', 'SCHEMA_VERSION_UNSUPPORTED', 'DEPENDENCY_UNAVAILABLE', 'DEPENDENCY_FAILED',
|
|
697
750
|
'RATE_LIMITED', 'CATALOG_STALE', 'DATA_MIGRATION_REQUIRED',
|
|
698
751
|
'INVALID_CLIENT', 'REMOTE_ACCESS_TOKEN_INVALID', 'ECWEB_TOKEN_INVALID', 'CLIENT_BUSY', 'INVALID_RESPONSE', 'TIMEOUT',
|
|
699
752
|
'RESPONSE_TOO_LARGE',
|
|
@@ -703,6 +756,9 @@ const STABLE_CODES = new Set([
|
|
|
703
756
|
'LOOP_TRIGGER_NOT_FOUND', 'LOOP_TRIGGER_DISABLED', 'LOOP_TRIGGER_INVALID',
|
|
704
757
|
'ROOT_NOT_FOUND', 'ROOT_FORBIDDEN', 'ROOT_EXPIRED', 'ROOT_SCOPE_MISMATCH', 'ROOT_PEER_MISMATCH',
|
|
705
758
|
'NOT_CONFIGURED', 'WORKSPACE_UNAVAILABLE',
|
|
759
|
+
'TEAM_MEMBER_NOT_CONTACT', 'CONTACT_BOOK_INVALID',
|
|
760
|
+
'WORKSPACE_INITIALIZING', 'JOB_EXPIRED', 'OPERATION_ID_REUSED', 'PA_IDENTITY_UNAVAILABLE',
|
|
761
|
+
'DIRECTORY_OCCUPIED', 'STATISTICS_UNAVAILABLE', 'WORKSPACE_IDENTITY_MISMATCH',
|
|
706
762
|
'INVALID_ROOT_ID', 'MISSING_ROOT_ID', 'INVALID_ROOT_PATH', 'NOT_A_DIRECTORY', 'FILE_TOO_LARGE',
|
|
707
763
|
// Agent initialization uses these codes to distinguish a retryable failure,
|
|
708
764
|
// an actor mismatch, and a plan/state conflict at the App boundary.
|
|
@@ -713,6 +769,8 @@ const STABLE_CODES = new Set([
|
|
|
713
769
|
'CONTROL_AID_RESERVED', 'CONTROL_AID_CONFLICT', 'HOST_AID_RESERVED', 'AGENT_IDENTITY_UNVERIFIED',
|
|
714
770
|
'OWNER_UNAVAILABLE', 'OWNERSHIP_CONFLICT', 'PROTECTED_FIELD', 'AGENTMD_UNVERIFIED', 'AGENTMD_NOT_FOUND',
|
|
715
771
|
'REMOTE_VERSION_UNAVAILABLE', 'REMOTE_VERSION_CONFLICT', 'PUBLISH_NOT_CONFIRMED',
|
|
772
|
+
// Event center (menu events)
|
|
773
|
+
'EVENT_CENTER_NOT_STARTED', 'PACK_NOT_FOUND', 'PACK_INVALID', 'BUS_CONFLICT',
|
|
716
774
|
]);
|
|
717
775
|
export function normalizeMenuError(error) {
|
|
718
776
|
const source = error && typeof error === 'object' ? error : {};
|
|
@@ -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
|
+
}
|
|
@@ -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.
|