evolcore 0.0.20 → 0.0.22

package/dist/channels/aun.js

@@ -11,7 +11,7 @@ import { DEFAULT_FLUSH_DELAY_SECONDS } from '../types.js';
 import { resolvePaths, agentDir as agentDirPath, resolveRoot, channelStatePath } from '../paths.js';
 import { saveToUploads, sanitizeFileName, bufferToInboundImage, safeFetch } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
-import { appendMessageLog, appendMessageLogStrict, buildOutboundEntry, buildInboundEntry, classifyAunPayloadForLog, hasMessageLogOperation } from '../core/message/message-log.js';
+import { appendMessageLog, appendMessageLogStrict, buildOutboundEntry, buildInboundEntry, classifyAunPayloadForLog, findMessageLogOperationMessageId, hasMessageLogOperation } from '../core/message/message-log.js';
 import { createSendFileMarkerPattern } from '../core/message/file-markers.js';
 import { chatDirPath } from '../core/session/session-fs-store.js';
 import { appendHintAdd, appendHintRemove, parseInjectRequest } from '../core/message/pending-hints.js';
@@ -28,22 +28,31 @@ import * as outbox from '../aun/outbox.js';
 import { guessMime, formatSize } from '../utils/media-cache.js';
 import { formatPeerKey, PeerIdentityCache } from '../core/relation/peer-identity.js';
 import { getFirstStaticAgentOwner } from '../config/peer-role-resolver.js';
