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
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { isValidAid } from '../../aun/aid/validation.js';
|
|
3
|
+
import { ConfigTarget, mutateConfig, read } from '../../config/config-manager.js';
|
|
4
|
+
import { getPeerSnapshot, isAcceptedPeer } from '../../config/peer-book.js';
|
|
5
|
+
import { readOwnerDirectoryMembership } from '../../directory/owner-directory-admission.js';
|
|
6
|
+
import { readAunPeerKind } from '../relation/peer-identity.js';
|
|
7
|
+
export class TeamWorkspaceTeamError extends Error {
|
|
8
|
+
code;
|
|
9
|
+
data;
|
|
10
|
+
constructor(code, message, data) {
|
|
11
|
+
super(message);
|
|
12
|
+
this.code = code;
|
|
13
|
+
this.data = data;
|
|
14
|
+
this.name = 'TeamWorkspaceTeamError';
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
/** Structural validation also applies to removals of contacts that are no longer active. */
|
|
18
|
+
export function normalizeTeamMemberAids(value, selfAid) {
|
|
19
|
+
if (!Array.isArray(value) || value.length > 200) {
|
|
20
|
+
throw new TeamWorkspaceTeamError('INVALID_ARGUMENT', 'team must be an array of at most 200 Agent AIDs');
|
|
21
|
+
}
|
|
22
|
+
const members = value.map(item => typeof item === 'string' ? item.trim() : '');
|
|
23
|
+
if (members.some(aid => !isValidAid(aid)) || new Set(members).size !== members.length) {
|
|
24
|
+
throw new TeamWorkspaceTeamError('INVALID_ARGUMENT', 'team must contain unique valid Agent AIDs');
|
|
25
|
+
}
|
|
26
|
+
if (selfAid && members.includes(selfAid))
|
|
27
|
+
throw new TeamWorkspaceTeamError('INVALID_ARGUMENT', 'team cannot contain its own Agent AID');
|
|
28
|
+
return members;
|
|
29
|
+
}
|
|
30
|
+
function contactSnapshot(selfAid) {
|
|
31
|
+
try {
|
|
32
|
+
return getPeerSnapshot(selfAid);
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
throw new TeamWorkspaceTeamError('CONTACT_BOOK_INVALID', 'The current Agent contact book is unavailable');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
function assertPeerContacts(selfAid, members) {
|
|
39
|
+
const snapshot = contactSnapshot(selfAid);
|
|
40
|
+
for (const aid of members) {
|
|
41
|
+
if (readAunPeerKind(selfAid, aid).kind !== 'private' || !snapshot.contacts.has(aid) || !isAcceptedPeer(selfAid, aid)) {
|
|
42
|
+
throw new TeamWorkspaceTeamError('TEAM_MEMBER_NOT_CONTACT', `Team member must be an active private Agent contact: ${aid}`, { memberAid: aid });
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
function assertActiveContacts(selfAid, members) {
|
|
47
|
+
for (const aid of members) {
|
|
48
|
+
const membership = readOwnerDirectoryMembership(selfAid, aid);
|
|
49
|
+
// Older/local installations do not have an Owner directory snapshot yet.
|
|
50
|
+
// Keep the established peer-book admission path usable in that case.
|
|
51
|
+
if (membership === undefined) {
|
|
52
|
+
assertPeerContacts(selfAid, members);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
// Directory unavailable
|
|
56
|
+
if (membership.category === 'unavailable') {
|
|
57
|
+
throw new TeamWorkspaceTeamError('CONTACT_BOOK_INVALID', 'Cannot verify team members: Owner directory temporarily unavailable');
|
|
58
|
+
}
|
|
59
|
+
// Not found in directory
|
|
60
|
+
if (membership.category === 'not_found') {
|
|
61
|
+
throw new TeamWorkspaceTeamError('TEAM_MEMBER_NOT_CONTACT', `Team member must be in Owner's directory: ${aid}`, { memberAid: aid });
|
|
62
|
+
}
|
|
63
|
+
// Only agent and human types can be team members (not host/device/service)
|
|
64
|
+
if (membership.category !== 'agent' && membership.category !== 'human' && membership.category !== 'assistant') {
|
|
65
|
+
throw new TeamWorkspaceTeamError('TEAM_MEMBER_NOT_CONTACT', `Team member must be an agent or human contact: ${aid}`, { memberAid: aid });
|
|
66
|
+
}
|
|
67
|
+
// Blocked contacts cannot be team members
|
|
68
|
+
if (membership.blocked) {
|
|
69
|
+
throw new TeamWorkspaceTeamError('TEAM_MEMBER_NOT_CONTACT', `Team member cannot be blocked: ${aid}`, { memberAid: aid });
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function requireAgentConfig(selfAid) {
|
|
74
|
+
const config = read(ConfigTarget.Agent, { self: selfAid }, { cache: false });
|
|
75
|
+
if (!config)
|
|
76
|
+
throw new TeamWorkspaceTeamError('AGENT_NOT_FOUND', `Agent config was not found: ${selfAid}`);
|
|
77
|
+
return config;
|
|
78
|
+
}
|
|
79
|
+
function membersState(selfAid, value) {
|
|
80
|
+
const members = normalizeTeamMemberAids(value, selfAid);
|
|
81
|
+
const hash = createHash('sha256').update(JSON.stringify([selfAid, members])).digest('hex');
|
|
82
|
+
return { members, membersRevision: `sha256:${hash}` };
|
|
83
|
+
}
|
|
84
|
+
/** Revision covers only team membership, so unrelated config writes do not cause conflicts. */
|
|
85
|
+
export function readTeamMembersState(selfAid) {
|
|
86
|
+
return membersState(selfAid, requireAgentConfig(selfAid).team ?? []);
|
|
87
|
+
}
|
|
88
|
+
/** Keep stale contacts visible to the Owner so they can be removed. */
|
|
89
|
+
export function readTeamMemberDetails(selfAid, members) {
|
|
90
|
+
// Keep the legacy/local contact-book view when no Owner directory is configured.
|
|
91
|
+
if (members.some(aid => readOwnerDirectoryMembership(selfAid, aid) === undefined)) {
|
|
92
|
+
const snapshot = contactSnapshot(selfAid);
|
|
93
|
+
return members.map(aid => {
|
|
94
|
+
const contact = snapshot.contacts.get(aid);
|
|
95
|
+
const contactStatus = contact ? contact.status ?? 'active' : 'missing';
|
|
96
|
+
const reason = !contact ? 'NOT_A_CONTACT'
|
|
97
|
+
: contactStatus !== 'active' ? 'CONTACT_NOT_ACTIVE'
|
|
98
|
+
: readAunPeerKind(selfAid, aid).kind !== 'private' ? 'NOT_PRIVATE_CONTACT' : undefined;
|
|
99
|
+
return {
|
|
100
|
+
aid,
|
|
101
|
+
...(contact?.displayName ? { displayName: contact.displayName } : {}),
|
|
102
|
+
contactStatus,
|
|
103
|
+
availability: reason ? 'unavailable' : 'available',
|
|
104
|
+
...(reason ? { reason } : {}),
|
|
105
|
+
};
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
return members.map(aid => {
|
|
109
|
+
const membership = readOwnerDirectoryMembership(selfAid, aid);
|
|
110
|
+
// Directory not configured or unavailable
|
|
111
|
+
if (membership === undefined || membership.category === 'unavailable') {
|
|
112
|
+
return {
|
|
113
|
+
aid,
|
|
114
|
+
contactStatus: 'unavailable',
|
|
115
|
+
availability: 'unavailable',
|
|
116
|
+
reason: 'OWNER_DIRECTORY_UNAVAILABLE',
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
// Not found in directory
|
|
120
|
+
if (membership.category === 'not_found') {
|
|
121
|
+
return {
|
|
122
|
+
aid,
|
|
123
|
+
contactStatus: 'missing',
|
|
124
|
+
availability: 'unavailable',
|
|
125
|
+
reason: 'NOT_IN_OWNER_DIRECTORY',
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
// Blocked or wrong type
|
|
129
|
+
if (membership.blocked || (membership.category !== 'agent' && membership.category !== 'human' && membership.category !== 'assistant')) {
|
|
130
|
+
return {
|
|
131
|
+
aid,
|
|
132
|
+
displayName: membership.entry?.name,
|
|
133
|
+
contactStatus: membership.blocked ? 'missing' : 'unavailable',
|
|
134
|
+
availability: 'unavailable',
|
|
135
|
+
reason: membership.blocked ? 'NOT_IN_OWNER_DIRECTORY' : 'NOT_AGENT_TYPE',
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
// Valid contact
|
|
139
|
+
return {
|
|
140
|
+
aid,
|
|
141
|
+
displayName: membership.entry?.name,
|
|
142
|
+
contactStatus: 'active',
|
|
143
|
+
availability: 'available',
|
|
144
|
+
};
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
export function readTeamMembers(selfAid) {
|
|
148
|
+
const { members } = readTeamMembersState(selfAid);
|
|
149
|
+
assertActiveContacts(selfAid, members);
|
|
150
|
+
return members;
|
|
151
|
+
}
|
|
152
|
+
export function updateTeamMembers(selfAid, members) {
|
|
153
|
+
const normalized = normalizeTeamMemberAids(members, selfAid);
|
|
154
|
+
const result = mutateConfig(ConfigTarget.Agent, { self: selfAid }, config => {
|
|
155
|
+
requireAgentConfig(selfAid);
|
|
156
|
+
assertActiveContacts(selfAid, normalized);
|
|
157
|
+
config.team = normalized;
|
|
158
|
+
return normalized;
|
|
159
|
+
});
|
|
160
|
+
return { members: result.value, changed: result.changed };
|
|
161
|
+
}
|
|
162
|
+
/** Compare and mutate under the same ConfigManager lock used by the CLI. */
|
|
163
|
+
export function mutateTeamMembers(selfAid, mode, members, expectedRevision) {
|
|
164
|
+
if (typeof expectedRevision !== 'string' || !/^sha256:[a-f0-9]{64}$/.test(expectedRevision)) {
|
|
165
|
+
throw new TeamWorkspaceTeamError('INVALID_ARGUMENT', 'args.expectedRevision must be a membersRevision returned by the members view');
|
|
166
|
+
}
|
|
167
|
+
const requested = normalizeTeamMemberAids(members, selfAid);
|
|
168
|
+
if (mode !== 'replace' && requested.length === 0) {
|
|
169
|
+
throw new TeamWorkspaceTeamError('INVALID_ARGUMENT', 'Add and remove operations require at least one member');
|
|
170
|
+
}
|
|
171
|
+
const result = mutateConfig(ConfigTarget.Agent, { self: selfAid }, config => {
|
|
172
|
+
requireAgentConfig(selfAid);
|
|
173
|
+
const current = membersState(selfAid, config.team ?? []);
|
|
174
|
+
if (current.membersRevision !== expectedRevision) {
|
|
175
|
+
throw new TeamWorkspaceTeamError('CONFLICT', 'Team members changed; query members again before retrying', { membersRevision: current.membersRevision });
|
|
176
|
+
}
|
|
177
|
+
// Removing a blocked/deleted contact must not require it to be accepted again.
|
|
178
|
+
if (mode !== 'remove')
|
|
179
|
+
assertActiveContacts(selfAid, requested);
|
|
180
|
+
const selected = new Set(requested);
|
|
181
|
+
const next = mode === 'replace' ? requested
|
|
182
|
+
: mode === 'remove' ? current.members.filter(aid => !selected.has(aid))
|
|
183
|
+
: [...current.members, ...requested.filter(aid => !current.members.includes(aid))];
|
|
184
|
+
const state = membersState(selfAid, next);
|
|
185
|
+
const addedCount = next.filter(aid => !current.members.includes(aid)).length;
|
|
186
|
+
const removedCount = current.members.filter(aid => !next.includes(aid)).length;
|
|
187
|
+
// Preserve omitted team on an unchanged empty list; no-op calls need no write.
|
|
188
|
+
if (state.membersRevision !== current.membersRevision)
|
|
189
|
+
config.team = state.members;
|
|
190
|
+
return { ...state, totalCount: next.length, addedCount, removedCount };
|
|
191
|
+
});
|
|
192
|
+
return { ...result.value, changed: result.changed };
|
|
193
|
+
}
|
|
@@ -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,25 @@ 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
|
-
|
|
38
|
-
|
|
38
|
+
let stopping = false;
|
|
39
|
+
onShutdown(() => { stopping = true; return serviceProxyManager.stop(); });
|
|
40
|
+
const startServices = async (phase) => {
|
|
41
|
+
phase?.('waiting', 'normal Ready');
|
|
42
|
+
if (waitForServices && !await waitForServices())
|
|
43
|
+
return false;
|
|
44
|
+
if (stopping)
|
|
45
|
+
return false;
|
|
46
|
+
phase?.('running');
|
|
47
|
+
await serviceProxyManager.start();
|
|
48
|
+
};
|
|
49
|
+
const proxyStartup = startupTrace
|
|
50
|
+
? startupTrace.track('daemon.serviceProxyStart', startServices, undefined, { initialPhase: 'waiting' })
|
|
51
|
+
: startServices();
|
|
52
|
+
void proxyStartup.catch((error) => {
|
|
39
53
|
logger.warn(`ServiceProxy manager 启动失败(不影响 daemon 主流程): ${error?.message || error}`);
|
|
40
54
|
});
|
|
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
55
|
controlChannel.onMessage(async (opts) => {
|
|
49
56
|
const text = (opts.content || '').trim();
|
|
50
57
|
let activeMenuRequest;
|
|
@@ -79,9 +86,24 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
79
86
|
id: response.id,
|
|
80
87
|
...(response.name ? { name: response.name } : {}),
|
|
81
88
|
};
|
|
89
|
+
const owners = getProcessOwners().join('\u0000');
|
|
90
|
+
const deliveryTiming = beginMenuDeliveryTiming(menuTiming);
|
|
91
|
+
let deliveryOutcome;
|
|
82
92
|
try {
|
|
83
|
-
await
|
|
84
|
-
|
|
93
|
+
await deliverMenuResponse(async () => {
|
|
94
|
+
Object.assign(timedResponse, withMenuProcessingTime(timedResponse, menuTiming));
|
|
95
|
+
await controlChannel.sendStructuredOrThrow(opts.channelId, timedResponse, menuResponseContext());
|
|
96
|
+
}, {
|
|
97
|
+
canRetry: () => {
|
|
98
|
+
if (!controlChannel.getStatus().connected || getProcessOwners().join('\u0000') !== owners)
|
|
99
|
+
return false;
|
|
100
|
+
return !!response.error || resolveControlMenuAuthorization({ peerId: opts.peerId,
|
|
101
|
+
owners: getProcessOwners(), auth: { encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders } }).allowed;
|
|
102
|
+
},
|
|
103
|
+
onRetry: (attempt, error, delay) => logMenuResponseRetry(request, menuFlowContext, attempt, delay, error),
|
|
104
|
+
onComplete: outcome => { deliveryOutcome = outcome; },
|
|
105
|
+
});
|
|
106
|
+
logMenuRequestCompleted(request, timedResponse, menuFlowContext, { delivery: 'sent', ...deliveryOutcome, ...deliveryTiming() });
|
|
85
107
|
menuCompletionLogged = true;
|
|
86
108
|
}
|
|
87
109
|
catch (error) {
|
|
@@ -89,6 +111,8 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
89
111
|
delivery: 'failed',
|
|
90
112
|
reason: 'transport-error',
|
|
91
113
|
transportError: error,
|
|
114
|
+
...deliveryOutcome,
|
|
115
|
+
...deliveryTiming(),
|
|
92
116
|
});
|
|
93
117
|
menuCompletionLogged = true;
|
|
94
118
|
throw error;
|
|
@@ -217,6 +241,12 @@ export function startDaemonControlAid({ daemonCfg, cmdHandler, bindService, diag
|
|
|
217
241
|
logger.warn(`控制 AID 消息处理失败: ${e?.message || e}`);
|
|
218
242
|
}
|
|
219
243
|
});
|
|
220
|
-
|
|
244
|
+
// Install the control handler before admitting the first SDK connection.
|
|
245
|
+
void (connectChannel ? connectChannel(controlChannel) : controlChannel.connect())
|
|
246
|
+
.then(started => { if (started !== false)
|
|
247
|
+
logger.info(`✓ 控制 AID 已连接: ${daemonCfg.aid}`); })
|
|
248
|
+
.catch((e) => {
|
|
249
|
+
logger.warn(`控制 AID 首连失败(后台自动重连,不影响 daemon 主流程): ${e?.message || e}`);
|
|
250
|
+
});
|
|
221
251
|
return controlChannel;
|
|
222
252
|
}
|