evolcore 0.0.25 → 0.0.27

package/dist/core/message/message-bridge.js

@@ -1,9 +1,13 @@
+import { loadAgent } from '../../config-store.js';
+import { initializationBlocksTasks } from '../../cli/agent-create.js';
 import { createHash, randomBytes } from 'crypto';
+import { agentStorageMenuService, isAgentStorageMenuRequest } from '../command/agent-storage-menu.js';
 import { logger } from '../../utils/logger.js';
 import { StreamDebouncer } from './stream-debouncer.js';
 import { appendMessageLog, appendMessageLogStrict, buildInboundEntry, isTransientProtocolMessage } from './message-log.js';
 import { buildEnvelope, isInteractionSendAccepted, sendInteractionPayload } from './message-utils.js';
 import { chatDirPath } from '../session/session-fs-store.js';
+import { readTopicLable } from '../session/session-mapper.js';
 import { formatChannelKey, tryParseChannelKey } from '../channel-loader.js';
 import { agentDir, resolvePaths } from '../../paths.js';
 import { listStaticAgentAdmins, listStaticAgentOwners, resolvePeerRoleDetail, } from '../../config/peer-role-resolver.js';
@@ -25,8 +29,9 @@ import { createRootCausation, deriveCausation, normalizeCausation } from '../cau
 import { recordCausationSpan } from '../causation/audit.js';
 import { renderActionAsText } from '../interaction-router.js';
 import { planApprovalRoute } from '../permission/approval-gateway.js';
-import { parseFullAccessCommand } from '../command/slash-gate.js';
+import { guardGroupSlashCommand, parseFullAccessCommand } from '../command/slash-gate.js';
 import { isFullAccessEnabled } from '../../config-store.js';
+import { createAgentPolicyAuthorization } from '../role/runtime-policy.js';
 import { auditFullAccessEvent } from '../auth/authorization-audit.js';
 import { consumeAdmissionReplyBudget, clearAdmissionReplyBudgets, evaluateInboundAdmissionPreflight, evaluateOrdinaryInboundAdmission, } from './message-admission.js';
 const CONTACT_REJECTION_NOTICE = '[rejection] Not accepting messages from you.';