-import { isHClassPath } from '../core/protected-paths.js';
+import { isHClassPath } from '../core/permission/protected-paths.js';
 import { consumeAunCausation, registerAunCausation } from '../core/causation/aun-association.js';
 import { deriveCausation, normalizeCausation } from '../core/causation/context.js';
 import { recordCausationSpan } from '../core/causation/audit.js';
 import { refreshAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
 import { readInstalledEvolcoreVersion } from '../utils/evolcore-version.js';
-import { bindPostBootstrapWelcomeOutboxSession, hasPendingPostBootstrapWelcomeOutbox, bootstrapInitialMessageOperationId, postBootstrapWelcomeOperationId, preparePostBootstrapWelcomeOutbox, } from '../core/bootstrap-messages.js';
+import { toolInputForDisplay } from '../utils/tool-summary.js';
+import { bindPostBootstrapWelcomeOutboxSession, hasPendingPostBootstrapWelcomeOutbox, bootstrapInitialMessageOperationPrefix, postBootstrapWelcomeOperationId, preparePostBootstrapWelcomeOutbox, } from '../core/bootstrap-messages.js';
 import { hasMentionAll, mentionEntryAids, mentionEntryTargets, } from '../core/message/mention-schema.js';
 import { normalizeAunMentionEntries, } from '../aun/msg/mention-schema.js';
 import { isDeliveryTarget, sameDeliveryTarget } from '../core/message/message-utils.js';
+import { sentReceipt, suppressedReceipt } from '../core/message/send-receipt.js';
 export const AUN_HANDOFF_MARKER_FIELD = '_evolcore_handoff_id';
 const AUN_INTERACTION_CARD_TTL_MS = 24 * 60 * 60 * 1000;
 const AUN_INBOUND_DEDUP_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 const IMAGE_MIME_TYPE = /^image\/[!#$%&'*+.^_`|~0-9A-Za-z-]+$/i;
 const AUN_ATTACHMENT_DOWNLOAD_ATTEMPTS = 3;
 const AUN_ATTACHMENT_RETRY_DELAYS_MS = [250, 750];
+const OBSERVER_GROUP_MEMBERS_TTL_MS = 60_000;
+const OBSERVER_GROUP_MEMBERS_PAGE_SIZE = 200;
+const OBSERVER_GROUP_MEMBERS_MAX_PAGES = 100;
+const AUN_SEND_LOG_TEXT_MAX_LENGTH = 60;
+export function formatAunSendLogText(text) {
+    return text.replace(/\s+/gu, ' ').trim().slice(0, AUN_SEND_LOG_TEXT_MAX_LENGTH);
+}
 function attachmentDownloadHost(url) {
     try {
         return new URL(url).host || '<unknown>';
@@ -326,7 +335,7 @@ export function classifyAunSendFailure(value, fallback = 'AUN send failed') {
     const permanentHttpStatus = httpStatus !== undefined
         && httpStatus >= 400 && httpStatus < 500
         && !transientHttpStatus;
-    const permanentByText = !relayTargetMissing && /(?:group|peer|agent|recipient|target|member|object|task|stream)\s*(?:id\s*)?(?:not found|does not exist|不存在)|group[_ -]?not[_ -]?found|not[_ -]?a[_ -]?member|(?:permission|access|role).*(?:denied|forbidden|拒绝|无权限)|(?:invalid|malformed|bad)\s*(?:argument|param|request)|unauthori[sz]ed|authentication failed|signature invalid/i.test(text);
+    const permanentByText = !relayTargetMissing && /\b(?:group|peer|agent|recipient|target|member|object|task|stream)(?:[\s_-]+(?:id|aid))?[\s_-]*(?:not[\s_-]*found|does[\s_-]*not[\s_-]*exist)|不存在|group[_ -]?not[_ -]?found|not[_ -]?a[_ -]?member|(?:permission|access|role).*(?:denied|forbidden|拒绝|无权限)|(?:invalid|malformed|bad)\s*(?:argument|param|request)|unauthori[sz]ed|authentication failed|signature invalid/i.test(text);
     const retryByText = /timeout|timed out|temporar|unavailable|overload|rate.?limit|too many requests|try again|not connected|connection|network|socket|econn|eai_again|etimedout|epipe|broken pipe|connection refused|connect timeout|fetch failed|dns|reset by peer|gateway service degraded|upstream/i.test(text);
     const acceptedDispatch = details.dispatchStatus !== undefined
         && AUN_ACCEPTED_DISPATCH_STATUSES.has(details.dispatchStatus);
@@ -397,8 +406,10 @@ export function classifyAunSendFailure(value, fallback = 'AUN send failed') {
                     : {}),
     };
 }
-function sentOutboxResult() {
-    return { status: 'sent' };
+function sentOutboxResult(messageId) {
+    return messageId
+        ? { status: 'sent', messageId }
+        : { status: 'permanent', error: 'AUN send completed without a remote message_id', code: 'MISSING_MESSAGE_ID' };
 }
 function setIfDefined(target, key, value) {
     if (value !== undefined)
@@ -551,6 +562,35 @@ export class AUNChannel {
      * 统一的 RPC 调用包装：自动记录 OUT 发送、.ok 结果、.error 错误（含 trace + daemon.log 失败日志）。
      * 所有 client.call() 都应通过此方法调用，保证 aun-trace 里每个 OUT 调用都有"发+收/错"成对记录。
      */
+    callClient(method, params) {
+        return this.withOutboundSendGate(method, () => (this.client.call(method, params).then(value => value)));
+    }
+    withOutboundSendGate(method, run) {
+        if (!AUNChannel.OUTBOUND_SEND_METHODS.has(method))
+            return run();
+        return new Promise((resolve, reject) => {
+            this.outboundSendQueue.push({
+                run: run,
+                resolve: resolve,
+                reject,
+            });
+            this.pumpOutboundSendGate();
+        });
+    }
+    pumpOutboundSendGate() {
+        while (this.outboundSendActive < AUNChannel.OUTBOUND_SEND_CONCURRENCY
+            && this.outboundSendQueue.length > 0) {
+            const job = this.outboundSendQueue.shift();
+            this.outboundSendActive++;
+            Promise.resolve()
+                .then(job.run)
+                .then(job.resolve, job.reject)
+                .finally(() => {
+                this.outboundSendActive--;
+                this.pumpOutboundSendGate();
+            });
+        }
+    }
     async callAndTrace(method, params, opts) {
         this.trace('OUT', method, params);
         // RPC 往返计时：区分「网关慢」与「本地队列堵塞」。message.send/group.send 的
@@ -560,7 +600,7 @@ export class AUNChannel {
         // SLOW_RPC_WARN_MS 需明显低于 SDK 默认 10s 超时，以便在真正超时前提前告警。
         const SLOW_RPC_WARN_MS = 3000;
         try {
-            const result = await this.client.call(method, params);
+            const result = await this.callClient(method, params);
             const durationMs = Date.now() - rpcStart;
             if (!opts?.silentOk) {
                 const r = result;
@@ -1026,6 +1066,18 @@ export class AUNChannel {
             .replace(/[ \t]+/g, ' ')
             .trim();
     }
+    /** Normalize a command after a client-rendered friendly mention label. */
+    normalizeSlashCommandText(text) {
+        const trimmed = text.trim();
+        const leadingLabels = trimmed.match(/^(?:@[^\s]+\s+)+(?=\/)/u);
+        const commandText = leadingLabels
+            ? trimmed.slice(leadingLabels[0].length).trimStart()
+            : trimmed;
+        // Keep the command contract consistent for mixed friendly/canonical @
+        // tokens: selector labels are removed above, then known AID-shaped tokens
+        // anywhere in the command are removed by the existing helper.
+        return this.stripAllMentions(commandText);
+    }
     parsePayloadMentionsOrReject(payload, context, messageId, seq) {
         const raw = payload && typeof payload === 'object' && !Array.isArray(payload)
             ? payload.mentions
@@ -1241,6 +1293,8 @@ export class AUNChannel {
     /** 撤权可能先于 outbox 卡片投递完成；迟到卡片注册后立即撤回。 */
     invalidatedInteractions = new Map();
     mentionModeResolver;
+    /** Agent-level policy controlling whether group slash commands require structured mentions. */
+    groupSlashRequireMentionsResolver;
     static PROACTIVE_ALLOW_TYPES = new Set([
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
         'merge', 'link', 'location', 'personal_card',
@@ -1283,6 +1337,16 @@ export class AUNChannel {
     aidState;
     aidStatsCollector;
     outboxInFlight = new Set();
+    /** Shared gateway-facing send limit for replies, activity, observer and thought messages. */
+    static OUTBOUND_SEND_METHODS = new Set([
+        'message.send',
+        'group.send',
+        'message.thought.put',
+        'group.thought.put',
+    ]);
+    static OUTBOUND_SEND_CONCURRENCY = 4;
+    outboundSendActive = 0;
+    outboundSendQueue = [];
     constructor(config) {
         this.config = config;
         this.agentDir = agentDirPath(config.aid);
@@ -1355,6 +1419,14 @@ export class AUNChannel {
         }
     }
     async _initClientInner() {
+        this.observerGroupMembers.clear();
+        for (const groupId of new Set([
+            ...this.observerGroupMembershipEpoch.keys(),
+            ...this.observerGroupMemberFetches.keys(),
+        ])) {
+            this.observerGroupMembershipEpoch.set(groupId, (this.observerGroupMembershipEpoch.get(groupId) ?? 0) + 1);
+        }
+        this.observerGroupMemberFetches.clear();
         // Clean up existing client if any
         if (this.client) {
             this.trace('OUT', 'client.close', { reason: 'initClient' });
@@ -1423,6 +1495,15 @@ export class AUNChannel {
                 logger.debug(`${this.logPrefix()}[DIAG] group.message_created: group_id=${gid} sender=${sender}`);
                 this.handleIncomingGroupMessage(data);
             });
+            client.on('group.changed', (data) => {
+                if (!isCurrentClient())
+                    return;
+                const record = data && typeof data === 'object' ? data : {};
+                const envelope = record.envelope && typeof record.envelope === 'object'
+                    ? record.envelope
+                    : {};
+                this.invalidateObserverGroupMembers(envelope.group_id ?? record.group_id);
+            });
         }
         const handleSdkState = (source) => (data) => {
             if (!isCurrentClient())
@@ -1988,7 +2069,7 @@ export class AUNChannel {
         // 显式排除 observer.inject：它是 owner 对本 agent 的控制消息，不应镜像给观察者
         // （即便日后 from-owner 排除规则调整，也不会泄漏）。
         if (inboundType !== AUNChannel.INJECT_REQUEST_TYPE) {
-            this.forwardInbound(msg);
+            void this.forwardInbound(msg);
         }
         // 回声过滤：自己发出的消息会被 gateway fanout 回来，
         // 只有 from_aid == self 且 chat_id 不匹配时才丢弃（说明是其它实例发的）
@@ -2159,7 +2240,7 @@ export class AUNChannel {
         }
         // Observer forward (inbound)：群聊消息在所有过滤之前转发原始明文 payload。
         // forwardInbound 内部排除 self-echo 与 from-owner。
-        this.forwardInbound(msg);
+        void this.forwardInbound(msg);
         logger.debug(`${this.logPrefix()}[DIAG-GRP] full_msg=${JSON.stringify(msg).substring(0, 500)}`);
         if (!groupId || !senderAid) {
             this.acknowledgeImmediately(messageId, seq);
@@ -2270,9 +2351,13 @@ export class AUNChannel {
         const firstLineGroup = text.split('\n')[0] || '';
         const hasEvolCoreTraceGroup = /\[EvolCore\.(receive|reply|agent)\]/.test(text);
         const isEchoMsg = /echo/i.test(firstLineGroup) && !hasEvolCoreTraceGroup;
+        const slashCommandText = this.normalizeSlashCommandText(text);
         // 命令判定：剥离所有 @ 后看是否 / 开头（多 @ 场景如 @a @b /status 也能正确识别）。
         // echo 消息走独立的 trace 流程，不参与命令语义判定。
-        const isCommandMsg = !isEchoMsg && this.stripAllMentions(text).startsWith('/');
+        const isCommandMsg = !isEchoMsg && slashCommandText.startsWith('/');
+        const groupSlashRequireMentions = this.groupSlashRequireMentionsResolver
+            ? await this.groupSlashRequireMentionsResolver().catch(() => undefined) ?? true
+            : true;
         if (isEchoMsg) {
             // 短 echo（≤10 字符）已在前面的快速通道命中并 return，这里只处理长 echo
             // >10 字符：追加 trace,存 pending echo,跳过 mention 过滤继续走 Agent 流程
@@ -2299,9 +2384,10 @@ export class AUNChannel {
         }
         else {
             // 非 echo 消息：mention 标记（不再过滤，交给响应模式决定）
-            // slash 命令在任何 mentionMode 下都强制走 mention-only 语义
-            // 即必须 @ 本 agent（或 @all）才处理，避免广播群里一条命令被全部 agent 各自执行。
-            const enforceMention = mentionMode === 'mention-only' || isCommandMsg;
+            // slash 命令默认要求结构化 @；Agent 可通过
+            // groupSlashRequireMentions=false 选择仅按正文命令格式处理。
+            const enforceMention = (mentionMode === 'mention-only' && !isCommandMsg)
+                || (isCommandMsg && groupSlashRequireMentions);
             const isMentioned = mentionedSelf || mentionedAll;
             // 过滤逻辑下移到响应层：这里只标记，不过滤
             // 但为了保持现有行为兼容（避免大量未 @ 消息涌入），暂时保留过滤
@@ -2309,14 +2395,14 @@ export class AUNChannel {
             if (enforceMention && !isMentioned && !isOwnHandoff) {
                 this.acknowledgeImmediately(messageId, seq);
                 this.appendInboundPayloadJsonl(groupId, senderAid, messageId, msgEncrypted, true, logDescriptor, threadId, receivedAt, seq);
-                logger.info(`${this.logPrefix()} Group dropped: unmentioned (group=${groupId} sender=${senderAid} mid=${messageId} mentionMode=${mentionMode} isCommand=${isCommandMsg} textPreview=${JSON.stringify(text.slice(0, 80))})`);
+                logger.info(`${this.logPrefix()} Group dropped: unmentioned (group=${groupId} sender=${senderAid} mid=${messageId} mentionMode=${mentionMode} slashRequireMentions=${groupSlashRequireMentions} isCommand=${isCommandMsg} textPreview=${JSON.stringify(text.slice(0, 80))})`);
                 return;
             }
         }
         // 命令消息：剥离所有 @（多 agent 被 @ 时各自拿到干净的 /status 各自执行）；
         // 普通消息：仅在唯一 @ 是自己时剥离，保留其他 @ 供 agent 感知。
         const strippedText = isCommandMsg
-            ? this.stripAllMentions(text)
+            ? slashCommandText
             : this.stripSelfMentionIfOnly(text, this._aid);
         // Detect attachments before the empty-text guard (顶层 + 嵌套)
         const rawAttachments = this.collectAllAttachments(payload);
@@ -2347,7 +2433,7 @@ export class AUNChannel {
                 : mentionedSelf
                     ? (structMentionSelf ? 'mention.self(struct)' : 'mention.self(text)')
                     : `${mentionMode}.no-mention`;
-        logger.info(`${this.logPrefix()} Group mention decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${payloadType} mentionMode=${mentionMode} reason=${reason} structMentions=${JSON.stringify(payloadMentionEntries)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
+        logger.info(`${this.logPrefix()} Group mention decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${payloadType} mentionMode=${mentionMode} slashRequireMentions=${groupSlashRequireMentions} reason=${reason} structMentions=${JSON.stringify(payloadMentionEntries)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (payloadType === 'action_card_reply')
             return;
@@ -2518,6 +2604,9 @@ export class AUNChannel {
     // observable / owners 不在此处缓存——由 daemon 注入 resolver，从 EvolAgent 的
     // in-memory merged config（启动/重启/热重载时统一更新的唯一缓存）读取，避免重复缓存。
     observerConfigResolver;
+    observerGroupMembers = new Map();
+    observerGroupMemberFetches = new Map();
+    observerGroupMembershipEpoch = new Map();
     /** 注入观察者配置读取器（daemon 侧从 EvolAgent merged config 读）。 */
     setObserverConfigResolver(fn) {
         this.observerConfigResolver = fn;
@@ -2536,23 +2625,129 @@ export class AUNChannel {
      * data 为 SDK message.received / group.message_created 回调的整个对象，
      * 不拆解、不重组——SDK 信封结构变化不影响此处。
      */
+    async resolveObserverGroupMembers(groupId) {
+        if (!groupId || !this.client)
+            return undefined;
+        const cached = this.observerGroupMembers.get(groupId);
+        if (cached && cached.expiresAt > Date.now())
+            return cached.aids;
+        const pending = this.observerGroupMemberFetches.get(groupId);
+        if (pending)
+            return pending;
+        const epoch = this.observerGroupMembershipEpoch.get(groupId) ?? 0;
+        let request;
+        request = (async () => {
+            try {
+                const result = await this.callAndTrace('group.get_members', {
+                    group_id: groupId,
+                    page: 1,
+                    size: OBSERVER_GROUP_MEMBERS_PAGE_SIZE,
+                });
+                const rawMembers = Array.isArray(result?.members)
+                    ? result.members
+                    : Array.isArray(result?.items) ? result.items : undefined;
+                if (!rawMembers)
+                    return undefined;
+                const hasTotal = Number.isFinite(Number(result?.total));
+                const hasMore = result?.has_more === true || result?.hasMore === true;
+                if (!hasTotal && (hasMore || rawMembers.length >= OBSERVER_GROUP_MEMBERS_PAGE_SIZE))
+                    return undefined;
+                const allMembers = [...rawMembers];
+                const total = Number(result?.total);
+                const pageSize = Number(result?.size) > 0 ? Number(result.size) : OBSERVER_GROUP_MEMBERS_PAGE_SIZE;
+                const pageCount = Number.isFinite(total) && total > allMembers.length
+                    ? Math.ceil(total / pageSize)
+                    : 1;
+                if (pageCount > OBSERVER_GROUP_MEMBERS_MAX_PAGES)
+                    return undefined;
+                for (let page = 2; page <= pageCount; page++) {
+                    const next = await this.callAndTrace('group.get_members', {
+                        group_id: groupId,
+                        page,
+                        size: OBSERVER_GROUP_MEMBERS_PAGE_SIZE,
+                    });
+                    const nextMembers = Array.isArray(next?.members)
+                        ? next.members
+                        : Array.isArray(next?.items) ? next.items : undefined;
+                    if (!nextMembers)
+                        return undefined;
+                    allMembers.push(...nextMembers);
+                }
+                if (hasTotal && total > allMembers.length)
+                    return undefined;
+                const aids = new Set();
+                for (const member of allMembers) {
+                    const aid = typeof member === 'string'
+                        ? member.trim()
+                        : typeof member?.aid === 'string' ? member.aid.trim()
+                            : typeof member?.member_aid === 'string' ? member.member_aid.trim() : '';
+                    if (aid)
+                        aids.add(aid);
+                }
+                if ((this.observerGroupMembershipEpoch.get(groupId) ?? 0) === epoch) {
+                    this.observerGroupMembers.set(groupId, { aids, expiresAt: Date.now() + OBSERVER_GROUP_MEMBERS_TTL_MS });
+                }
+                return aids;
+            }
+            catch (error) {
+                logger.debug(`${this.logPrefix()} observer group membership lookup failed group=${groupId}: ${error}`);
+                return undefined;
+            }
+            finally {
+                if (this.observerGroupMemberFetches.get(groupId) === request) {
+                    this.observerGroupMemberFetches.delete(groupId);
+                }
+            }
+        })();
+        this.observerGroupMemberFetches.set(groupId, request);
+        return request;
+    }
+    invalidateObserverGroupMembers(groupId) {
+        if (typeof groupId !== 'string' || !groupId.trim())
+            return;
+        const key = groupId.trim();
+        this.observerGroupMembers.delete(key);
+        this.observerGroupMembershipEpoch.set(key, (this.observerGroupMembershipEpoch.get(key) ?? 0) + 1);
+    }
+    async observerRecipients(owners, envelope) {
+        if (owners.length === 0)
+            return owners;
+        const groupId = typeof envelope.group_id === 'string' ? envelope.group_id.trim() : '';
+        const members = groupId ? await this.resolveObserverGroupMembers(groupId) : undefined;
+        // Unknown membership is fail-open for observation: only an explicit member
+        // response may suppress the redundant owner DM.
+        return owners.filter(owner => !(members?.has(owner)));
+    }
     forwardInbound(data) {
         if (!this.connected || !this.client)
-            return;
+            return Promise.resolve();
         if (payloadTypeForObserver(data)?.startsWith('menu.'))
-            return;
+            return Promise.resolve();
         const { observable, owners } = this.getObserverConfig();
         if (!observable || owners.length === 0)
-            return;
-        const env = (data?.envelope && typeof data.envelope === 'object') ? data.envelope : {};
+            return Promise.resolve();
+        const env = (data?.envelope && typeof data.envelope === 'object')
+            ? { ...data.envelope }
+            : {};
+        if (!env.group_id && typeof data.group_id === 'string')
+            env.group_id = data.group_id;
         const from = env.from ?? '';
         if (this._aid && from === this._aid)
-            return; // self-echo：已在出站转过
+            return Promise.resolve(); // self-echo：已在出站转过
         // 排除来源 owner（不把"owner A 发来的"再转回 A），但仍转给其他 owner。
-        const recipientOwners = owners.filter(o => o !== from);
-        if (recipientOwners.length === 0)
-            return;
-        this.emitForward('inbound', data, recipientOwners);
+        const candidateOwners = owners.filter(o => o !== from);
+        if (candidateOwners.length === 0)
+            return Promise.resolve();
+        if (typeof env.group_id !== 'string' || !env.group_id.trim()) {
+            this.emitForward('inbound', data, candidateOwners);
+            return Promise.resolve();
+        }
+        return this.observerRecipients(candidateOwners, env)
+            .then(recipientOwners => {
+            if (recipientOwners.length > 0)
+                this.emitForward('inbound', data, recipientOwners);
+        })
+            .catch(error => logger.debug(`${this.logPrefix()} observer inbound recipient lookup failed: ${error}`));
     }
     /**
      * 出站转发：Agent 经 AUN 真实发出的消息原样转发给 owner。
@@ -2561,20 +2756,33 @@ export class AUNChannel {
      */
     forwardOutbound(result) {
         if (!this.connected || !this.client)
-            return;
+            return Promise.resolve();
         if (payloadTypeForObserver(result)?.startsWith('menu.'))
-            return;
+            return Promise.resolve();
         const { observable, owners } = this.getObserverConfig();
         if (!observable || owners.length === 0)
-            return;
-        const env = (result?.envelope && typeof result.envelope === 'object') ? result.envelope : {};
+            return Promise.resolve();
+        const env = (result?.envelope && typeof result.envelope === 'object')
+            ? { ...result.envelope }
+            : {};
+        if (!env.group_id && typeof result.group_id === 'string')
+            env.group_id = result.group_id;
         const to = env.to ?? env.group_id ?? '';
         // 过滤：若对端本身是 owner，不转发给该 owner（避免"回复你"转给你自己）；
         // 但仍转发给其他 owner。
-        const recipientOwners = owners.filter(o => o !== to);
-        if (recipientOwners.length === 0)
-            return;
-        this.emitForward('outbound', result, recipientOwners);
+        const candidateOwners = owners.filter(o => o !== to);
+        if (candidateOwners.length === 0)
+            return Promise.resolve();
+        if (typeof env.group_id !== 'string' || !env.group_id.trim()) {
+            this.emitForward('outbound', result, candidateOwners);
+            return Promise.resolve();
+        }
+        return this.observerRecipients(candidateOwners, env)
+            .then(recipientOwners => {
+            if (recipientOwners.length > 0)
+                this.emitForward('outbound', result, recipientOwners);
+        })
+            .catch(error => logger.debug(`${this.logPrefix()} observer outbound recipient lookup failed: ${error}`));
     }
     /**
      * 实际投递 observer.forward 给每个 owner，使用 daemon 的全局 AUN 默认加密设置。
@@ -3058,6 +3266,9 @@ export class AUNChannel {
     setMentionModeResolver(resolver) {
         this.mentionModeResolver = resolver;
     }
+    setGroupSlashRequireMentionsResolver(resolver) {
+        this.groupSlashRequireMentionsResolver = resolver;
+    }
     onRecall(handler) {
         this.recallHandler = handler;
     }
@@ -3083,7 +3294,11 @@ export class AUNChannel {
         }
     }
     removeDeliveredOutboxEntry(entry) {
-        if (!outbox.removeIfRouteMatches(this.config.aid, entry)) {
+        const messageId = entry.deliveryReceipt?.messageId;
+        const finalized = messageId
+            ? outbox.markDelivered(this.config.aid, entry.id, messageId, entry)
+            : outbox.removeIfRouteMatches(this.config.aid, entry);
+        if (!finalized) {
             logger.warn(`${this.logPrefix()} Preserved outbox entry whose route changed while delivery was in flight: id=${entry.id} submittedChannel=${entry.channelId}`);
         }
     }
@@ -3115,7 +3330,7 @@ export class AUNChannel {
         return `aun_status=${receipt.status ?? 'unknown'} seq=${receipt.seq ?? 'unknown'} delivery_mode=${receipt.deliveryMode ?? 'unknown'} gateway_timestamp=${receipt.timestamp ?? 'unknown'}`;
     }
     logAunSendAccepted(method, target, messageId, encrypt, result, text) {
-        const preview = text === undefined ? '' : ` text=${text.slice(0, 60)}`;
+        const preview = text === undefined ? '' : ` text=${formatAunSendLogText(text)}`;
         logger.info(`${this.logPrefix()} ${method} accepted by AUN: target=${target} mid=${messageId} encrypt=${encrypt} ${this.receiptLogFields(result)}${preview}`);
     }
     stripUndefinedDeep(value) {
@@ -3326,8 +3541,8 @@ export class AUNChannel {
         }
         messageIds.add(messageId);
         const now = Date.now();
-        const mapTtl = action.expiresAt && action.expiresAt > now
-            ? action.expiresAt - now
+        const mapTtl = typeof action.expiresAt === 'number' && Number.isFinite(action.expiresAt)
+            ? Math.max(0, action.expiresAt - now)
             : AUN_INTERACTION_CARD_TTL_MS;
         const mapTimer = setTimeout(() => {
             this.cardMessageIdMap.delete(messageId);
@@ -3390,7 +3605,7 @@ export class AUNChannel {
             params.to = targetAid;
         const callOnce = async (sendParams, fallback) => {
             const result = fallback
-                ? await this.client.call(method, sendParams)
+                ? await this.callClient(method, sendParams)
                 : await this.callAndTrace(method, sendParams);
             const mid = this.messageIdFromSendResult(result);
             if (!mid) {
@@ -3479,39 +3694,81 @@ export class AUNChannel {
         // turn malformed `mentions: [undefined]` into an apparently valid `[]`.
         const finalPayload = this.normalizeAunPayloadMentions(this.applyReplyContextToPayload(validatedPayload, context));
         const logText = opts.logText ?? this.payloadLogText(finalPayload, opts.contentKind);
-        const entry = outbox.enqueue(this.config.aid, {
-            channelId,
-            delivery,
-            type: 'payload',
-            contentKind: opts.contentKind,
-            payload: finalPayload,
-            context,
-            logText,
-            ttl: opts.ttl,
-            postSend: opts.postSend,
-        });
-        logger.debug(`${this.logPrefix()} Outbox enqueued payload: id=${entry.id} kind=${opts.contentKind} channel=${channelId} text=${logText.slice(0, 40)}`);
+        const expiresAt = opts.postSend?.type === 'register_interaction_card'
+            ? opts.postSend.expiresAt
+            : undefined;
+        if (typeof expiresAt === 'number' && Number.isFinite(expiresAt) && expiresAt <= Date.now()) {
+            return {
+                status: 'permanent',
+                error: 'interaction card has expired',
+                code: 'INTERACTION_EXPIRED',
+            };
+        }
+        const remainingTtl = typeof expiresAt === 'number' && Number.isFinite(expiresAt)
+            ? Math.max(0, expiresAt - Date.now())
+            : undefined;
+        const requestedTtl = opts.ttl ?? outbox.defaultTtl(opts.queue);
+        const ttl = remainingTtl === undefined ? opts.ttl : Math.min(requestedTtl, remainingTtl);
+        let entry;
+        try {
+            entry = outbox.enqueue(this.config.aid, {
+                queue: opts.queue,
+                channelId,
+                delivery,
+                type: 'payload',
+                contentKind: opts.contentKind,
+                payload: finalPayload,
+                context,
+                logText,
+                ttl,
+                postSend: opts.postSend,
+            });
+        }
+        catch (error) {
+            // Queue saturation is a caller-visible failure. Keep route/schema
+            // validation errors as exceptions so their existing fail-closed path is
+            // preserved, but expose OUTBOX_FULL as a structured send result.
+            if (error?.code !== 'OUTBOX_FULL')
+                throw error;
+            return {
+                status: 'permanent',
+                error: error instanceof Error ? error.message : String(error),
+                code: 'OUTBOX_FULL',
+            };
+        }
+        logger.debug(`${this.logPrefix()} Outbox enqueued payload: id=${entry.id} queue=${opts.queue ?? 'default'} kind=${opts.contentKind} channel=${channelId} text=${logText.slice(0, 40)}`);
         if (!this.connected || !this.client) {
             logger.warn(`${this.logPrefix()} Not connected, payload queued in outbox (id=${entry.id}, kind=${opts.contentKind}). Triggering reconnect.`);
             if (!this.reconnectTimer && !this.client) {
                 this.initClient().catch(e => logger.error(`${this.logPrefix()} Reconnect from sendContentPayload failed: ${e}`));
             }
-            return { queued: true };
+            return {
+                queued: true,
+                outboxId: entry.id,
+                error: 'AUN channel is not connected',
+                code: 'AUN_NOT_CONNECTED',
+            };
         }
         const result = await this.withOutboxInFlight(entry, () => this.deliverPayloadEntry(entry), { ok: false, status: 'retry', error: 'outbox send is already in flight' });
         if (result.ok) {
             this.removeDeliveredOutboxEntry(entry);
             return { messageId: result.messageId };
         }
-        if (result.status === 'permanent') {
+        if (result.status === 'permanent' || result.status === 'failed') {
             this.markPermanentOutboxFailure(entry, result);
             return {
                 status: 'permanent',
+                outboxId: entry.id,
                 ...(result.error !== undefined ? { error: result.error } : {}),
                 ...(result.code !== undefined ? { code: result.code } : {}),
             };
         }
-        return { queued: true };
+        return {
+            queued: true,
+            outboxId: entry.id,
+            ...(result.error !== undefined ? { error: result.error } : {}),
+            ...(result.code !== undefined ? { code: result.code } : {}),
+        };
     }
     buildTaskPayloadBase(envelope, context) {
         const base = {};
@@ -3619,9 +3876,15 @@ export class AUNChannel {
         return truncated;
     }
     buildActivityPayload(envelope, context, item) {
-        const activityItem = item && typeof item === 'object' && !Array.isArray(item)
+        const rawItem = item && typeof item === 'object' && !Array.isArray(item)
             ? { ...item }
             : { kind: 'unknown', text: String(item ?? '') };
+        const displayArguments = rawItem.kind === 'tool_call'
+            ? toolInputForDisplay(rawItem.name, rawItem.arguments)
+            : undefined;
+        const activityItem = rawItem.kind === 'tool_call' && displayArguments !== rawItem.arguments
+            ? { ...rawItem, arguments: displayArguments }
+            : rawItem;
         return {
             ...this.buildTaskPayloadBase(envelope, context),
             type: 'activity',
@@ -3629,16 +3892,22 @@ export class AUNChannel {
         };
     }
     async sendReliableStructured(channelId, payload, context, logText) {
-        await this.sendContentPayload(channelId, payload, {
+        const result = await this.sendContentPayload(channelId, payload, {
             contentKind: 'custom',
             context,
             logText: logText ?? this.payloadLogText(payload, 'custom'),
         });
+        if (result.status === 'permanent' || result.status === 'failed') {
+            throw Object.assign(new Error(result.error ?? 'AUN structured send failed'), {
+                code: result.code ?? 'AUN_SEND_FAILED',
+                outboxId: result.outboxId,
+            });
+        }
     }
     async sendMessage(channelId, text, context) {
         if (!text?.trim()) {
             logger.warn(`${this.logPrefix()} Attempted to send empty message, skipping`);
-            return;
+            return { status: 'failed', error: 'message text is empty', code: 'EMPTY_MESSAGE' };
         }
         const delivery = this.requireDelivery(channelId, context);
         const routedContext = this.withDelivery(context, delivery);
@@ -3676,13 +3945,14 @@ export class AUNChannel {
             : undefined;
         if (operationId) {
             const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', channelId, this.config.aid);
-            if (hasMessageLogOperation(chatDir, operationId)) {
+            const completedMessageId = findMessageLogOperationMessageId(chatDir, operationId);
+            if (completedMessageId) {
                 const duplicate = outbox.findByDedupeKey(this.config.aid, operationId);
                 if (duplicate) {
                     outbox.remove(this.config.aid, duplicate.id);
                     logger.info(`${this.logPrefix()} Removed stale outbox entry for completed operation: ${operationId}`);
                 }
-                return;
+                return { status: 'sent', messageId: completedMessageId };
             }
         }
         // Write-ahead: persist to outbox before attempting send
@@ -3698,9 +3968,19 @@ export class AUNChannel {
                 ? routedContext.metadata.outboxTtl
                 : undefined,
         });
+        if (entry.deliveryResult?.messageId || entry.deliveryReceipt?.messageId) {
+            const messageId = entry.deliveryResult?.messageId ?? entry.deliveryReceipt.messageId;
+            logger.info(`${this.logPrefix()} Reusing completed durable operation: operation=${operationId ?? '<none>'} entry=${entry.id} mid=${messageId}`);
+            return { status: 'sent', messageId };
+        }
         if (entry.terminal) {
             logger.warn(`${this.logPrefix()} Skipping previously terminated durable operation: operation=${operationId ?? '<none>'} entry=${entry.id} code=${entry.lastErrorCode ?? 'unknown'}`);
-            return;
+            return {
+                status: 'failed',
+                outboxId: entry.id,
+                error: entry.lastError ?? entry.terminal.error,
+                ...(entry.lastErrorCode !== undefined ? { code: entry.lastErrorCode } : {}),
+            };
         }
         logger.debug(`${this.logPrefix()} Outbox enqueued: id=${entry.id} channel=${channelId} text=${finalText.slice(0, 40)}`);
         // 积压深度告警：outbox 待发条目累积说明发送速度跟不上，回复将出现明显延迟。
@@ -3713,16 +3993,40 @@ export class AUNChannel {
             if (!this.reconnectTimer && !this.client) {
                 this.initClient().catch(e => logger.error(`${this.logPrefix()} Reconnect from sendMessage failed: ${e}`));
             }
-            return;
+            return { status: 'queued', outboxId: entry.id, error: 'AUN channel is not connected', code: 'AUN_NOT_CONNECTED' };
         }
         // Attempt immediate delivery
         const result = await this.withOutboxInFlight(entry, () => this.deliverTextEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
         if (result.status === 'sent') {
+            const messageId = result.messageId ?? entry.deliveryReceipt?.messageId;
+            if (!messageId) {
+                const error = 'AUN send completed without a remote message_id';
+                this.markPermanentOutboxFailure(entry, { error, code: 'MISSING_MESSAGE_ID' });
+                return { status: 'failed', outboxId: entry.id, error, code: 'MISSING_MESSAGE_ID' };
+            }
             this.removeDeliveredOutboxEntry(entry);
+            return { status: 'sent', messageId };
         }
         else if (result.status === 'permanent') {
             this.markPermanentOutboxFailure(entry, result);
+            return {
+                status: 'failed',
+                outboxId: entry.id,
+                error: result.error ?? 'permanent AUN send failure',
+                ...(result.code !== undefined ? { code: result.code } : {}),
+            };
         }
+        // A gateway receipt may already have been checkpointed even if local
+        // post-send bookkeeping needs a retry. Remote acceptance still wins.
+        if (entry.deliveryReceipt?.messageId) {
+            return { status: 'sent', messageId: entry.deliveryReceipt.messageId };
+        }
+        return {
+            status: 'queued',
+            outboxId: entry.id,
+            ...(result.error !== undefined ? { error: result.error } : {}),
+            ...(result.code !== undefined ? { code: result.code } : {}),
+        };
     }
     /** Daemon-side transport for `ec msg send` running inside an agent task. */
     async sendDaemonMsg(args) {
@@ -4005,9 +4309,10 @@ export class AUNChannel {
             || (typeof context?.metadata?.operationId === 'string' ? context.metadata.operationId : undefined);
         if (operationId) {
             const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', channelId, this.config.aid);
-            if (hasMessageLogOperation(chatDir, operationId)) {
+            const completedMessageId = findMessageLogOperationMessageId(chatDir, operationId);
+            if (completedMessageId) {
                 logger.info(`${this.logPrefix()} Durable operation already logged; skipping duplicate send: ${operationId}`);
-                return sentOutboxResult();
+                return sentOutboxResult(completedMessageId);
             }
             if (operationId === postBootstrapWelcomeOperationId(this.config.aid)) {
                 const agentConfig = loadAgent(this.config.aid);
@@ -4054,7 +4359,7 @@ export class AUNChannel {
                 source,
                 transport: entry.deliveryReceipt.transport,
             });
-            return sentOutboxResult();
+            return sentOutboxResult(entry.deliveryReceipt.messageId);
         }
         const encryptTarget = isGroup ? channelId : targetAid;
         const encrypt = context?.metadata?.encrypted != null
@@ -4063,6 +4368,7 @@ export class AUNChannel {
         const params = { payload, encrypt };
         if (context?.metadata?.persistRequired === true)
             params.persist_required = true;
+        let acceptedMessageId;
         try {
             if (isGroup) {
                 params.group_id = channelId;
@@ -4082,6 +4388,7 @@ export class AUNChannel {
                     return failure;
                 }
                 else {
+                    acceptedMessageId = mid;
                     this.logAunSendAccepted('group.send', channelId, mid, encrypt, result, finalText);
                     this.checkpointTextDelivery(entry, mid, encrypt, result);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
@@ -4104,6 +4411,7 @@ export class AUNChannel {
                     return classifyAunSendFailure(result, 'message.send returned no message_id');
                 }
                 else {
+                    acceptedMessageId = mid;
                     this.logAunSendAccepted('message.send', this.peerLabel(targetAid), mid, encrypt, result, finalText);
                     this.checkpointTextDelivery(entry, mid, encrypt, result);
                     const causation = normalizeCausation(context?.metadata?.causation);
@@ -4124,7 +4432,7 @@ export class AUNChannel {
                     this.forwardOutbound(result);
                 }
             }
-            return sentOutboxResult();
+            return sentOutboxResult(acceptedMessageId);
         }
         catch (e) {
             if (entry.deliveryReceipt) {
@@ -4139,7 +4447,7 @@ export class AUNChannel {
                 try {
                     if (isGroup) {
                         this.trace('OUT', 'group.send.fallback', params);
-                        const result = await this.client.call('group.send', params);
+                        const result = await this.callClient('group.send', params);
                         const mid = this.messageIdFromSendResult(result);
                         if (!mid) {
                             const resultRecord = errorRecord(result);
@@ -4148,6 +4456,7 @@ export class AUNChannel {
                             logger.warn(`${this.logPrefix()} group.send fallback returned no message_id: ${JSON.stringify(result)}`);
                             return classifyAunSendFailure(result, 'group.send plaintext fallback returned no message_id');
                         }
+                        acceptedMessageId = mid;
                         this.trace('OUT', 'group.send.fallback.ok', { message_id: mid });
                         this.checkpointTextDelivery(entry, mid, false, result);
                         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
@@ -4161,13 +4470,14 @@ export class AUNChannel {
                     }
                     else {
                         this.trace('OUT', 'message.send.fallback', params);
-                        const result = await this.client.call('message.send', params);
+                        const result = await this.callClient('message.send', params);
                         const mid = this.messageIdFromSendResult(result);
                         if (!mid) {
                             this.trace('OUT', 'message.send.fallback.missing_id', {});
                             logger.warn(`${this.logPrefix()} message.send fallback returned no message_id: ${JSON.stringify(result)}`);
                             return classifyAunSendFailure(result, 'message.send plaintext fallback returned no message_id');
                         }
+                        acceptedMessageId = mid;
                         this.trace('OUT', 'message.send.fallback.ok', { message_id: mid });
                         this.checkpointTextDelivery(entry, mid, false, result);
                         const causation = normalizeCausation(context?.metadata?.causation);
@@ -4186,7 +4496,7 @@ export class AUNChannel {
                         });
                         this.forwardOutbound(result);
                     }
-                    return sentOutboxResult();
+                    return sentOutboxResult(acceptedMessageId);
                 }
                 catch (e2) {
                     if (entry.deliveryReceipt) {
@@ -4214,6 +4524,7 @@ export class AUNChannel {
             id: entry.id,
             channelId: entry.channelId,
             delivery: entry.delivery,
+            queue: entry.queue,
         };
         const receipt = {
             messageId,
@@ -4238,6 +4549,20 @@ export class AUNChannel {
             logger.info(`${this.logPrefix()} Discarded invalidated interaction from durable outbox: request=${interactionId} entry=${entry.id}`);
             return { ok: true, status: 'sent' };
         }
+        const interactionExpiresAt = entry.postSend?.type === 'register_interaction_card'
+            ? entry.postSend.expiresAt
+            : undefined;
+        if (typeof interactionExpiresAt === 'number'
+            && Number.isFinite(interactionExpiresAt)
+            && interactionExpiresAt <= Date.now()) {
+            logger.info(`${this.logPrefix()} Discarded expired interaction from durable outbox: request=${interactionId ?? '<unknown>'} entry=${entry.id}`);
+            return {
+                ok: false,
+                status: 'permanent',
+                error: 'interaction card has expired',
+                code: 'INTERACTION_EXPIRED',
+            };
+        }
         const channelId = entry.channelId;
         const payload = entry.payload;
         if (!payload) {
@@ -4696,7 +5021,7 @@ export class AUNChannel {
                 return { status: 'permanent', error: 'image outbox entry disappeared during upload', code: 'OUTBOX_ENTRY_MISSING' };
             }
             const sent = await this.deliverPayloadEntry(entry);
-            return sent.ok ? sentOutboxResult() : sent;
+            return sent.ok ? sentOutboxResult(sent.messageId) : sent;
         }
         catch (error) {
             const failure = classifyAunSendFailure(error, 'image upload or send failed');
@@ -4728,7 +5053,7 @@ export class AUNChannel {
                     source,
                     transport: entry.deliveryReceipt.transport,
                 });
-                return sentOutboxResult();
+                return sentOutboxResult(entry.deliveryReceipt.messageId);
             }
             catch (error) {
                 const detail = error instanceof Error ? error.message : String(error);
@@ -4805,7 +5130,7 @@ export class AUNChannel {
                 if (isGroup) {
                     params.group_id = delivery.groupId;
                     this.trace('OUT', 'group.send.file', params);
-                    const result = await this.client.call('group.send', params);
+                    const result = await this.callClient('group.send', params);
                     sendResult = result;
                     const fileMid = this.messageIdFromSendResult(result);
                     sentMid = fileMid ?? null;
@@ -4818,7 +5143,7 @@ export class AUNChannel {
                 else {
                     params.to = fileTargetAid;
                     this.trace('OUT', 'message.send.file', params);
-                    const result = await this.client.call('message.send', params);
+                    const result = await this.callClient('message.send', params);
                     sendResult = result;
                     sentMid = this.messageIdFromSendResult(result);
                     this.trace('OUT', 'message.send.file.ok', { message_id: sentMid });
@@ -4839,7 +5164,7 @@ export class AUNChannel {
                     params.encrypt = false;
                     if (isGroup) {
                         this.trace('OUT', 'group.send.file.fallback', params);
-                        const result = await this.client.call('group.send', params);
+                        const result = await this.callClient('group.send', params);
                         sendResult = result;
                         const fbMid = this.messageIdFromSendResult(result);
                         sentMid = fbMid ?? null;
@@ -4851,7 +5176,7 @@ export class AUNChannel {
                     }
                     else {
                         this.trace('OUT', 'message.send.file.fallback', params);
-                        const result = await this.client.call('message.send', params);
+                        const result = await this.callClient('message.send', params);
                         sendResult = result;
                         sentMid = this.messageIdFromSendResult(result);
                         this.trace('OUT', 'message.send.file.fallback.ok', { message_id: sentMid });
@@ -4887,7 +5212,7 @@ export class AUNChannel {
             });
             if (sendResult)
                 this.forwardOutbound(sendResult);
-            return sentOutboxResult();
+            return sentOutboxResult(sentMid);
         }
         catch (e) {
             if (entry.deliveryReceipt) {
@@ -4907,7 +5232,7 @@ export class AUNChannel {
         if (this.outboxTimer)
             return;
         this.outboxTimer = setInterval(() => {
-            if (this.connected && this.client && outbox.hasPending(this.config.aid)) {
+            if (this.connected && this.client && (outbox.hasPending(this.config.aid) || outbox.hasPending(this.config.aid, 'activity'))) {
                 this.drainOutbox();
             }
         }, 30_000);
@@ -4922,36 +5247,42 @@ export class AUNChannel {
         if (!this.connected || !this.client)
             return;
         this.repairBootstrapRoutes();
-        if (!outbox.hasPending(this.config.aid))
-            return;
-        logger.info(`${this.logPrefix()} Draining outbox...`);
-        const result = await outbox.drain(this.config.aid, async (entry) => {
-            if (!isDeliveryTarget(entry.delivery)) {
-                logger.warn(`${this.logPrefix()} Discarding legacy/malformed outbox entry without a trusted delivery route: id=${entry.id} channel=${entry.channelId}`);
-                return {
-                    status: 'permanent',
-                    error: 'outbox entry has no valid delivery route',
-                    code: 'AUN_OUTBOUND_ROUTE_REQUIRED',
-                };
-            }
-            if (entry.type === 'text') {
-                return this.withOutboxInFlight(entry, () => this.deliverTextEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
-            }
-            else if (entry.type === 'file') {
-                return this.withOutboxInFlight(entry, () => this.deliverFileEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
-            }
-            else if (entry.type === 'image') {
-                return this.withOutboxInFlight(entry, () => this.deliverImageEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
-            }
-            else if (entry.type === 'payload') {
-                const sent = await this.withOutboxInFlight(entry, () => this.deliverPayloadEntry(entry), { ok: false, status: 'retry', error: 'outbox send is already in flight' });
-                return sent.ok ? { status: 'sent' } : sent;
+        const drainQueue = async (queue) => {
+            if (!outbox.hasPending(this.config.aid, queue))
+                return;
+            logger.info(`${this.logPrefix()} Draining ${queue} outbox...`);
+            const result = await outbox.drain(this.config.aid, async (entry) => {
+                if (!isDeliveryTarget(entry.delivery)) {
+                    logger.warn(`${this.logPrefix()} Discarding legacy/malformed outbox entry without a trusted delivery route: id=${entry.id} channel=${entry.channelId}`);
+                    return {
+                        status: 'permanent',
+                        error: 'outbox entry has no valid delivery route',
+                        code: 'AUN_OUTBOUND_ROUTE_REQUIRED',
+                    };
+                }
+                if (entry.type === 'text') {
+                    return this.withOutboxInFlight(entry, () => this.deliverTextEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
+                }
+                else if (entry.type === 'file') {
+                    return this.withOutboxInFlight(entry, () => this.deliverFileEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
+                }
+                else if (entry.type === 'image') {
+                    return this.withOutboxInFlight(entry, () => this.deliverImageEntry(entry), { status: 'retry', error: 'outbox send is already in flight' });
+                }
+                else if (entry.type === 'payload') {
+                    const sent = await this.withOutboxInFlight(entry, () => this.deliverPayloadEntry(entry), { ok: false, status: 'retry', error: 'outbox send is already in flight' });
+                    return sent.ok
+                        ? { status: 'sent', ...(sent.messageId ? { messageId: sent.messageId } : {}) }
+                        : sent;
+                }
+                return { status: 'permanent', error: `unsupported outbox entry type: ${entry.type}`, code: 'UNSUPPORTED_OUTBOX_TYPE' };
+            }, queue);
+            if (result.sent > 0 || result.expired > 0 || result.permanent) {
+                logger.info(`${this.logPrefix()} ${queue} outbox drained: sent=${result.sent} expired=${result.expired} failed=${result.failed} permanent=${result.permanent ?? 0}`);
             }
-            return { status: 'permanent', error: `unsupported outbox entry type: ${entry.type}`, code: 'UNSUPPORTED_OUTBOX_TYPE' };
-        });
-        if (result.sent > 0 || result.expired > 0 || result.permanent) {
-            logger.info(`${this.logPrefix()} Outbox drained: sent=${result.sent} expired=${result.expired} failed=${result.failed} permanent=${result.permanent ?? 0}`);
-        }
+        };
+        await drainQueue('default');
+        await drainQueue('activity');
     }
     /** Repair bootstrap outbox entries to the configured personal Owner route. */
     repairBootstrapRoutes() {
@@ -4959,13 +5290,11 @@ export class AUNChannel {
         const owner = getFirstStaticAgentOwner(aid);
         if (!owner)
             return;
-        const operationIds = new Set([
-            bootstrapInitialMessageOperationId(aid),
-            postBootstrapWelcomeOperationId(aid),
-        ]);
-        const entries = [...operationIds]
-            .map(operationId => outbox.findByDedupeKey(aid, operationId, { includeTerminal: true }))
-            .filter((entry) => !!entry?.channelId);
+        const completionEntry = outbox.findByDedupeKey(aid, postBootstrapWelcomeOperationId(aid), { includeTerminal: true });
+        const entries = [
+            ...outbox.findByDedupePrefix(aid, bootstrapInitialMessageOperationPrefix(aid), { includeTerminal: true }),
+            ...(completionEntry ? [completionEntry] : []),
+        ].filter((entry) => !!entry?.channelId);
         for (const entry of entries) {
             const delivery = { chatType: 'private' };
             const nestedDelivery = entry.context?.delivery;
@@ -5325,6 +5654,13 @@ export class AUNChannelPlugin {
                 const delivery = requireEnvelopeDelivery(channelId, envelope?.delivery, envelope?.replyContext?.delivery);
                 const parentCausation = normalizeCausation(envelope.causation ?? envelope.replyContext?.metadata?.causation);
                 const outboundCausation = parentCausation ? deriveCausation(parentCausation) : undefined;
+                const operationId = envelope.operationId ?? envelope.taskId;
+                // A task can emit multiple independent intermediate text chunks. Keep
+                // the task operation ID in the receipt, but do not use it as the
+                // durable-send dedupe key for each non-final chunk.
+                const dedupeOperationId = payload.kind === 'result.text' && payload.isFinal === false
+                    ? undefined
+                    : operationId;
                 const replyCtx = outboundCausation
                     ? {
                         ...(envelope.replyContext ?? {}),
@@ -5345,11 +5681,61 @@ export class AUNChannelPlugin {
                     case 'result.text':
                     case 'command.result':
                     case 'command.error': {
-                        const sendCtx = { ...(replyCtx ?? {}) };
+                        const sendCtx = {
+                            ...(replyCtx ?? {}),
+                            metadata: {
+                                ...Object.fromEntries(Object.entries(replyCtx?.metadata ?? {})
+                                    .filter(([key]) => key !== 'operationId')),
+                                ...(dedupeOperationId ? { operationId: dedupeOperationId } : {}),
+                            },
+                        };
                         if (payload.kind === 'result.text' && payload.isFinal)
                             sendCtx.title = '✅ 最终回复:';
-                        await channel.sendMessage(channelId, payload.text, sendCtx);
-                        return;
+                        let result;
+                        try {
+                            result = await channel.sendMessage(channelId, payload.text, sendCtx);
+                        }
+                        catch (error) {
+                            if (error?.code !== 'OUTBOX_FULL')
+                                throw error;
+                            return {
+                                status: 'failed',
+                                operationId,
+                                messages: [],
+                                error: error instanceof Error ? error.message : String(error),
+                                code: 'OUTBOX_FULL',
+                            };
+                        }
+                        if (result.status === 'sent') {
+                            return {
+                                status: 'sent',
+                                operationId,
+                                messageId: result.messageId,
+                                messages: [{
+                                        messageId: result.messageId,
+                                        partIndex: 0,
+                                        ...(sendCtx.threadId ? { threadId: sendCtx.threadId } : {}),
+                                    }],
+                            };
+                        }
+                        if (result.status === 'queued') {
+                            return {
+                                status: 'queued',
+                                operationId,
+                                messages: [],
+                                outboxId: result.outboxId,
+                                ...(result.error !== undefined ? { error: result.error } : {}),
+                                ...(result.code !== undefined ? { code: result.code } : {}),
+                            };
+                        }
+                        return {
+                            status: 'failed',
+                            operationId,
+                            messages: [],
+                            ...(result.outboxId !== undefined ? { outboxId: result.outboxId } : {}),
+                            error: result.error,
+                            ...(result.code !== undefined ? { code: result.code } : {}),
+                        };
                     }
                     case 'system.notice': {
                         const noticePayload = {
@@ -5402,6 +5788,9 @@ export class AUNChannelPlugin {
                     }
                     case 'activity.batch': {
                         const items = Array.isArray(payload.items) ? payload.items : [];
+                        const messageIds = [];
+                        let queuedResult;
+                        let failedResult;
                         for (const item of items) {
                             if (item?.kind === 'progress') {
                                 const metadata = { activityType: 'progress' };
@@ -5417,10 +5806,51 @@ export class AUNChannelPlugin {
                                 await channel.sendThought(channelId, envelope.taskId, aunPayload, replyCtx);
                             }
                             else {
-                                await channel.sendReliableStructured(channelId, aunPayload, replyCtx, channel.activityLogText(item));
+                                const result = await channel.sendContentPayload(channelId, aunPayload, {
+                                    queue: 'activity',
+                                    contentKind: 'custom',
+                                    context: replyCtx,
+                                    logText: channel.activityLogText(item),
+                                });
+                                if (result.status === 'permanent' || result.status === 'failed')
+                                    failedResult ??= result;
+                                else if (result.status === 'retry' || result.status === 'queued' || result.queued)
+                                    queuedResult ??= result;
+                                else if (result.messageId)
+                                    messageIds.push(result.messageId);
                             }
                         }
-                        return;
+                        if (failedResult) {
+                            return {
+                                status: 'failed',
+                                operationId,
+                                messages: [],
+                                ...(failedResult.outboxId !== undefined ? { outboxId: failedResult.outboxId } : {}),
+                                error: failedResult.error ?? 'AUN activity delivery failed',
+                                ...(failedResult.code !== undefined ? { code: failedResult.code } : {}),
+                            };
+                        }
+                        if (queuedResult) {
+                            return queuedResult.outboxId
+                                ? {
+                                    status: 'queued',
+                                    operationId,
+                                    messages: [],
+                                    outboxId: queuedResult.outboxId,
+                                    ...(queuedResult.error !== undefined ? { error: queuedResult.error } : {}),
+                                    ...(queuedResult.code !== undefined ? { code: queuedResult.code } : {}),
+                                }
+                                : {
+                                    status: 'failed',
+                                    operationId,
+                                    messages: [],
+                                    error: 'queued activity is missing its outbox id',
+                                    code: 'MISSING_OUTBOX_ID',
+                                };
+                        }
+                        if (messageIds.length > 0)
+                            return sentReceipt(envelope, messageIds, replyCtx?.threadId);
+                        return suppressedReceipt(envelope, 'empty_activity');
                     }
                     case 'status.progress':
                         channel.sendProcessingStatus(channelId, 'progress', envelope.sessionId ?? envelope.taskId, envelope.taskId, replyCtx, payload.metadata);
@@ -5449,6 +5879,44 @@ export class AUNChannelPlugin {
                     case 'interaction': {
                         const req = payload.interaction;
                         const cardTtlMs = AUN_INTERACTION_CARD_TTL_MS;
+                        const cardExpiresAt = typeof req.expiresAt === 'number' && Number.isFinite(req.expiresAt)
+                            ? req.expiresAt
+                            : Date.now() + cardTtlMs;
+                        const toInteractionReceipt = (result) => {
+                            if ((result.status === undefined || result.status === 'sent') && result.messageId) {
+                                return sentReceipt(envelope, [result.messageId], replyCtx?.threadId);
+                            }
+                            if (result.status === 'retry' || result.status === 'queued' || result.queued) {
+                                if (!result.outboxId) {
+                                    return {
+                                        status: 'failed',
+                                        operationId,
+                                        messages: [],
+                                        error: 'queued interaction is missing its outbox id',
+                                        code: 'MISSING_OUTBOX_ID',
+                                    };
+                                }
+                                return {
+                                    status: 'queued',
+                                    operationId,
+                                    messages: [],
+                                    outboxId: result.outboxId,
+                                    ...(result.error !== undefined ? { error: result.error } : {}),
+                                    ...(result.code !== undefined ? { code: result.code } : {}),
+                                };
+                            }
+                            if (result.status === 'permanent' || result.status === 'failed') {
+                                return {
+                                    status: 'failed',
+                                    operationId,
+                                    messages: [],
+                                    ...(result.outboxId !== undefined ? { outboxId: result.outboxId } : {}),
+                                    error: result.error ?? 'AUN interaction delivery failed',
+                                    ...(result.code !== undefined ? { code: result.code } : {}),
+                                };
+                            }
+                            return suppressedReceipt(envelope, 'interaction_not_sent');
+                        };
                         if (req.kind.kind === 'action') {
                             const action = req.kind;
                             const aunCard = {
@@ -5472,7 +5940,7 @@ export class AUNChannelPlugin {
                                 aunCard.initiator = req.initiatorId;
                             if (replyCtx?.threadId)
                                 aunCard.thread_id = replyCtx.threadId;
-                            await channel.sendContentPayload(channelId, aunCard, {
+                            const result = await channel.sendContentPayload(channelId, aunCard, {
                                 contentKind: 'card',
                                 context: replyCtx,
                                 logText: action.title ? `[card] ${action.title}` : '[card]',
@@ -5482,9 +5950,10 @@ export class AUNChannelPlugin {
                                     isCommandCard: false,
                                     initiatorAid: req.initiatorId,
                                     delivery: replyCtx?.delivery,
-                                    expiresAt: Date.now() + cardTtlMs,
+                                    expiresAt: cardExpiresAt,
                                 },
                             });
+                            return toInteractionReceipt(result);
                         }
                         else if (req.kind.kind === 'command-card') {
                             const card = req.kind;
@@ -5510,7 +5979,7 @@ export class AUNChannelPlugin {
                                 aunCard.initiator = req.initiatorId;
                             if (replyCtx?.threadId)
                                 aunCard.thread_id = replyCtx.threadId;
-                            await channel.sendContentPayload(channelId, aunCard, {
+                            const result = await channel.sendContentPayload(channelId, aunCard, {
                                 contentKind: 'card',
                                 context: replyCtx,
                                 logText: card.title ? `[card] ${card.title}` : '[card]',
@@ -5520,14 +5989,35 @@ export class AUNChannelPlugin {
                                     isCommandCard: true,
                                     initiatorAid: req.initiatorId,
                                     delivery: replyCtx?.delivery,
-                                    expiresAt: Date.now() + cardTtlMs,
+                                    expiresAt: cardExpiresAt,
                                 },
                             });
+                            return toInteractionReceipt(result);
                         }
                         else if (payload.fallbackText) {
-                            await channel.sendMessage(channelId, payload.fallbackText, replyCtx);
+                            const result = await channel.sendMessage(channelId, payload.fallbackText, replyCtx);
+                            if (result.status === 'sent')
+                                return sentReceipt(envelope, [result.messageId], replyCtx?.threadId);
+                            if (result.status === 'queued') {
+                                return {
+                                    status: 'queued',
+                                    operationId,
+                                    messages: [],
+                                    outboxId: result.outboxId,
+                                    ...(result.error !== undefined ? { error: result.error } : {}),
+                                    ...(result.code !== undefined ? { code: result.code } : {}),
+                                };
+                            }
+                            return {
+                                status: 'failed',
+                                operationId,
+                                messages: [],
+                                ...(result.outboxId !== undefined ? { outboxId: result.outboxId } : {}),
+                                error: result.error,
+                                ...(result.code !== undefined ? { code: result.code } : {}),
+                            };
                         }
-                        return;
+                        return suppressedReceipt(envelope, 'empty_interaction');
                     }
                     case 'custom': {
                         const text = typeof payload.payload === 'string' ? payload.payload : JSON.stringify(payload.payload);
@@ -5570,7 +6060,7 @@ export class AUNChannelPlugin {
             registerBridge(bridge, channelType) {
                 bridge.register(adapter.channelName, (handler) => channel.onMessage(async (opts) => {
                     handler(aunOptsToInbound(opts, adapter.channelName, channelType));
-                }), (channelId, text, replyContext) => channel.sendMessage(channelId, text, replyContext), adapter, channelType);
+                }), async (channelId, text, replyContext) => { await channel.sendMessage(channelId, text, replyContext); }, adapter, channelType);
             },
             registerHooks(hookCtx) {
                 channel.setEventBus(hookCtx.eventBus);
@@ -5594,6 +6084,11 @@ export class AUNChannelPlugin {
                         }, { cache: true }).mentionMode;
                     });
                 }
+                if (typeof channel.setGroupSlashRequireMentionsResolver === 'function') {
+                    channel.setGroupSlashRequireMentionsResolver(async () => {
+                        return resolveEffective({ self: aid }, { cache: true }).groupSlashRequireMentions ?? true;
+                    });
+                }
             },
         };
     }