evolcore 0.0.3 → 0.0.4

package/dist/core/command/connect-menu.js

@@ -1,6 +1,7 @@
 import { roleMenuQuery, roleMenuUpdate, } from './role-menu.js';
 import { getContactSnapshot, resolveContactView } from '../../config/contact-book.js';
-import { mutateContactBook } from '../../config/contact-book-store.js';
+import { listConfiguredChannelKeys, mutateAccessPolicy, readAccessPolicySnapshot, } from '../../config/access-policy.js';
+import { expirePendingContactRequests, mutateContactWithOperation, reviewContactRequest, } from '../../config/contact-request-service.js';
 import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
 /**
  * Connect Menu — 联系人与关系管理协议
@@ -10,8 +11,10 @@ import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
  *   复用其 agent 级互斥锁、CAS revision、owner/admin 安全护栏与审计链，绝不自行写 relation 文件。
  * - 群组列表（view=groups）→ 委派给 role-menu 的 view=targets（数据源是 AUN live 目录），
  *   群组不落 contact.json（contact book 只接受个人 AID，group 会被拒绝）。
- * - 联系人（view=contacts / contact，add / block / unblock）→ 直接读写 Contact Book v2，
- *   contact.json 是联系人列表的唯一事实来源。
+ * - 联系人与申请（view=contacts / contact，add / block / unblock / review）→ 直接读写
+ *   Contact Book v3；contact.json 是当前状态和 pending 版本的唯一事实来源。
+ * - 访问设置（view=access / option=allowedGroupChannels / resource=<access field>）→
+ *   查询策略、列举群聊渠道候选项并逐字段写入 Agent config.json 的 access 字段。
  */
 const MENU_NAME = 'connect';
 const DEFAULT_PAGE_SIZE = 50;
