evolcore 0.0.2 → 0.0.4

package/dist/channels/aun.js

@@ -7,10 +7,11 @@ import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { middleOutputModePolicy, resolveShowActivities, showActivitiesPolicy } from '../core/channel-loader.js';
 import { DEFAULT_FLUSH_DELAY_SECONDS } from '../types.js';
-import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath, resolveRoot } from '../paths.js';
+import { resolvePaths, agentMdPath as agentMdPathFn, agentDir as agentDirPath, resolveRoot } from '../paths.js';
 import { saveToUploads, sanitizeFileName, bufferToInboundImage, safeFetch } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
 import { appendMessageLog, buildOutboundEntry, buildInboundEntry, classifyAunPayloadForLog } 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';
 import { appendAidLifecycle } from '../aun/aid/identity.js';
@@ -31,6 +32,8 @@ import { consumeAunCausation, registerAunCausation } from '../core/causation/aun
 import { deriveCausation, normalizeCausation } from '../core/causation/context.js';
 import { recordCausationSpan } from '../core/causation/audit.js';
 import { isExplicitGroupId } from '../aun/group-identity.js';
+import { refreshAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
+import { readInstalledEvolcoreVersion } from '../utils/evolcore-version.js';
 export const AUN_HANDOFF_MARKER_FIELD = '_evolcore_handoff_id';
 /**
  * 构造 connect extra_info：自描述本进程身份。
@@ -45,7 +48,7 @@ function buildConnectExtraInfo(opts) {
     const startedAt = getProcessStartTime(process.pid) ?? Date.now();
     return {
         app: 'evolcore',
-        version: getEvolcoreVersion(),
+        version: readInstalledEvolcoreVersion(),
         pid: process.pid,
         started_at: startedAt,
         started_at_iso: new Date(startedAt).toISOString(),
@@ -59,23 +62,14 @@ function buildConnectExtraInfo(opts) {
         channel_name: opts.channelName ?? '',
     };
 }
-let _cachedVersion = null;
-function getEvolcoreVersion() {
-    if (_cachedVersion !== null)
-        return _cachedVersion;
-    try {
-        const pkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'package.json'), 'utf-8'));
-        _cachedVersion = String(pkg.version ?? '');
-    }
-    catch {
-        _cachedVersion = '';
-    }
-    return _cachedVersion;
-}
 export function buildAunFilePayload(params) {
     const correlationId = params.context?.metadata?.correlationId;
     const payload = {
-        type: correlationId ? 'result.file' : 'file',
+        // `result.file` is EvolCore's internal outbound kind. On the AUN wire this
+        // must remain the standard `file` payload type so clients route it through
+        // their attachment/download pipeline; correlation_id carries the control
+        // request association without changing the media type.
+        type: 'file',
         text: `📎 ${params.filename} (${formatSize(params.size)})`,
         attachments: [params.attachment],
     };
@@ -121,6 +115,7 @@ export function aunOptsToInbound(opts, channel, channelType) {
         sameNetwork: opts.sameNetwork,
         sameEgressIp: opts.sameEgressIp,
         encrypted: opts.encrypted,
+        protectedHeaders: opts.protectedHeaders,
         messageId: opts.messageId,
         causation: opts.causation,
         mentions: opts.mentions,
@@ -133,6 +128,54 @@ export function aunOptsToInbound(opts, channel, channelType) {
         dispatchMode: opts.dispatchMode,
     };
 }
+function verifiedProtectedHeaders(msg, env) {
+    const candidates = [
+        msg.e2ee?.protected_headers,
+        env.protected_headers,
+        msg.protected_headers,
+    ];
+    for (const candidate of candidates) {
+        if (!candidate || typeof candidate !== 'object' || Array.isArray(candidate))
+            continue;
+        const headers = {};
+        for (const [key, value] of Object.entries(candidate)) {
+            const name = key.trim().toLowerCase();
+            if (!/^[a-z0-9_-]+$/.test(name) || typeof value !== 'string')
+                continue;
+            headers[name] = value;
+        }
+        return Object.keys(headers).length > 0 ? headers : undefined;
+    }
+    return undefined;
+}
+function redactMenuTokensForTrace(value, seen = new WeakSet()) {
+    if (!value || typeof value !== 'object')
+        return value;
+    if (seen.has(value))
+        return '[Circular]';
+    seen.add(value);
+    if (Array.isArray(value))
+        return value.map(item => redactMenuTokensForTrace(item, seen));
+    const redacted = {};
+    for (const [key, item] of Object.entries(value)) {
+        redacted[key] = key.toLowerCase() === 'menu_token'
+            ? '[REDACTED]'
+            : redactMenuTokensForTrace(item, seen);
+    }
+    return redacted;
+}
+function payloadTypeForObserver(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return undefined;
+    const record = value;
+    const payload = record.payload
+        ?? (record.message && typeof record.message === 'object' ? record.message.payload : undefined)
+        ?? (record.envelope && typeof record.envelope === 'object' ? record.envelope.payload : undefined);
+    if (!payload || typeof payload !== 'object' || Array.isArray(payload))
+        return undefined;
+    const type = payload.type;
+    return typeof type === 'string' ? type : undefined;
+}
 export class AUNChannel {
     config;
     client = null;
@@ -157,7 +200,8 @@ export class AUNChannel {
             return;
         // 自动从 data 推断顶层字段（self_aid / peer_aid / group_id / task_id / chatmode），
         // 便于 jq 过滤：`jq 'select(.task_id == "task-xxx")'`
-        const d = (data && typeof data === 'object') ? data : {};
+        const safeData = redactMenuTokensForTrace(data);
+        const d = (safeData && typeof safeData === 'object') ? safeData : {};
         const payload = d.payload ?? {};
         // 入站事件（IN）路由字段在 d.envelope.*（SDK 0.5.*）；出站 params（OUT）字段在顶层。两者兼顾。
         const env = (d.envelope && typeof d.envelope === 'object') ? d.envelope : {};
@@ -178,7 +222,7 @@ export class AUNChannel {
         const chatmode = payload.chatmode;
         if (chatmode)
             topContext.chatmode = chatmode;
-        const line = JSON.stringify({ ts: localTimestamp(), dir, event, ...topContext, data });
+        const line = JSON.stringify({ ts: localTimestamp(), dir, event, ...topContext, data: safeData });
         this.traceWriter.write(line);
     }
     /** 日志前缀（含 self aid 简称，多实例可识别） */
@@ -195,25 +239,37 @@ export class AUNChannel {
      */
     async callAndTrace(method, params, opts) {
         this.trace('OUT', method, params);
+        // RPC 往返计时：区分「网关慢」与「本地队列堵塞」。message.send/group.send 的
+        // duration 若普遍逼近 SDK 的 rpc 超时（默认 10s），说明发送管线已饱和或链路抖动，
+        // 是 /evolhelp 等命令「回复慢/无回复」的直接可观测信号。
+        const rpcStart = Date.now();
+        // SLOW_RPC_WARN_MS 需明显低于 SDK 默认 10s 超时，以便在真正超时前提前告警。
+        const SLOW_RPC_WARN_MS = 3000;
         try {
             const result = await this.client.call(method, params);
+            const durationMs = Date.now() - rpcStart;
             if (!opts?.silentOk) {
                 const r = result;
                 const snap = r && typeof r === 'object'
-                    ? { message_id: r.message_id, ok: r.ok, thought_id: r.thought_id }
-                    : undefined;
-                this.trace('OUT', `${method}.ok`, snap ?? {});
+                    ? { message_id: r.message_id, ok: r.ok, thought_id: r.thought_id, duration_ms: durationMs }
+                    : { duration_ms: durationMs };
+                this.trace('OUT', `${method}.ok`, snap);
+            }
+            if (durationMs >= SLOW_RPC_WARN_MS) {
+                logger.warn(`${this.logPrefix()} rpc ${method} SLOW: duration=${durationMs}ms (发送管线可能饱和或链路抖动)`);
             }
             return result;
         }
         catch (e) {
+            const durationMs = Date.now() - rpcStart;
             this.trace('OUT', `${method}.error`, {
                 error: e?.message ?? String(e),
                 code: e?.code,
                 name: e?.name,
+                duration_ms: durationMs,
             });
             if (!opts?.silentError) {
-                logger.warn(`${this.logPrefix()} rpc ${method} failed: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
+                logger.warn(`${this.logPrefix()} rpc ${method} failed after ${durationMs}ms: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
             }
             throw e;
         }
@@ -273,8 +329,20 @@ export class AUNChannel {
                     : typeof obj.card_message_id === 'string' ? obj.card_message_id : '';
                 const cardInfo = cardMsgId ? this.cardMessageIdMap.get(cardMsgId) : undefined;
                 if (cardInfo) {
-                    const actionValue = typeof obj.value === 'string' ? obj.value
-                        : typeof obj.action_value === 'string' ? obj.action_value : text;
+                    // compose 按钮点击后客户端收卡聚焦输入框，用户随后发送的自由文本由客户端结构化
+                    // 回传为 action_card_reply{behavior:"compose", text}，没有按钮 value/action_value。
+                    // 映射为 _custom_input + values.custom_text，复用 claude-runner 已有的自定义输入分支
+                    // （原为多选表单提交而设），不需要新增 action 类型，也不必拦截消息队列。
+                    const behaviorRaw = typeof obj.behavior === 'string' ? obj.behavior : undefined;
+                    if (behaviorRaw && behaviorRaw !== 'reply' && behaviorRaw !== 'compose' && behaviorRaw !== 'dismiss') {
+                        // 非法 behavior 值：按协议兜底为 reply 处理，但记录下来便于排查不合规客户端
+                        // （例如本该是 compose 手动输入却被误判为普通按钮点击）。
+                        logger.warn(`${this.logPrefix()} action_card_reply with unrecognized behavior="${behaviorRaw}" mid=${cardMsgId}, treating as reply`);
+                    }
+                    const isComposeReply = behaviorRaw === 'compose';
+                    const actionValue = isComposeReply ? '_custom_input'
+                        : typeof obj.value === 'string' ? obj.value
+                            : typeof obj.action_value === 'string' ? obj.action_value : text;
                     const threadId = typeof obj.thread_id === 'string' ? obj.thread_id : undefined;
                     // 卡片点击者身份：只信认证信封（senderAid 参数，由调用方从 msg.from / msg.sender_aid 提取）。
                     // payload 自报字段（from / sender_aid / user_id）不可信，可被客户端伪造，不读取。
@@ -349,7 +417,13 @@ export class AUNChannel {
                                 type: 'interaction.response',
                                 id: cardInfo.requestId,
                                 action: actionValue,
-                                values: { text, action_label: obj.label ?? obj.action_label, behavior: obj.behavior, card_message_id: cardMsgId },
+                                values: {
+                                    text,
+                                    action_label: obj.label ?? obj.action_label,
+                                    behavior: obj.behavior,
+                                    card_message_id: cardMsgId,
+                                    ...(isComposeReply ? { custom_text: text } : {}),
+                                },
                                 operatorId: cardClickerAid || undefined,
                             };
                             const settle = (accepted) => {
@@ -641,10 +715,6 @@ export class AUNChannel {
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
         'merge', 'link', 'location', 'personal_card',
     ]);
-    /** Menu protocol 请求类型：自定义消息快速路径，绕过白名单直接分发到 bridge */
-    static MENU_REQUEST_TYPES = new Set([
-        'menu.list', 'menu.query', 'menu.options', 'menu.update', 'menu.action',
-    ]);
     /** 观察者插话请求类型（owner → agent.AID）。详见 docs/observer-insert-design.md。 */
     static INJECT_REQUEST_TYPE = 'observer.inject';
     /** 绑定请求类型（Evol App → 控制 AID）：快速路径，绕过白名单透传原始 payload JSON 给 bridge。 */
@@ -1304,6 +1374,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // SDK 0.5.* 移除了顶层 from/to/group_id/encrypted 等别名，统一从 msg.envelope.* 读取。
         // message_id / seq / payload / same_* 等仍是顶层独立字段，不在 envelope 内。
         const env = (msg.envelope && typeof msg.envelope === 'object') ? msg.envelope : {};
+        const protectedHeaders = verifiedProtectedHeaders(msg, env);
         const fromAid = env.from ?? '';
         const payload = msg.payload ?? '';
         const causationRef = payload && typeof payload === 'object' && typeof payload._evolcore_causation_ref === 'string'
@@ -1359,7 +1430,9 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
-        const p2pPayloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
+        const p2pPayloadType = (payload && typeof payload === 'object' && typeof payload.type === 'string')
+            ? payload.type
+            : '';
         logger.info(`${this.logPrefix()} P2P dispatch decision: mid=${messageId} from=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${p2pPayloadType} chatId=${chatId} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply') {
@@ -1367,7 +1440,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return;
         }
         // menu.* 协议：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
-        if (AUNChannel.MENU_REQUEST_TYPES.has(p2pPayloadType)) {
+        if (p2pPayloadType.startsWith('menu.')) {
             this.acknowledgeImmediately(messageId, seq);
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId);
             this.dispatchMessage({
@@ -1376,6 +1449,9 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 chatType: 'private', messageId, seq,
                 peerName: displayName || undefined,
                 peerType: peerIdentity.type,
+                encrypted: msgEncrypted,
+                protectedHeaders,
+                replyContext: this.buildGroupReplyContext(threadId, fromAid, msgEncrypted, messageId),
                 msgType: logDescriptor.msgType,
                 payloadType: logDescriptor.payloadType,
                 payloadSummary: logDescriptor.payloadSummary,
@@ -1465,6 +1541,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // SDK 0.5.* 移除了顶层 from/sender_aid/group_id/encrypted 等别名，统一从 msg.envelope.* 读取。
         // message_id / seq / payload / same_* / dispatch_mode 等仍是顶层独立字段，不在 envelope 内。
         const env = (msg.envelope && typeof msg.envelope === 'object') ? msg.envelope : {};
+        const protectedHeaders = verifiedProtectedHeaders(msg, env);
         const groupId = env.group_id ?? '';
         const senderAid = env.from ?? '';
         const payload = msg.payload ?? '';
@@ -1542,15 +1619,19 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // 信号类消息（status / event / thought / task.update 等）不进 Agent
         {
             const payloadObj = (payload && typeof payload === 'object') ? payload : null;
-            const payloadType = payloadObj?.type ?? '';
+            const payloadType = typeof payloadObj?.type === 'string' ? payloadObj.type : '';
             // menu.* 协议：自定义消息快速路径
-            if (AUNChannel.MENU_REQUEST_TYPES.has(payloadType)) {
+            if (payloadType.startsWith('menu.')) {
+                const menuEncrypted = !!env.encrypted;
                 this.acknowledgeImmediately(messageId, seq);
-                this.appendInboundPayloadJsonl(groupId, senderAid, messageId, !!env.encrypted, true, logDescriptor, threadId);
+                this.appendInboundPayloadJsonl(groupId, senderAid, messageId, menuEncrypted, true, logDescriptor, threadId);
                 this.dispatchMessage({
                     channelId: groupId, userId: senderAid,
                     text: JSON.stringify(payload),
                     chatType: 'group', messageId, seq, groupId,
+                    encrypted: menuEncrypted,
+                    protectedHeaders,
+                    replyContext: this.buildGroupReplyContext(threadId, senderAid, menuEncrypted, messageId, payloadObj?.chatmode, topicName),
                     msgType: logDescriptor.msgType,
                     payloadType: logDescriptor.payloadType,
                     payloadSummary: logDescriptor.payloadSummary,
@@ -1769,6 +1850,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             sameNetwork: event.sameNetwork,
             sameEgressIp: event.sameEgressIp,
             encrypted: event.encrypted,
+            protectedHeaders: event.protectedHeaders,
             messageId: event.messageId,
             causation: event.causation,
             threadId: event.threadId,
@@ -1837,6 +1919,8 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     forwardInbound(data) {
         if (!this.connected || !this.client)
             return;
+        if (payloadTypeForObserver(data)?.startsWith('menu.'))
+            return;
         const { observable, owners } = this.getObserverConfig();
         if (!observable || owners.length === 0)
             return;
@@ -1858,6 +1942,8 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     forwardOutbound(result) {
         if (!this.connected || !this.client)
             return;
+        if (payloadTypeForObserver(result)?.startsWith('menu.'))
+            return;
         const { observable, owners } = this.getObserverConfig();
         if (!observable || owners.length === 0)
             return;
@@ -2350,6 +2436,30 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     messageIdFromSendResult(result) {
         return result?.message?.message_id ?? result?.message_id ?? null;
     }
+    /**
+     * An AUN send result is only a gateway transport result. It is not a
+     * receipt that the peer client has pulled, decrypted, stored, or rendered it.
+     * Preserve the compact fields for later correlation with the receiving side.
+     */
+    sendReceiptFromResult(result) {
+        if (!result || typeof result !== 'object')
+            return {};
+        const response = result;
+        return {
+            status: typeof response.status === 'string' ? response.status : undefined,
+            seq: typeof response.seq === 'number' ? response.seq : undefined,
+            timestamp: typeof response.timestamp === 'number' ? response.timestamp : undefined,
+            deliveryMode: typeof response.delivery_mode === 'string' ? response.delivery_mode : undefined,
+        };
+    }
+    receiptLogFields(result) {
+        const receipt = this.sendReceiptFromResult(result);
+        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)}`;
+        logger.info(`${this.logPrefix()} ${method} accepted by AUN: target=${target} mid=${messageId} encrypt=${encrypt} ${this.receiptLogFields(result)}${preview}`);
+    }
     stripUndefinedDeep(value) {
         if (Array.isArray(value)) {
             return value
@@ -2542,7 +2652,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return { ok: false };
         }
     }
-    recordDurableOutbound(channelId, payload, messageId, encrypt, context, isGroup, contentKind, logText, result) {
+    recordDurableOutbound(channelId, payload, messageId, encrypt, context, isGroup, contentKind, logText, result, statsContext) {
         const causation = normalizeCausation(context?.metadata?.causation);
         if (!isGroup && causation)
             registerAunCausation(messageId, this.config.aid, channelId, causation);
@@ -2564,10 +2674,11 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             len: Buffer.byteLength(logText, 'utf-8'),
             ...(isGroup && { groupId: channelId }),
         });
-        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, this.payloadByteLength(payload, logText), logText, false, encrypt, context?.metadata?.chatmode);
+        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, this.payloadByteLength(payload, logText), logText, false, encrypt, context?.metadata?.chatmode, 'send', statsContext);
         const source = context?.metadata?.source ?? 'daemon';
         this.appendOutboundJsonl(channelId, {
             ...classifyAunPayloadForLog(payload), msgId: messageId, encrypt, context, isGroup, source,
+            transport: this.sendReceiptFromResult(result),
         });
         this.forwardOutbound(result);
     }
@@ -2752,6 +2863,11 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             context,
         });
         logger.debug(`${this.logPrefix()} Outbox enqueued: id=${entry.id} channel=${channelId} text=${finalText.slice(0, 40)}`);
+        // 积压深度告警：outbox 待发条目累积说明发送速度跟不上，回复将出现明显延迟。
+        const backlog = outbox.pendingCount(this.config.aid);
+        if (backlog >= 5) {
+            logger.warn(`${this.logPrefix()} Outbox backlog=${backlog} channel=${channelId} (发送管线堵塞，回复将延迟)`);
+        }
         if (!this.connected || !this.client) {
             logger.warn(`${this.logPrefix()} Not connected, message queued in outbox (id=${entry.id}). Triggering reconnect.`);
             if (!this.reconnectTimer && !this.client) {
@@ -2800,7 +2916,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (!messageId) {
                 return { ok: false, error: `message.send returned no message_id: ${JSON.stringify(result)}`, code: 'MISSING_MESSAGE_ID' };
             }
-            logger.info(`${this.logPrefix()} daemon msg.send ok: to=${this.peerLabel(args.to)} mid=${messageId} encrypt=${encrypt} chatmode=${chatmode}`);
+            this.logAunSendAccepted('message.send', this.peerLabel(args.to), messageId, encrypt, result);
             if (outboundCausation) {
                 registerAunCausation(messageId, this.config.aid, args.to, outboundCausation);
                 recordCausationSpan(outboundCausation, 'message.outbound', {
@@ -2829,6 +2945,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     payloadSummary: classified.payloadSummary ?? args.log.payloadSummary,
                     source: args.log.source ?? 'msg',
                     handoff_trace: args.log.handoffTrace,
+                    transport: this.sendReceiptFromResult(result),
                 }));
                 this.aidStatsCollector?.recordOutbound(this.config.aid, args.to, Buffer.byteLength(classified.content || args.log.content, 'utf-8'), classified.content || args.log.content, false, encrypt, chatmode, 'send');
                 logWritten = true;
@@ -2836,10 +2953,10 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return {
                 ok: true,
                 message_id: messageId,
-                seq: result?.seq,
-                timestamp: result?.timestamp,
-                status: result?.status,
-                delivery_mode: result?.delivery_mode,
+                seq: this.sendReceiptFromResult(result).seq,
+                timestamp: this.sendReceiptFromResult(result).timestamp,
+                status: this.sendReceiptFromResult(result).status,
+                delivery_mode: this.sendReceiptFromResult(result).deliveryMode,
                 encrypt,
                 chatmode,
                 log_written: logWritten,
@@ -2903,7 +3020,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (!messageId) {
                 return { ok: false, error: `group.send returned no message_id: ${JSON.stringify(result)}`, code: 'MISSING_MESSAGE_ID' };
             }
-            logger.info(`${this.logPrefix()} daemon group.send ok: group=${args.groupId} mid=${messageId} encrypt=${encrypt}`);
+            this.logAunSendAccepted('group.send', args.groupId, messageId, encrypt, result);
             this.forwardOutbound(result);
             let logWritten = false;
             if (args.log?.content !== undefined) {
@@ -2927,8 +3044,10 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     payloadSummary: classified.payloadSummary ?? args.log.payloadSummary,
                     source: args.log.source ?? 'msg',
                     handoff_trace: args.log.handoffTrace,
+                    transport: this.sendReceiptFromResult(result),
                 }));
-                this.aidStatsCollector?.recordOutbound(this.config.aid, args.groupId, Buffer.byteLength(content, 'utf-8'), content, false, encrypt, typeof finalPayload.chatmode === 'string' ? finalPayload.chatmode : undefined, 'send');
+                const statsContext = await this.groupStatsContext(args.groupId);
+                this.aidStatsCollector?.recordOutbound(this.config.aid, args.groupId, Buffer.byteLength(content, 'utf-8'), content, false, encrypt, typeof finalPayload.chatmode === 'string' ? finalPayload.chatmode : undefined, 'send', statsContext);
                 logWritten = true;
             }
             return {
@@ -2937,6 +3056,10 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 group_id: result?.group_id ?? args.groupId,
                 message: result?.message,
                 event: result?.event,
+                seq: this.sendReceiptFromResult(result).seq,
+                timestamp: this.sendReceiptFromResult(result).timestamp,
+                status: this.sendReceiptFromResult(result).status,
+                delivery_mode: this.sendReceiptFromResult(result).deliveryMode,
                 encrypt,
                 log_written: logWritten,
             };
@@ -3040,11 +3163,13 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     return false;
                 }
                 else {
-                    logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${mid} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
+                    this.logAunSendAccepted('group.send', channelId, mid, encrypt, result, finalText);
                     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 });
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode, 'send');
+                    const statsContext = await this.groupStatsContext(channelId);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode, 'send', statsContext);
                     this.appendOutboundJsonl(channelId, {
                         ...classifyAunPayloadForLog(payload), msgId: mid, encrypt, context, isGroup: true, source,
+                        transport: this.sendReceiptFromResult(result),
                     });
                     // Observer forward: outbound (group) — 原样转发 SDK SendResult（含 envelope + payload）
                     this.forwardOutbound(result);