@@ -113,6 +118,7 @@ export class MessageBridge {
     aidStatsCollector;
     contactBindRuntimeChecker;
     interactionRouter;
+    groupInviteReviewService;
     constructor(defaultProjectPath, sessionManager, processor, messageQueue, cmdHandler, eventBus, defaultDebounce, processOwnersProvider) {
         this.defaultProjectPath = defaultProjectPath;
         this.sessionManager = sessionManager;
@@ -144,6 +150,12 @@ export class MessageBridge {
     setInteractionRouter(router) {
         this.interactionRouter = router;
     }
+    setGroupInviteReviewService(service) {
+        this.groupInviteReviewService = service;
+    }
+    registerGroupInviteReviewChannel(binding) {
+        this.groupInviteReviewService?.attach(binding);
+    }
     /**
      * AUN supplies an authenticated sender AID, while the IM-side code proves
      * possession of the external account. This command only creates that
@@ -483,7 +495,7 @@ export class MessageBridge {
                 ...(msg.replyContext ?? {}),
                 metadata: {
                     ...(msg.replyContext?.metadata ?? {}),
-                    ...evolMenuResponseTransportMetadata(),
+                    ...evolMenuResponseTransportMetadata(msg.protectedHeaders?.sdk_version),
                 },
             },
         }), {
@@ -500,9 +512,31 @@ export class MessageBridge {
     async sendAdmissionControlReply(context, msg, sendReply, text) {
         if (!text || !consumeAdmissionReplyBudget(context))
             return false;
-        await sendReply(msg.channelId, text, msg.replyContext);
+        if (context.chatType === 'group' && /^\s*\/(?:bind|request)(?:\s|$)/i.test(msg.content)) {
+            await this.sendSlashControlReply(context.channelKey, msg, sendReply, { kind: 'command.error', text });
+        }
+        else {
+            await sendReply(msg.channelId, text, msg.replyContext);
+        }
         return true;
     }
+    /** Controls handled before the normal slash handler still need structured group feedback. */
+    async sendSlashControlReply(channel, msg, sendReply, payload, adapter = this.processor.getChannelInfo?.(channel)?.adapter) {
+        if (msg.chatType === 'group' && adapter?.send) {
+            await adapter.send(buildEnvelope({
+                taskId: `cmd-${randomBytes(5).toString('hex')}`,
+                channel,
+                channelId: msg.channelId,
+                chatmode: 'interactive',
+                replyContext: {
+                    ...msg.replyContext,
+                    ...(msg.threadId ? { threadId: msg.threadId } : {}),
+                },
+            }), payload);
+            return;
+        }
+        await sendReply(msg.channelId, payload.text, msg.replyContext);
+    }
     admissionDeniedNotice(context, channelType) {
         if (context.contactStatus === 'pending') {
             return '联系人申请审核中；可再次发送 /request 更新说明。';
@@ -773,6 +807,20 @@ export class MessageBridge {
                     }
                     return;
                 }
+                if (!trustedHandoffEcho && selfAid && actorId && this.groupInviteReviewService) {
+                    const inviteCommand = await this.groupInviteReviewService.handleCommand({
+                        selfAid,
+                        ownerAid: actorId,
+                        channelKey,
+                        channelType: resolvedChannelType,
+                        chatType,
+                        content,
+                    });
+                    if (inviteCommand.handled) {
+                        await this.sendAdmissionControlReply(admissionPreflight.context, msg, sendReply, inviteCommand.text ?? '群邀请命令已处理。');
+                        return;
+                    }
+                }
                 if (!trustedHandoffEcho && await this.handleReservedContactControl({
                     context: admissionPreflight.context,
                     msg,
@@ -801,6 +849,16 @@ export class MessageBridge {
                     : { isMenu: false };
                 let menuResponseWarning;
                 if (menuControl.isMenu) {
+                    // Menu is an AUN private control plane. Group messages must never
+                    // execute Menu commands or participate in token issuance/rotation.
+                    if (msg.chatType === 'group') {
+                        this.logMenuDiagnostic('unsupported-chat-type', channelName, msg, menuControl, 'MENU_PRIVATE_ONLY');
+                        logMenuRequestCompleted(menuControl.request, undefined, this.menuFlowContext(channelName, msg), {
+                            delivery: 'dropped',
+                            reason: 'unsupported-chat-type',
+                        });
+                        return;
+                    }
                     // AUN captures this mark at its adapter boundary. Legacy/test
                     // adapters fall back to the bridge entry mark captured above.
                     Object.assign(msg, menuTiming);
@@ -837,7 +895,10 @@ export class MessageBridge {
                         const tokenSupplied = Object.prototype.hasOwnProperty.call(menuControl.request, 'menu_token');
                         const tokenValid = (menuTokenRequired || tokenSupplied)
                             && !!tokenOwnerAid
-                            && this.menuTokenStore.use(tokenOwnerAid, msg.peerId, menuControl.request.menu_token);
+                            && this.menuTokenStore.use(tokenOwnerAid, msg.peerId, menuControl.request.menu_token, {
+                                deviceId: msg.peerDeviceId,
+                                slotId: msg.peerSlotId,
+                            });
                         if (menuTokenRequired && !tokenValid) {
                             this.logMenuDiagnostic('token-required', channelName, msg, menuControl, 'MENU_TOKEN_REQUIRED');
                             await this.sendMenuResponse(adapter, channelName, msg, menuFailure(header, {
@@ -915,6 +976,11 @@ export class MessageBridge {
                 // internal per-call authorization carried into ResponseEngine.
                 const fullAccessCommand = parseFullAccessCommand(content);
                 if (fullAccessCommand.matched) {
+                    const groupGuard = guardGroupSlashCommand(content, chatType);
+                    if (groupGuard?.kind === 'command.error') {
+                        await this.sendSlashControlReply(channelName, msg, sendReply, groupGuard, adapter);
+                        return;
+                    }
                     const reject = async (text) => {
                         logger.warn(`[MessageBridge] fullaccess command rejected: channel=${channelName} `
                             + `actor=${authSubject.principalId ?? authSubject.actorId ?? '<none>'} reason=${text}`);
@@ -987,6 +1053,11 @@ export class MessageBridge {
                         ...(chatType === 'private' ? { routeId: msg.channelId } : {}),
                     });
                 }
+                const initializationConfig = selfAid ? loadAgent(selfAid) : null;
+                if (initializationConfig && initializationBlocksTasks(initializationConfig)) {
+                    await sendReply(msg.channelId, 'Agent 初始化尚未完成，请由创建者查询 ec agent show 或恢复初始化。');
+                    return;
+                }
                 // 1. owner 绑定（按实例名绑定）
                 if (adapter && actorId && roleDetail.effectiveRole === 'owner') {
                     await this.bootstrapService?.tryStartBootstrap({
@@ -1002,6 +1073,13 @@ export class MessageBridge {
                 // 2. 命令快速路径（去除引用前缀后检查，兼容话题中引用上文的情况）
                 const contentForCmd = content.replace(/^(>[^\n]*\n)+\n?/, '').trim();
                 const cmdContent = contentForCmd || content;
+                if (msg.source !== 'handoff' && !executionPermissionOverride) {
+                    const groupGuard = guardGroupSlashCommand(cmdContent, chatType);
+                    if (groupGuard?.kind === 'command.error') {
+                        await this.sendSlashControlReply(channelName, msg, sendReply, groupGuard, adapter);
+                        return;
+                    }
+                }
                 const isCmd = msg.source !== 'handoff'
                     // Once /fa has been accepted, its remainder is always model input.
                     // A prompt such as `/fa /status` must not be re-routed as the
@@ -1059,6 +1137,14 @@ export class MessageBridge {
                         return sendReply(msg.channelId, text, msg.replyContext);
                     }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID, authSubject))
                     return;
+                // Commands retain their normal route. Only authenticated direct model
+                // input can obtain the Agent policy's per-call authorization.
+                if (!executionPermissionOverride && selfAid && owningAgent?.aid === selfAid) {
+                    executionPermissionOverride = createAgentPolicyAuthorization({
+                        agentAid: selfAid, actor: roleDetail.actor, chatType,
+                        source: msg.source, peerType: msg.peerType,
+                    });
+                }
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
                     // 静默丢弃：绝不向群里注入回复。
@@ -1102,7 +1188,7 @@ export class MessageBridge {
                 // has been appended and create another renewed session.
                 releaseAdmission = await this.acquireAdmission(admissionRoute);
                 const hadMainSession = msg.threadId ? true : this.sessionManager.hasMainSession(channelName, msg.channelId, msg.channelType || effectiveChannelType, msg.selfAID || selfAid);
-                let session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, this.extractTopicName(msg), msg.peerId, chatType, owningAgent?.baseagent, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType, identity);
+                let session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, this.extractTopicName(msg), msg.peerId, chatType, owningAgent?.baseagent, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType, identity, readTopicLable(msg) ?? readTopicLable(msg.replyContext?.metadata));
                 if (session.threadId && typeof this.messageQueue.reserveSessionIngress === 'function') {
                     releaseSessionIngress = this.messageQueue.reserveSessionIngress(session.id);
                 }
@@ -1158,6 +1244,7 @@ export class MessageBridge {
                     mentions: msg.mentions, mentionAids: msg.mentionAids, threadId: msg.threadId,
                     isMentioned: msg.isMentioned,
                     topicName: this.extractTopicName(msg),
+                    lable: session.lable,
                     replyContext: msg.replyContext,
                     source: msg.source,
                     ...(executionPermissionOverride ? { executionPermissionOverride } : {}),
@@ -1380,6 +1467,8 @@ export class MessageBridge {
         const menuAuthSubject = {
             ...authSubject,
             requestId: parsed.id,
+            menuEncrypted: msg.encrypted === true,
+            fromControlChannel: authSubject.fromControlChannel || msg.isControlChannel === true,
             ...(activeSession?.id ? { sessionId: activeSession.id } : {}),
         };
         const isTokenRequest = parsed.type === 'menu.token.request';
@@ -1410,8 +1499,22 @@ export class MessageBridge {
                 return;
             }
         }
+        // Reauthorize even cached responses: roots expire and static owners can be revoked.
+        const isStorageRequest = isAgentStorageMenuRequest(parsed.request);
+        if (isStorageRequest) {
+            try {
+                agentStorageMenuService.preflight(parsed.request, menuAuthSubject);
+            }
+            catch (error) {
+                await this.sendMenuResponse(adapter, channel, msg, menuFailure(header, normalizeMenuError(error)));
+                return;
+            }
+        }
         const scope = msg.chatType === 'group' ? (msg.groupId || msg.channelId) : msg.peerId;
-        const dedupKey = [msg.selfAID || channel, channelType, msg.chatType || 'private', scope, msg.peerId, msg.threadId || '', parsed.id].join('\u001f');
+        // Separate installations can generate identical request IDs. Token
+        // issuance and replay must remain scoped to the authenticated requester.
+        const dedupKey = [msg.selfAID || channel, channelType, msg.chatType || 'private', scope, msg.peerId,
+            msg.peerDeviceId || '', msg.peerSlotId || '', msg.threadId || '', parsed.id].join('\u001f');
         let afterResponse;
         const deduped = await this.menuDeduper.execute(dedupKey, menuPayloadFingerprint(parsed.raw), () => isTokenRequest
             ? this.issueMenuTokenResponse(header, channel, msg)
@@ -1424,6 +1527,16 @@ export class MessageBridge {
             }));
             return;
         }
+        // A replay may have awaited an in-flight request; check again before release.
+        if (isStorageRequest) {
+            try {
+                agentStorageMenuService.preflight(parsed.request, menuAuthSubject, false);
+            }
+            catch (error) {
+                await this.sendMenuResponse(adapter, channel, msg, menuFailure(header, normalizeMenuError(error)));
+                return;
+            }
+        }
         if (deduped.replayed)
             this.logMenuDiagnostic('request-replay', channel, msg, parsed);
         if (deduped.retry)
@@ -1438,7 +1551,20 @@ export class MessageBridge {
                 await deferredEffect();
             }
             catch (error) {
-                logger.warn(`[MenuControl] deferred effect failed: request=${parsed.id} error=${error instanceof Error ? error.message : String(error)}`);
+                const detail = error instanceof Error ? error.message : String(error);
+                const code = error && typeof error === 'object' && 'code' in error
+                    ? String(error.code ?? 'EXEC_FAILED')
+                    : 'EXEC_FAILED';
+                logger.warn(`[MenuControl] deferred effect failed: request=${parsed.id} error=${detail}`);
+                // File fetch is acknowledged before the upload completes. Send a
+                // second response with the same request id so the client can finish
+                // the pending fetch with an actionable error instead of timing out.
+                const failedResponse = menuFailure(header, {
+                    code,
+                    message: detail.startsWith('文件发送失败') ? detail : `文件发送失败: ${detail}`,
+                });
+                await this.menuDeduper.replaceResult(dedupKey, menuPayloadFingerprint(parsed.raw), deduped.value, failedResponse);
+                await this.sendMenuResponse(adapter, channel, msg, failedResponse);
             }
         }
     }
@@ -1448,11 +1574,20 @@ export class MessageBridge {
             const name = header.name ?? '';
             const cmd = typeof request.cmd === 'string' ? request.cmd : undefined;
             const args = request.args;
+            const transportReplyContext = {
+                ...(msg.replyContext ?? {}),
+                ...(msg.threadId ? { threadId: msg.threadId } : {}),
+            };
+            // Explicit group context can target a different conversation. Its
+            // sessions must not inherit the thread of the source conversation.
+            const replyContextFor = (channelId) => channelId === msg.channelId ? transportReplyContext : undefined;
             switch (request.type) {
                 case 'menu.list':
                     if (args?.view === 'catalog') {
                         validateMenuCatalogArgs(args);
-                        const data = await this.cmdHandler.getMenuCatalog(channel, msg.channelId, authSubject, args.context, msg.isControlChannel ? 'control' : 'agent');
+                        const data = await this.cmdHandler.getMenuCatalog(channel, msg.channelId, authSubject, args.context, msg.isControlChannel ? 'control' : 'agent', !msg.isControlChannel || (msg.encrypted === true
+                            && msg.protectedHeaders?.auth_method !== 'remote-access-token'
+                            && msg.protectedHeaders?.auth_method !== 'ecweb-token'));
                         return menuSuccess(header, data);
                     }
                     if (args?.view !== undefined) {
@@ -1462,7 +1597,7 @@ export class MessageBridge {
                 case 'menu.query': {
                     if (name === 'menu' && args?.view === 'values') {
                         validateMenuValueBatchArgs(args);
-                        const data = await this.cmdHandler.execMenuValueBatch(channel, msg.channelId, authSubject, args, args.context, msg.isControlChannel ? 'control' : 'agent');
+                        const data = await this.cmdHandler.execMenuValueBatch(channel, msg.channelId, authSubject, args, args.context, msg.isControlChannel ? 'control' : 'agent', transportReplyContext);
                         return menuSuccess(header, data);
                     }
                     if (name === 'menu') {
@@ -1475,7 +1610,7 @@ export class MessageBridge {
                         channelId: msg.channelId,
                         args,
                     });
-                    const result = await this.cmdHandler.execMenuQuery(this.resolveCmd(name, cmd), channel, execution.channelId, execution.subject.actorId, execution.args, execution.subject.chatType, execution.subject.fromControlChannel, execution.subject.identity, execution.subject);
+                    const result = await this.cmdHandler.execMenuQuery(this.resolveCmd(name, cmd), channel, execution.channelId, execution.subject.actorId, execution.args, execution.subject.chatType, execution.subject.fromControlChannel, execution.subject.identity, execution.subject, 'menu', replyContextFor(execution.channelId));
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
@@ -1492,7 +1627,7 @@ export class MessageBridge {
                     if ((name === 'topic' || cmd === '/topic') && args?.mode === 'fork-turns' && msg.threadId && !args?.sourceThreadId) {
                         optionArgs = { ...(execution.args ?? {}), sourceThreadId: msg.threadId };
                     }
-                    const data = await this.cmdHandler.getSubMenuItems(this.resolveCmd(name, cmd), channel, execution.channelId, execution.subject.actorId, optionArgs, execution.subject.identity, execution.subject.chatType, execution.subject.fromControlChannel, execution.subject) ?? [];
+                    const data = await this.cmdHandler.getSubMenuItems(this.resolveCmd(name, cmd), channel, execution.channelId, execution.subject.actorId, optionArgs, execution.subject.identity, execution.subject.chatType, execution.subject.fromControlChannel, execution.subject, 'menu', replyContextFor(execution.channelId)) ?? [];
                     return menuSuccess(header, data);
                 }
                 case 'menu.update': {
@@ -1503,10 +1638,7 @@ export class MessageBridge {
                         channelId: msg.channelId,
                         args,
                     });
-                    const result = await this.cmdHandler.execMenuUpdate(this.resolveCmd(name, cmd), request.value, channel, execution.channelId, execution.subject.actorId, execution.subject.identity, execution.subject.fromControlChannel, execution.args, execution.subject, 'menu', {
-                        ...(msg.replyContext ?? {}),
-                        ...(msg.threadId ? { threadId: msg.threadId } : {}),
-                    });
+                    const result = await this.cmdHandler.execMenuUpdate(this.resolveCmd(name, cmd), request.value, channel, execution.channelId, execution.subject.actorId, execution.subject.identity, execution.subject.fromControlChannel, execution.args, execution.subject, 'menu', replyContextFor(execution.channelId));
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
@@ -1569,9 +1701,11 @@ export class MessageBridge {
         const agentName = this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>';
         const replyContext = {
             ...(msg.replyContext ?? {}),
+            ...(msg.peerDeviceId ? { toDeviceId: msg.peerDeviceId } : {}),
             metadata: {
                 ...(msg.replyContext?.metadata ?? {}),
-                ...evolMenuResponseTransportMetadata(),
+                ...evolMenuResponseTransportMetadata(msg.protectedHeaders?.sdk_version),
+                ...(isAgentStorageMenuRequest(request) ? { encrypted: true } : {}),
             },
         };
         if (msg.channelType === 'aun' && !replyContext.delivery) {
@@ -1615,6 +1749,9 @@ export class MessageBridge {
             clientName: this.menuTokenHeaderValue(headers.client_name ?? headers.app_name),
             clientVersion: this.menuTokenHeaderValue(headers.client_version ?? headers.app_version),
             evolVersion: this.menuTokenHeaderValue(headers.evol_version),
+        }, {
+            deviceId: msg.peerDeviceId,
+            slotId: msg.peerSlotId,
         });
         if (!issued) {
             return menuFailure(header, { code: 'MENU_TOKEN_REJECTED', message: '授权申请未通过' });
@@ -1732,20 +1869,25 @@ export class MessageBridge {
         logger.info(`[${channel}] ${channelId}: ${content}${source === 'card-trigger' ? ' [card]' : ''}`);
         const adapter = this.processor.getChannelInfo?.(channel)?.adapter;
         const cmdResult = await this.cmdHandler.handle(content, channel, channelId, async (_cid, text, opts, updatePayload) => {
-            if (updatePayload && adapter?.send) {
+            const payload = updatePayload ?? (chatType === 'group' ? { kind: 'command.result', text } : undefined);
+            if (payload && adapter?.send) {
                 const envelope = buildEnvelope({
                     taskId: `cmd-update-${randomBytes(5).toString('hex')}`,
                     channel,
                     channelId,
                     agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
                     chatmode: 'interactive',
-                    replyContext: opts ?? replyContext,
+                    replyContext: {
+                        ...(opts ?? {}),
+                        ...(replyContext ?? {}),
+                        metadata: { ...opts?.metadata, ...replyContext?.metadata },
+                    },
                 });
-                await adapter.send(envelope, updatePayload);
+                await adapter.send(envelope, payload);
                 return;
             }
             await sendReply(text, opts, updatePayload);
-        }, userId, threadId, chatType, source, messageId, selfAID, authSubject?.identity, authSubject, replyContext);
+        }, userId, threadId, chatType, source, messageId, selfAID, authSubject?.identity, authSubject, replyContext, true);
         logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}`);
         if (cmdResult === undefined)
             return false;
@@ -1830,6 +1972,7 @@ export class MessageBridge {
     }
     /** 注销单个渠道的 debouncer（热重载断开渠道时调用） */
     removeChannel(channelName) {
+        this.groupInviteReviewService?.detach(channelName);
         const d = this.debouncers.get(channelName);
         if (d) {
             d.dispose();

package/dist/core/message/message-log.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { appendJsonl, chatDirPath } from '../session/session-fs-store.js';
+import { appendJsonl, appendJsonlDurable, chatDirPath } from '../session/session-fs-store.js';
 import { logger } from '../../utils/logger.js';
 const TRANSIENT_PROTOCOL_TYPE_PREFIXES = [
     'contact.request.',
@@ -313,13 +313,13 @@ export function appendMessageLog(chatDir, entry) {
     }
 }
 /** Strict conversation-history append used by handoff reply binding. */
-export function appendMessageLogStrict(chatDir, entry) {
+export function appendMessageLogStrict(chatDir, entry, durable = false) {
     if (isTransientProtocolMessage(entry))
         return;
     if (entry.dir === 'in' && hasDuplicate(chatDir, entry.msgId))
         return;
     fs.mkdirSync(chatDir, { recursive: true });
-    appendJsonl(messageLogPath(chatDir), entry);
+    (durable ? appendJsonlDurable : appendJsonl)(messageLogPath(chatDir), entry);
     if (entry.dir === 'in')
         rememberMessageId(chatDir, entry.msgId);
 }
@@ -343,6 +343,8 @@ export function buildInboundEntry(opts) {
         msgType: isCommand ? 'command' : (opts.msgType ?? 'text'),
         payloadType: opts.payloadType,
         payloadSummary: opts.payloadSummary,
+        groupAttention: opts.groupAttention,
+        groupDelivery: opts.groupDelivery,
         content: opts.content,
         replyTo: opts.replyTo ?? null,
         agent: null,