@@ -19,6 +22,7 @@ const MAX_PAGE_SIZE = 200;
 /**
  * Map a connect menu request to its authorization operation id.
  * Read views/options → connect.read; contact writes → connect.write;
+ * owner-only access fields → connect.access.write;
  * role assignment/admin delegate to the role.* operations role-menu enforces.
  */
 export function connectMenuOperation(kind, args, value) {
@@ -27,6 +31,11 @@ export function connectMenuOperation(kind, args, value) {
     if (kind === 'action')
         return 'connect.write';
     const resource = String(args?.resource ?? '');
+    if (resource === 'allowedGroupChannels')
+        return 'connect.write';
+    if (resource === 'policyMode' || resource === 'requestLimit') {
+        return 'connect.access.write';
+    }
     if (resource === 'admin')
         return 'connect.admin';
     const decoded = decodeUpdateValue(value);
@@ -41,14 +50,12 @@ export async function handleConnectMenu(req, context) {
     const { self } = context;
     if (!self)
         return fail('INVALID_ARGUMENT', 'selfAid is required for connect menu');
-    if (req.args?.self !== self) {
-        return fail(req.args && Object.prototype.hasOwnProperty.call(req.args, 'self') ? 'PERMISSION_DENIED' : 'INVALID_ARGUMENT', req.args && Object.prototype.hasOwnProperty.call(req.args, 'self')
-            ? 'args.self does not match the receiving Agent'
-            : 'args.self is required for connect menu');
+    if (req.args?.self !== undefined && req.args.self !== self) {
+        return fail('PERMISSION_DENIED', 'args.self does not match the receiving Agent');
     }
     try {
         if (req.subtype === 'options')
-            return await handleOptions(self);
+            return await handleOptions(self, req.args);
         if (req.subtype === 'query')
             return await handleQuery(req, self, context);
         if (req.subtype === 'update')
@@ -62,22 +69,43 @@ export async function handleConnectMenu(req, context) {
     return fail('INVALID_ARGUMENT', `Unknown subtype: ${req.subtype}`);
 }
 // ── Options ──
-async function handleOptions(self) {
+async function handleOptions(self, args) {
+    const option = String(args?.option ?? '').trim();
+    if (option) {
+        if (option !== 'allowedGroupChannels') {
+            return fail('NOT_SUPPORTED', `Unknown connect option: ${option}`);
+        }
+        const selected = new Set(readAccessPolicySnapshot(self).policy.allowedGroupChannels);
+        return ok({
+            options: listConfiguredChannelKeys(self).map(channelKey => ({
+                option: channelKey,
+                label: channelKey,
+                selected: selected.has(channelKey),
+            })),
+        });
+    }
+    await expirePendingContactRequests(self);
     const snapshot = getContactSnapshot(self);
     const contactCount = snapshot.contacts.size;
     const blockedCount = snapshot.blockedIndex.size;
+    const pendingCount = [...snapshot.contacts.values()].filter(entry => entry.status === 'pending').length;
     return ok({
         options: [
             {
                 option: 'contacts',
                 label: '联系人列表',
-                description: `查看所有联系人（${contactCount} 人，${blockedCount} 人已拉黑）`,
+                description: `查看所有状态（${contactCount} 人，${pendingCount} 个待审核，${blockedCount} 人已拉黑）`,
             },
             {
                 option: 'groups',
                 label: '群组列表',
                 description: '查看所在群组',
             },
+            {
+                option: 'access',
+                label: '访问设置',
+                description: '设置私聊准入模式与允许群聊的渠道',
+            },
         ],
     });
 }
@@ -89,6 +117,8 @@ async function handleQuery(req, self, context) {
         return queryContacts(args, self);
     if (view === 'contact')
         return queryContact(req, self);
+    if (view === 'access')
+        return queryAccess(self);
     // Groups and role assignments are delegated to role-menu (authoritative source).
     // Role *definitions* are out of scope here — use `menu name=role` for those.
     if (view === 'groups') {
@@ -124,9 +154,19 @@ async function handleQuery(req, self, context) {
             dataSource: { ...data.dataSource, kind: 'relation-config' },
         });
     }
-    return fail('INVALID_ARGUMENT', `Unknown view: ${String(view)}`);
+    return fail('NOT_SUPPORTED', `Unknown view: ${String(view)}`);
 }
-function queryContacts(args, self) {
+function queryAccess(self) {
+    const { policy, accessRevision } = readAccessPolicySnapshot(self);
+    return ok({
+        self,
+        view: 'access',
+        policy,
+        accessRevision,
+    });
+}
+async function queryContacts(args, self) {
+    await expirePendingContactRequests(self);
     const snapshot = getContactSnapshot(self);
     const page = paginate([...snapshot.contacts.keys()].sort(), args, self, primaryId => primaryId);
     const items = page.items.map(primaryId => contactItem(self, primaryId));
@@ -135,11 +175,13 @@ function queryContacts(args, self) {
         view: 'contacts',
         items,
         contactRevision: snapshot.contactRevision,
+        pendingCount: [...snapshot.contacts.values()].filter(entry => entry.status === 'pending').length,
         nextCursor: page.nextCursor,
         dataSource: { kind: 'contact-book', authoritative: true, complete: true },
     });
 }
-function queryContact(req, self) {
+async function queryContact(req, self) {
+    await expirePendingContactRequests(self);
     const primaryId = String(req.args?.primaryId ?? '').trim();
     if (!primaryId)
         return fail('INVALID_ARGUMENT', 'primaryId is required');
@@ -150,6 +192,7 @@ function queryContact(req, self) {
 }
 function contactItem(self, primaryId) {
     const view = resolveContactView(self, primaryId);
+    const pendingRequest = getContactSnapshot(self).contacts.get(primaryId)?.pendingRequest;
     return {
         primaryId,
         displayName: view.displayName ?? null,
@@ -157,6 +200,13 @@ function contactItem(self, primaryId) {
         blocked: view.blocked,
         isOwner: view.isOwner,
         aliases: view.aliases,
+        ...(pendingRequest ? {
+            pendingRequest: {
+                id: pendingRequest.id,
+                submittedAt: pendingRequest.submittedAt,
+                expiresAt: pendingRequest.expiresAt,
+            },
+        } : {}),
     };
 }
 function normalizeAssignmentItem(item) {
@@ -181,12 +231,15 @@ function normalizeAssignmentItem(item) {
         return item;
     }
 }
-// ── Update (delegated to role-menu) ──
+// ── Update ──
 async function handleUpdate(req, context) {
     const args = req.args ?? {};
-    const resource = args.resource;
+    const resource = String(args.resource ?? '');
+    if (isAccessUpdateResource(resource)) {
+        return updateAccessResource(req, context, resource);
+    }
     if (resource !== 'assignment' && resource !== 'admin') {
-        return fail('INVALID_ARGUMENT', `Unknown resource: ${String(resource)}`);
+        return fail('NOT_SUPPORTED', `Unknown resource: ${String(resource)}`);
     }
     if (req.value === undefined || !req.value.trim()) {
         return fail('INVALID_ARGUMENT', 'value is required');
@@ -194,9 +247,9 @@ async function handleUpdate(req, context) {
     validateWritableTarget(args.target);
     const value = roleMenuUpdateValue(resource, req.value);
     const data = await roleMenuUpdate(context, args, value);
-    return ok(data);
+    return ok(resource === 'assignment' ? normalizeAssignmentUpdate(data) : data);
 }
-// ── Action (Contact Book v2) ──
+// ── Action (Contact Book v3) ──
 async function handleAction(req, self, context) {
     const action = req.action;
     if (action === 'add')
@@ -205,9 +258,111 @@ async function handleAction(req, self, context) {
         return actionSetStatus(req, self, context, true);
     if (action === 'unblock')
         return actionSetStatus(req, self, context, false);
-    return fail('INVALID_ARGUMENT', `Unknown action: ${String(action)}`);
+    if (action === 'approve-request')
+        return actionReviewRequest(req, self, context, 'approve');
+    if (action === 'reject-request')
+        return actionReviewRequest(req, self, context, 'reject');
+    if (action === 'block-request')
+        return actionReviewRequest(req, self, context, 'block');
+    return fail('NOT_SUPPORTED', `Unknown action: ${String(action)}`);
+}
+function isAccessUpdateResource(resource) {
+    return resource === 'policyMode'
+        || resource === 'allowedGroupChannels'
+        || resource === 'requestLimit';
+}
+function updateAccessResource(req, context, resource) {
+    const args = req.args ?? {};
+    if (resource === 'allowedGroupChannels')
+        requireAdminContext(context);
+    else
+        requireOwnerContext(context);
+    if (req.value === undefined || !req.value.trim()) {
+        return fail('INVALID_ARGUMENT', 'value is required');
+    }
+    const self = context.self;
+    const expectedAccessRevision = requireAccessRevision(args);
+    const decoded = decodeAccessUpdateValue(req.value);
+    if (resource === 'policyMode') {
+        if (typeof decoded !== 'string' || !['open', 'contacts', 'owners-only'].includes(decoded)) {
+            return fail('INVALID_ARGUMENT', 'policyMode must be open, contacts, or owners-only');
+        }
+    }
+    else if (resource === 'allowedGroupChannels') {
+        if (!Array.isArray(decoded)
+            || !decoded.every(value => typeof value === 'string' && value.length > 0)
+            || new Set(decoded).size !== decoded.length) {
+            return fail('INVALID_ARGUMENT', 'allowedGroupChannels must be a JSON string array');
+        }
+    }
+    else {
+        const requestLimit = decoded;
+        if (!requestLimit || typeof requestLimit !== 'object' || Array.isArray(requestLimit)
+            || Object.keys(requestLimit).some(key => key !== 'maxTimes' && key !== 'coolDown')
+            || !Number.isInteger(requestLimit.maxTimes)
+            || Number(requestLimit.maxTimes) < 1
+            || Number(requestLimit.maxTimes) > 100_000
+            || !Number.isInteger(requestLimit.coolDown)
+            || Number(requestLimit.coolDown) < 1
+            || Number(requestLimit.coolDown) > 86_400) {
+            return fail('INVALID_ARGUMENT', 'requestLimit must be a JSON object with integer maxTimes and coolDown');
+        }
+    }
+    const result = mutateAccessPolicy({
+        selfAid: self,
+        actorAid: String(context.actorAid || ''),
+        actorRole: context.actorRole,
+        resource: `access.${resource}`,
+        expectedAccessRevision,
+        update: current => accessPolicyWithUpdate(current, resource, decoded),
+    });
+    return ok({
+        self,
+        resource,
+        policy: result.policy,
+        accessRevision: result.accessRevision,
+        changed: result.changed,
+    });
+}
+async function actionReviewRequest(req, self, context, decision) {
+    const args = req.args ?? {};
+    const primaryId = String(args.primaryId ?? '').trim();
+    const requestId = String(args.requestId ?? '').trim();
+    if (!primaryId)
+        return fail('INVALID_ARGUMENT', 'primaryId is required');
+    if (!requestId)
+        return fail('INVALID_ARGUMENT', 'requestId is required');
+    requireAdminContext(context);
+    const expectedContactRevision = requireContactRevision(args);
+    const actorId = String(context.actorAid || '').trim();
+    const reviewed = await reviewContactRequest({
+        selfAid: self,
+        primaryId,
+        requestId,
+        expectedContactRevision,
+        approverId: actorId,
+        actorId,
+        reviewerRole: context.actorRole,
+        decision,
+    });
+    if (reviewed.code === 'approved' || reviewed.code === 'rejected' || reviewed.code === 'blocked') {
+        return ok({
+            self,
+            action: `${decision}-request`,
+            primaryId,
+            requestId,
+            result: reviewed.code,
+            contactRevision: reviewed.contactRevision,
+        });
+    }
+    const code = reviewed.code === 'forbidden' ? 'PERMISSION_DENIED'
+        : reviewed.code === 'revision-conflict' ? 'CONFLICT'
+            : reviewed.code === 'request-expired' ? 'EXPIRED'
+                : 'NOT_FOUND';
+    return fail(code, reviewed.code.replace(/-/g, ' '), { contactRevision: reviewed.contactRevision });
 }
 async function actionAdd(req, self, context) {
+    requireAdminContext(context);
     const args = req.args ?? {};
     const primaryId = String(args.primaryId ?? '').trim();
     if (!primaryId)
@@ -219,11 +374,13 @@ async function actionAdd(req, self, context) {
     }
     const current = getContactSnapshot(self).contacts.get(primaryId);
     const displayName = hasDisplayName ? args.displayName : current?.displayName ?? null;
-    const result = await mutateContactBook({
+    const result = await mutateContactWithOperation({
         selfAid: self,
-        actor: context.actorAid ?? 'connect-menu',
+        actorId: context.actorAid ?? 'connect-menu',
+        operation: 'manual-add',
         expectedContactRevision,
         mutation: { type: 'set-display-name', primaryId, displayName },
+        primaryId,
     });
     const storedDisplayName = result.contact.contacts[primaryId]?.displayName ?? null;
     return ok({
@@ -236,16 +393,22 @@ async function actionAdd(req, self, context) {
     });
 }
 async function actionSetStatus(req, self, context, blocked) {
+    requireAdminContext(context);
     const args = req.args ?? {};
     const primaryId = String(args.primaryId ?? '').trim();
     if (!primaryId)
         return fail('INVALID_ARGUMENT', 'primaryId is required');
     const expectedContactRevision = requireContactRevision(args);
-    const result = await mutateContactBook({
+    if (!getContactSnapshot(self).contacts.has(primaryId)) {
+        return fail('NOT_FOUND', `Contact was not found: ${primaryId}`);
+    }
+    const result = await mutateContactWithOperation({
         selfAid: self,
-        actor: context.actorAid ?? 'connect-menu',
+        actorId: context.actorAid ?? 'connect-menu',
+        operation: blocked ? 'block' : 'unblock',
         expectedContactRevision,
         mutation: { type: 'set-status', primaryId, status: blocked ? 'blocked' : 'active' },
+        primaryId,
     });
     return ok({
         self,
@@ -259,6 +422,16 @@ async function actionSetStatus(req, self, context, blocked) {
 function ok(data) {
     return { type: 'menu.response', id: '', name: MENU_NAME, data };
 }
+function requireOwnerContext(context) {
+    if (context.actorRole !== 'owner') {
+        throw connectError('PERMISSION_DENIED', 'Only an Agent Owner can modify this access setting');
+    }
+}
+function requireAdminContext(context) {
+    if (context.actorRole !== 'owner' && context.actorRole !== 'admin') {
+        throw connectError('PERMISSION_DENIED', 'Only an Agent Owner or Admin can perform this operation');
+    }
+}
 function fail(code, message, data) {
     return {
         type: 'menu.response',
@@ -277,6 +450,20 @@ function errorCode(error) {
         return 'CONFLICT';
     if (code === 'INVALID_CONTACT_BOOK')
         return 'INTERNAL_ERROR';
+    if (code === 'access_policy_owner_required')
+        return 'PERMISSION_DENIED';
+    if (code === 'access_policy_manager_required')
+        return 'PERMISSION_DENIED';
+    if (code === 'access_policy_revision_conflict')
+        return 'CONFLICT';
+    if (code === 'access_policy_temporarily_unavailable')
+        return 'TEMPORARILY_UNAVAILABLE';
+    if (code === 'restricted_mode_without_owner')
+        return 'NOT_ALLOWED';
+    if (code === 'unknown_group_access_channel')
+        return 'INVALID_ARGUMENT';
+    if (code === 'invalid_access_policy')
+        return 'INTERNAL_ERROR';
     return typeof code === 'string' ? code : 'INTERNAL_ERROR';
 }
 function errorMessage(error) {
@@ -297,6 +484,15 @@ function requireContactRevision(args) {
     }
     return args.expectedContactRevision;
 }
+function requireAccessRevision(args) {
+    if (!Object.prototype.hasOwnProperty.call(args, 'expectedAccessRevision')) {
+        throw connectError('INVALID_ARGUMENT', 'expectedAccessRevision is required');
+    }
+    if (typeof args.expectedAccessRevision !== 'string' || !args.expectedAccessRevision) {
+        throw connectError('INVALID_ARGUMENT', 'expectedAccessRevision must be a non-empty string');
+    }
+    return args.expectedAccessRevision;
+}
 function decodeUpdateValue(value) {
     const text = String(value ?? '').trim();
     if (!text)
@@ -309,6 +505,15 @@ function decodeUpdateValue(value) {
     catch { }
     return text;
 }
+function decodeAccessUpdateValue(value) {
+    const text = value.trim();
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return text;
+    }
+}
 function roleMenuUpdateValue(resource, value) {
     const decoded = decodeUpdateValue(value);
     if (resource === 'assignment') {
@@ -317,11 +522,31 @@ function roleMenuUpdateValue(resource, value) {
         }
         return JSON.stringify(decoded);
     }
-    if (![true, false, null, 'grant', 'revoke'].includes(decoded)) {
+    if (decoded !== 'grant' && decoded !== 'revoke') {
         throw connectError('INVALID_ARGUMENT', 'admin value must be grant or revoke');
     }
     return JSON.stringify(decoded);
 }
+function normalizeAssignmentUpdate(data) {
+    const explicitRole = data?.assignment?.explicitRole;
+    return {
+        ...data,
+        roleId: typeof explicitRole === 'string' ? explicitRole : null,
+    };
+}
+function accessPolicyWithUpdate(current, resource, decoded) {
+    if (resource === 'policyMode') {
+        return { ...current, policyMode: decoded };
+    }
+    if (resource === 'allowedGroupChannels') {
+        return { ...current, allowedGroupChannels: [...decoded] };
+    }
+    const requestLimit = decoded;
+    return {
+        ...current,
+        requestLimit: { maxTimes: requestLimit.maxTimes, coolDown: requestLimit.coolDown },
+    };
+}
 function validateWritableTarget(target) {
     if (!target || typeof target !== 'object' || Array.isArray(target))
         return;

package/dist/core/command/evol-menu-version-gate.js

@@ -0,0 +1,38 @@
+import { loadDaemonConfig } from '../../config-store.js';
+import { readInstalledEvolcoreVersion } from '../../utils/evolcore-version.js';
+import { compareStableSemver, parseStableSemver } from '../../utils/stable-semver.js';
+export function evaluateEvolMenuVersionGate(input) {
+    const minimum = loadDaemonConfig().aun?.minEvolVersion;
+    if (!minimum)
+        return null;
+    const minimumVersion = parseStableSemver(minimum);
+    if (!minimumVersion) {
+        throw new Error('daemon.json.aun.minEvolVersion must use stable X.Y.Z format');
+    }
+    const received = input.protectedHeaders?.evol_version;
+    const receivedVersion = input.encrypted ? parseStableSemver(received) : null;
+    if (!receivedVersion || compareStableSemver(receivedVersion, minimumVersion) < 0) {
+        return {
+            code: 'UPGRADE_REQUIRED',
+            message: `Evol ${minimum} or later is required`,
+            data: {
+                minimum,
+                received: receivedVersion ? received : null,
+            },
+        };
+    }
+    return null;
+}
+export function isEvolMenuVersionGateEnabled() {
+    return loadDaemonConfig().aun?.minEvolVersion !== undefined;
+}
+/** Token may be issued while disabled, but only this flag makes it an access requirement. */
+export function isAunMenuTokenRequired() {
+    return loadDaemonConfig().aun?.menuTokenRequired === true;
+}
+export function evolMenuResponseTransportMetadata(_requestEncrypted) {
+    return {
+        encrypted: true,
+        protectedHeaders: { ec_version: readInstalledEvolcoreVersion() },
+    };
+}