@@ -3058,7 +3183,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     return false;
                 }
                 else {
-                    logger.info(`${this.logPrefix()} message.send ok: to=${this.peerLabel(targetAid)} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
+                    this.logAunSendAccepted('message.send', this.peerLabel(targetAid), result.message_id, encrypt, result, finalText);
                     const causation = normalizeCausation(context?.metadata?.causation);
                     if (causation) {
                         registerAunCausation(result.message_id, this.config.aid, targetAid, causation);
@@ -3071,6 +3196,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode, 'send');
                     this.appendOutboundJsonl(targetAid, {
                         ...classifyAunPayloadForLog(payload), msgId: result.message_id, encrypt, context, isGroup: false, source,
+                        transport: this.sendReceiptFromResult(result),
                     });
                     // Observer forward: outbound (private) — 原样转发 SDK SendResult（含 envelope + payload）
                     this.forwardOutbound(result);
@@ -3094,9 +3220,11 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                             return false;
                         }
                         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 });
-                        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, false, context?.metadata?.chatmode);
+                        const statsContext = await this.groupStatsContext(channelId);
+                        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, false, context?.metadata?.chatmode, 'send', statsContext);
                         this.appendOutboundJsonl(channelId, {
                             ...classifyAunPayloadForLog(payload), msgId: mid, encrypt: false, context, isGroup: true, source,
+                            transport: this.sendReceiptFromResult(result),
                         });
                         this.forwardOutbound(result);
                     }
@@ -3121,6 +3249,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                         this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, false, context?.metadata?.chatmode);
                         this.appendOutboundJsonl(targetAid, {
                             ...classifyAunPayloadForLog(payload), msgId: mid, encrypt: false, context, isGroup: false, source,
+                            transport: this.sendReceiptFromResult(result),
                         });
                         this.forwardOutbound(result);
                     }
@@ -3161,15 +3290,16 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!sent.ok || !sent.messageId)
             return sent;
         const isGroup = this.isGroupId(channelId);
-        logger.info(`${this.logPrefix()} durable payload sent: kind=${contentKind ?? payload.type ?? 'payload'} target=${isGroup ? channelId : this.peerLabel(channelId)} mid=${sent.messageId} encrypt=${sent.encrypt} text=${logText.slice(0, 60)}`);
-        this.recordDurableOutbound(channelId, payload, sent.messageId, !!sent.encrypt, context, isGroup, contentKind, logText, sent.result);
+        const statsContext = isGroup ? await this.groupStatsContext(channelId) : undefined;
+        this.logAunSendAccepted(isGroup ? 'group.send' : 'message.send', isGroup ? channelId : this.peerLabel(channelId), sent.messageId, !!sent.encrypt, sent.result, logText);
+        this.recordDurableOutbound(channelId, payload, sent.messageId, !!sent.encrypt, context, isGroup, contentKind, logText, sent.result, statsContext);
         this.runPostSend(entry, sent.messageId);
         return sent;
     }
     /** 有效会话正文写入 messages.jsonl（message.send/group.send 成功后调用）。 */
     appendOutboundJsonl(channelId, descriptor) {
         try {
-            const { content, msgType, payloadType, payloadSummary, msgId, encrypt, context, isGroup, source = 'daemon' } = descriptor;
+            const { content, msgType, payloadType, payloadSummary, msgId, encrypt, transport, context, isGroup, source = 'daemon' } = descriptor;
             const sessionsDir = resolvePaths().sessionsDir;
             const selfAID = this.config.aid;
             const chatDir = chatDirPath(sessionsDir, 'aun', channelId, selfAID);
@@ -3189,6 +3319,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 durationMs: null,
                 encrypt,
                 chatmode,
+                transport,
                 msgType,
                 payloadType,
                 payloadSummary,
@@ -3261,7 +3392,8 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
                 this.forwardOutbound(putRes);
                 if (thoughtText) {
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive', 'thought');
+                    const statsContext = await this.groupStatsContext(channelId);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive', 'thought', statsContext);
                 }
             }
             else {
@@ -3296,21 +3428,36 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             finalPayload.thread_id = context.threadId;
         if (context?.replyToMessageId && !finalPayload.ref_message_id)
             finalPayload.ref_message_id = context.replyToMessageId;
+        const isMenuPayload = typeof finalPayload.type === 'string' && finalPayload.type.startsWith('menu.');
         const params = { payload: finalPayload, encrypt };
+        const rawHeaders = context?.metadata?.protectedHeaders;
+        if (encrypt && rawHeaders && typeof rawHeaders === 'object' && !Array.isArray(rawHeaders)) {
+            const protectedHeaders = {};
+            for (const [key, value] of Object.entries(rawHeaders)) {
+                const name = key.trim().toLowerCase();
+                if (!/^[a-z0-9_-]+$/.test(name) || typeof value !== 'string')
+                    continue;
+                protectedHeaders[name] = value;
+            }
+            if (Object.keys(protectedHeaders).length > 0)
+                params.protected_headers = protectedHeaders;
+        }
         try {
             if (isGroup) {
                 params.group_id = channelId;
                 const result = await this.callAndTrace('group.send', params);
                 const mid = result?.message?.message_id ?? result?.message_id ?? null;
                 logger.info(`${this.logPrefix()} group.send (${payload.type}) ok: group=${channelId} mid=${mid} encrypt=${encrypt}`);
-                this.forwardOutbound(result);
+                if (!isMenuPayload)
+                    this.forwardOutbound(result);
                 return mid;
             }
             else {
                 params.to = targetAid;
                 const result = await this.callAndTrace('message.send', params);
                 logger.info(`${this.logPrefix()} message.send (${payload.type}) ok: to=${this.peerLabel(targetAid)} mid=${result?.message_id} encrypt=${encrypt}`);
-                this.forwardOutbound(result);
+                if (!isMenuPayload)
+                    this.forwardOutbound(result);
                 return result?.message_id ?? null;
             }
         }
@@ -3493,7 +3640,8 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (sentMid) {
                 const fileText = filePayload.text;
                 appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: sentMid, kind: 'file', len: fileText.length, ...(isGroup && { groupId: channelId }) });
-                this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(fileText, 'utf-8'), fileText, false, !!params.encrypt, context?.metadata?.chatmode);
+                const statsContext = isGroup ? await this.groupStatsContext(channelId) : undefined;
+                this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(fileText, 'utf-8'), fileText, false, !!params.encrypt, context?.metadata?.chatmode, 'send', statsContext);
                 const source = context?.metadata?.source ?? 'daemon';
                 this.appendOutboundJsonl(channelId, {
                     ...classifyAunPayloadForLog(filePayload), msgId: sentMid, encrypt: !!params.encrypt,
@@ -3618,9 +3766,13 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const initiator = statusPayload.initiator ?? '';
         const refMsgId = statusPayload.ref_message_id ?? '';
         const metaStr = statusPayload.metadata ? ` meta=${JSON.stringify(statusPayload.metadata)}` : '';
-        logger.info(`${this.logPrefix()} task.${status} task=${taskId} session=${sessionId} chatmode=${chatmode} target=${targetLabel} initiator=${initiator} ref_msg=${refMsgId}${metaStr}`);
+        const logTaskStatus = `${this.logPrefix()} task.${status} task=${taskId} session=${sessionId} chatmode=${chatmode} target=${targetLabel} initiator=${initiator} ref_msg=${refMsgId}${metaStr}`;
+        if (status === 'error' || status === 'timeout')
+            logger.error(logTaskStatus);
+        else
+            logger.info(logTaskStatus);
     }
-    sendCustomPayload(channelId, payload) {
+    async sendCustomPayload(channelId, payload, context) {
         if (!this.client || !this.connected)
             return;
         // SDK 0.3.0 E2EE requires payload to be an object
@@ -3633,19 +3785,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         catch {
             payloadObj = { text: payload };
         }
-        // 私聊 channelId = 对端 AID（不含 device_id）
-        const customTargetAid = channelId;
-        const sendParams = {
-            to: customTargetAid, payload: payloadObj,
-            encrypt: true,
-        };
-        this.trace('OUT', 'message.send.custom', sendParams);
-        this.client.call('message.send', sendParams).then((result) => {
-            this.trace('OUT', 'message.send.custom.ok', { message_id: result?.message_id });
-        }).catch(e => {
-            this.trace('OUT', 'message.send.custom.error', { error: String(e) });
-            logger.warn(`${this.logPrefix()} Custom payload failed: ${e}`);
-        });
+        await this.sendStructured(channelId, payloadObj, context);
     }
     async disconnect() {
         this.intentionalDisconnect = true;
@@ -3721,44 +3861,18 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     }
     /** 读取本地 agent.md 中的 name（用于身份上下文展示），若本地不存在则尝试远程拉取 */
     loadSelfName(aid) {
-        try {
-            const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
-            const mdPath = agentMdPathFn(aidName);
-            if (!fs.existsSync(mdPath)) {
-                // 异步拉取，不阻塞连接流程
-                this.fetchAndCacheSelfName(aidName);
-                return undefined;
-            }
-            const content = fs.readFileSync(mdPath, 'utf-8');
-            const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
-            if (!fmMatch)
-                return undefined;
-            const nameMatch = fmMatch[1].match(/^name:\s*["']?(.+?)["']?\s*$/m);
-            return nameMatch?.[1]?.trim() || undefined;
-        }
-        catch {
-            return undefined;
-        }
+        const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
+        const name = resolveAgentDisplayName(aidName);
+        if (!name)
+            void this.fetchAndCacheSelfName(aidName);
+        return name;
     }
     async fetchAndCacheSelfName(aidName) {
-        try {
-            const { agentmdGet } = await import('../aun/aid/index.js');
-            const content = await agentmdGet(aidName);
-            if (content) {
-                const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
-                if (fmMatch) {
-                    const nameMatch = fmMatch[1].match(/^name:\s*["']?(.+?)["']?\s*$/m);
-                    const name = nameMatch?.[1]?.trim();
-                    if (name) {
-                        this._selfName = name;
-                        if (this.aidStatsCollector)
-                            this.aidStatsCollector.setSelfName(this.config.aid, name);
-                    }
-                }
-            }
-        }
-        catch {
-            // ignore — name will remain undefined
+        const name = await refreshAgentDisplayName(aidName);
+        if (name) {
+            this._selfName = name;
+            if (this.aidStatsCollector)
+                this.aidStatsCollector.setSelfName(this.config.aid, name);
         }
     }
     getSelfName() {
@@ -3809,7 +3923,7 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         return result.content ?? '';
     }
     /**
-     * 取群显示名（group.get → group.name），进程内缓存。
+     * 取群显示名（group.get_info → group.name），进程内缓存。
      * 走长连接 callAndTrace，失败/未连接返回 undefined —— 绝不抛出阻塞消息处理。
      */
     async getGroupName(groupId) {
@@ -3821,9 +3935,10 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!this.client)
             return undefined;
         try {
-            const result = await this.callAndTrace('group.get', { group_id: groupId });
-            const name = result?.group?.name;
-            if (typeof name === 'string' && name) {
+            const result = await this.callAndTrace('group.get_info', { group_id: groupId });
+            const group = result?.group ?? result;
+            const name = typeof group?.name === 'string' ? group.name.trim() : '';
+            if (name) {
                 this.groupNameCache.set(groupId, name);
                 return name;
             }
@@ -3834,6 +3949,13 @@ EvolCore AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return undefined; // 不写缓存，下次仍可重试
         }
     }
+    /** 统计关系键继续使用群 ID，仅为智能体预览补充可读群名。 */
+    async groupStatsContext(groupId) {
+        return {
+            channelType: 'aun',
+            peerLabel: await this.getGroupName(groupId) ?? groupId,
+        };
+    }
     /**
      * 查询某成员在群里的角色（经 group.get_admins）。
      * 仅用于话题创建权限校验（稀有事件），故不缓存：每次查权威源，结果天然最新。
@@ -3998,6 +4120,7 @@ export class AUNChannelPlugin {
                         return;
                     case 'interaction': {
                         const req = payload.interaction;
+                        const cardTtlMs = 20 * 60 * 1000;
                         if (req.kind.kind === 'action') {
                             const action = req.kind;
                             const aunCard = {
@@ -4007,10 +4130,12 @@ export class AUNChannelPlugin {
                                     label: btn.label, value: btn.key, style: btn.style ?? 'default', behavior: 'reply',
                                 })),
                             };
-                            // AUN action_card 无法内嵌输入框（只有按钮），手动输入降级为「✏️ 手动输入」按钮：
-                            // 点击回传 _show_input → claude-runner 用 interceptNextMessage 拦截下一条消息作为答案。
+                            // AUN action_card 无法内嵌输入框（只有按钮），手动输入用协议原生的 compose
+                            // behavior：客户端收到点击后自行收卡+聚焦输入框，用户在 timeout 内的下一条
+                            // 消息由客户端结构化回传为 action_card_reply{behavior:"compose"}（见
+                            // extractTextPayload 的 compose 分支），不依赖 interceptNextMessage 拦截消息队列。
                             if (action.allowCustomInput) {
-                                aunCard.actions.push({ label: '✏️ 手动输入', value: '_show_input', style: 'default', behavior: 'reply' });
+                                aunCard.actions.push({ label: '✏️ 手动输入', style: 'default', behavior: 'compose', compose_timeout_ms: cardTtlMs });
                             }
                             if (action.body) {
                                 aunCard.text = action.body;
@@ -4029,7 +4154,7 @@ export class AUNChannelPlugin {
                                     requestId: req.id,
                                     isCommandCard: false,
                                     initiatorAid: req.initiatorId,
-                                    expiresAt: Date.now() + 20 * 60 * 1000,
+                                    expiresAt: Date.now() + cardTtlMs,
                                 },
                             });
                         }
@@ -4064,7 +4189,7 @@ export class AUNChannelPlugin {
                                     requestId: req.id,
                                     isCommandCard: true,
                                     initiatorAid: req.initiatorId,
-                                    expiresAt: Date.now() + 20 * 60 * 1000,
+                                    expiresAt: Date.now() + cardTtlMs,
                                 },
                             });
                         }
@@ -4075,7 +4200,7 @@ export class AUNChannelPlugin {
                     }
                     case 'custom': {
                         const text = typeof payload.payload === 'string' ? payload.payload : JSON.stringify(payload.payload);
-                        channel.sendCustomPayload(channelId, text);
+                        await channel.sendCustomPayload(channelId, text, replyCtx);
                         return;
                     }
                     default:
@@ -4107,7 +4232,7 @@ export class AUNChannelPlugin {
         return {
             channelType: 'aun', adapter, channel,
             policy,
-            options: { flushDelay: inst.flushDelay ?? DEFAULT_FLUSH_DELAY_SECONDS, fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g },
+            options: { flushDelay: inst.flushDelay ?? DEFAULT_FLUSH_DELAY_SECONDS, fileMarkerPattern: createSendFileMarkerPattern() },
             connect: () => channel.connect(),
             disconnect: () => channel.disconnect(),
             onProjectPathRequest: () => Promise.resolve(ctx.defaultProjectPath),