evolcore 0.0.20 → 0.0.21

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,7 +28,7 @@ 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';
@@ -38,12 +38,17 @@ import { bindPostBootstrapWelcomeOutboxSession, hasPendingPostBootstrapWelcomeOu
 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 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 +331,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 +402,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 +558,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 +596,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;
@@ -1283,6 +1319,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);
@@ -3083,7 +3129,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 +3165,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 +3376,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 +3440,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 +3529,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 = {};
@@ -3629,16 +3721,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 +3774,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 +3797,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 +3822,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 +4138,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 +4188,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 +4197,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 +4217,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 +4240,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 +4261,7 @@ export class AUNChannel {
                     this.forwardOutbound(result);
                 }
             }
-            return sentOutboxResult();
+            return sentOutboxResult(acceptedMessageId);
         }
         catch (e) {
             if (entry.deliveryReceipt) {
@@ -4139,7 +4276,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 +4285,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 +4299,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 +4325,7 @@ export class AUNChannel {
                         });
                         this.forwardOutbound(result);
                     }
-                    return sentOutboxResult();
+                    return sentOutboxResult(acceptedMessageId);
                 }
                 catch (e2) {
                     if (entry.deliveryReceipt) {
@@ -4214,6 +4353,7 @@ export class AUNChannel {
             id: entry.id,
             channelId: entry.channelId,
             delivery: entry.delivery,
+            queue: entry.queue,
         };
         const receipt = {
             messageId,
@@ -4238,6 +4378,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 +4850,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 +4882,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 +4959,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 +4972,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 +4993,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 +5005,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 +5041,7 @@ export class AUNChannel {
             });
             if (sendResult)
                 this.forwardOutbound(sendResult);
-            return sentOutboxResult();
+            return sentOutboxResult(sentMid);
         }
         catch (e) {
             if (entry.deliveryReceipt) {
@@ -4907,7 +5061,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 +5076,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() {
@@ -5325,6 +5485,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 +5512,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 +5619,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 +5637,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 +5710,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 +5771,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 +5781,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 +5810,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 +5820,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 +5891,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);