evolcore 0.0.27 → 0.0.29-test.0

package/dist/channels/aun.js

@@ -11,13 +11,13 @@ 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, agentDir as agentDirPath, resolveRoot, channelStatePath } from '../paths.js';
-import { saveToUploads, sanitizeFileName, bufferToInboundImage, safeFetch } from '../utils/media-cache.js';
+import { saveToUploads, saveRelationAttachment, sanitizeFileName, bufferToInboundImage, safeFetch } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.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 { readTopicLable } from '../core/session/session-mapper.js';
-import { appendHintAdd, appendHintRemove, parseInjectRequest } from '../core/message/pending-hints.js';
+import { readTopicLabel, readTopicStatus } from '../core/session/session-mapper.js';
+import { appendHintAddDetailed, appendHintRemoveDetailed, appendHintPromoteDetailed, parseInjectRequest, peekHints, withHintTargetLock } from '../core/message/pending-hints.js';
 import { appendAidLifecycle } from '../aun/aid/identity.js';
 import { enableFullGroupPullPagination, enableReliableMessageDelivery, getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
 import { MAX_AUN_ATTACHMENT_SIZE, uploadBufferAndBuildPayload, uploadFileAndBuildPayload } from '../aun/msg/upload.js';
@@ -25,7 +25,7 @@ import { loadAgent } from '../config-store.js';
 import { resolveAgentLifecycle } from '../config/lifecycle.js';
 import { resolveEffective } from '../config/config-manager.js';
 import { isManagementRole } from '../config/builtin-roles.js';
-import { normalizeMentionMode } from '../config/mention-mode.js';
+import { normalizeAunMentionMode, normalizeMentionMode } from '../config/mention-mode.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import * as outbox from '../aun/outbox.js';
 import { formatSize } from '../utils/media-cache.js';
@@ -715,8 +715,9 @@ export class AUNChannel {
      * 统一的 RPC 调用包装：自动记录 OUT 发送、.ok 结果、.error 错误（含 trace + daemon.log 失败日志）。
      * 所有 client.call() 都应通过此方法调用，保证 aun-trace 里每个 OUT 调用都有"发+收/错"成对记录。
      */
-    callClient(method, params, lane = 'normal', onStart) {
+    callClient(method, params, lane = 'normal', onStart, onPrepared) {
         params = menuTransportParams(method, params);
+        onPrepared?.(params);
         return this.withOutboundSendGate(method, () => (this.client.call(method, params).then(value => value)), lane, onStart);
     }
     withOutboundSendGate(method, run, lane = 'normal', onStart) {
@@ -784,7 +785,6 @@ export class AUNChannel {
         });
     }
     async callAndTrace(method, params, opts) {
-        this.trace('OUT', method, params);
         // 计时同时覆盖排队和 SDK 往返；callStartedAt 让日志能区分「本地队列堵塞」
         // 与「网关慢」。两者对 /evolhelp 等命令的回复延迟都有直接影响。
         const rpcStart = Date.now();
@@ -794,6 +794,11 @@ export class AUNChannel {
         try {
             const result = await this.callClient(method, params, opts?.lane ?? 'normal', () => {
                 callStartedAt = Date.now();
+            }, preparedParams => {
+                // Apply Menu compatibility exactly once, then log the same parameters
+                // passed to the SDK (TTL and device targeting may both be removed).
+                params = preparedParams;
+                this.trace('OUT', method, params);
             });
             const durationMs = Date.now() - rpcStart;
             const rpcDurationMs = Date.now() - callStartedAt;
@@ -844,14 +849,17 @@ export class AUNChannel {
         state.maxDurationMs = 0;
         this.rpcWarningStates.set(key, state);
         const summary = suppressed > 0 ? ` suppressed=${suppressed} max_duration=${maxDurationMs}ms` : '';
+        const menuTransport = method === 'message.send' && payloadType.startsWith('menu.')
+            ? ` ttl=${params.ttl ?? 'default'} to_device_id=${JSON.stringify(params.to_device_id ?? null)}`
+            : '';
         if (kind === 'failed') {
             const name = error instanceof Error ? error.name : '';
             const message = error instanceof Error ? error.message : String(error ?? '');
             const errorLabel = `${name}${code ? `(${code})` : ''} ${message}`.trim();
-            logger.warn(`${this.logPrefix()} rpc ${method} failed after ${durationMs}ms: ${errorLabel} queue_wait=${queueWaitMs}ms rpc=${rpcDurationMs}ms payload=${payloadType}${summary}`);
+            logger.warn(`${this.logPrefix()} rpc ${method} failed after ${durationMs}ms: ${errorLabel} queue_wait=${queueWaitMs}ms rpc=${rpcDurationMs}ms payload=${payloadType}${menuTransport}${summary}`);
             return;
         }
-        logger.warn(`${this.logPrefix()} rpc ${method} SLOW: duration=${durationMs}ms queue_wait=${queueWaitMs}ms rpc=${rpcDurationMs}ms payload=${payloadType}${summary} (发送管线可能饱和或链路抖动)`);
+        logger.warn(`${this.logPrefix()} rpc ${method} SLOW: duration=${durationMs}ms queue_wait=${queueWaitMs}ms rpc=${rpcDurationMs}ms payload=${payloadType}${menuTransport}${summary} (发送管线可能饱和或链路抖动)`);
     }
     observerQueueDropCount = 0;
     observerQueueDropLastWarnAt = 0;
@@ -1330,7 +1338,10 @@ export class AUNChannel {
         // Keep the command contract consistent for mixed friendly/canonical @
         // tokens: selector labels are removed above, then known AID-shaped tokens
         // anywhere in the command are removed by the existing helper.
-        return this.stripAllMentions(commandText);
+        const stripped = this.stripAllMentions(commandText);
+        // Keep the removed /mentionmode spelling compatible at the channel
+        // boundary while the command handler uses /mention internally.
+        return stripped.replace(/^\/mentionmode(?=\s|$)/, '/mention');
     }
     parsePayloadMentionsOrReject(payload, context, messageId, seq) {
         const raw = payload && typeof payload === 'object' && !Array.isArray(payload)
@@ -1383,7 +1394,7 @@ export class AUNChannel {
             return sanitized;
         return undefined;
     }
-    buildGroupReplyContext(threadId, senderAid, encrypted, messageId, chatmode, topicName, groupId, lable) {
+    buildGroupReplyContext(threadId, senderAid, encrypted, messageId, chatmode, topicName, groupId, label, topicStatus) {
         if (!groupId)
             throw new Error('buildGroupReplyContext requires groupId');
         const replyContext = {
@@ -1401,11 +1412,13 @@ export class AUNChannel {
                 replyContext.metadata = {};
             replyContext.metadata.topicName = topicName;
         }
-        if (lable && threadId)
-            replyContext.metadata.lable = lable;
+        if (label && threadId)
+            replyContext.metadata.label = label;
+        if (topicStatus && threadId)
+            replyContext.metadata.topicStatus = topicStatus;
         return replyContext;
     }
-    buildPrivateReplyContext(threadId, senderAid, encrypted, messageId, chatmode, topicName, refMessageId, lable) {
+    buildPrivateReplyContext(threadId, senderAid, encrypted, messageId, chatmode, topicName, refMessageId, label, topicStatus) {
         const replyContext = {
             metadata: { encrypted, chatmode, refMessageId },
             delivery: { chatType: 'private' },
@@ -1417,8 +1430,10 @@ export class AUNChannel {
             replyContext.replyToMessageId = messageId;
         if (topicName && threadId)
             replyContext.metadata.topicName = topicName;
-        if (lable && threadId)
-            replyContext.metadata.lable = lable;
+        if (label && threadId)
+            replyContext.metadata.label = label;
+        if (topicStatus && threadId)
+            replyContext.metadata.topicStatus = topicStatus;
         return replyContext;
     }
     claimInboundMessage(kind, messageId, seq) {
@@ -1537,7 +1552,7 @@ export class AUNChannel {
     peerInfoCache = new Map();
     peerInfoRevision = 0;
     messageSeqMap = new Map(); // messageId → seq (for ack/diagnostics)
-    sentCount = new Map(); // channelId → 已发消息计数（用于判断最终回复）
+    sentCount = new Map(); // "channelId\0threadId" → 本轮已发消息计数（seqInTurn/turnMessageCount 用）
     peerE2ee = new Map();
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
     plaintextRecv = 0;
@@ -1834,6 +1849,18 @@ export class AUNChannel {
             const kind = (data && typeof data === 'object') ? data.kind ?? '' : '';
             const keys = (data && typeof data === 'object') ? Object.keys(data).join(',') : typeof data;
             logger.debug(`${this.logPrefix()}[DIAG] message.received: kind=${kind} keys=${keys}`);
+            // 最早入站打点：SDK message.received 回调触发瞬间
+            if (data && typeof data === 'object') {
+                const d = data;
+                const payloadType = d.payload?.type ?? d.envelope?.type ?? '';
+                if (payloadType === 'text') {
+                    const msgId = d.message_id ?? d.id ?? '';
+                    const from = d.from ?? d.envelope?.from ?? '';
+                    const to = d.to ?? d.envelope?.to ?? this.config.aid ?? '';
+                    const text = d.payload?.text ?? '';
+                    import('../utils/msg-diag.js').then(m => m.diagLog('sdk_received', { aid: this.config.aid, from, to, msgId, text })).catch(() => { });
+                }
+            }
             await this.handleIncomingPrivateMessage(data);
         });
         // pureIdentity（控制 AID）：协议层不接群消息，不注册 group 创建监听
@@ -2256,24 +2283,39 @@ export class AUNChannel {
         }
         const fileParts = [];
         for (const att of rawAttachments) {
-            const filePath = await this.downloadAttachment(att, channelId, delivery);
-            if (!filePath)
+            const attachmentBuffer = await this.downloadAttachment(att, channelId, delivery);
+            if (!attachmentBuffer)
                 continue;
             const name = sanitizeFileName(att.filename || att.object_key?.split('/').pop() || 'file');
             let img = null;
             try {
-                const { readFileSync } = await import('node:fs');
-                img = await bufferToInboundImage(readFileSync(filePath), {
+                img = await bufferToInboundImage(attachmentBuffer, {
                     contentType: att.content_type, mimeType: att.mime_type, filename: name,
                 });
             }
             catch { /* read failed, treat as non-image file */ }
             if (img) {
+                try {
+                    const attachment = saveRelationAttachment(attachmentBuffer, this.config.aid, formatPeerKey('aun', channelId), img.mimeType);
+                    img = { ...img, attachmentId: attachment.attachmentId, localPath: attachment.filePath };
+                }
+                catch (error) {
+                    logger.warn(`${this.logPrefix()} Failed to persist relation attachment for ${name}: ${error instanceof Error ? error.message : String(error)}`);
+                }
                 images.push(img);
                 // 图片已注入视觉通道，不追加 [文件: …] 文本行
             }
             else {
-                fileParts.push(`[文件: ${name} → ${filePath}]`);
+                const projectPath = this.projectPathProvider
+                    ? await this.projectPathProvider(channelId)
+                    : process.cwd();
+                try {
+                    const saved = saveToUploads(attachmentBuffer, name, projectPath);
+                    fileParts.push(`[文件: ${name} → ${saved.filePath}]`);
+                }
+                catch (error) {
+                    logger.warn(`${this.logPrefix()} saveToUploads failed for ${name}: ${error}`);
+                }
             }
         }
         const parts = [];
@@ -2384,18 +2426,7 @@ export class AUNChannel {
                 return null;
             }
         }
-        const projectPath = this.projectPathProvider
-            ? await this.projectPathProvider(channelId)
-            : process.cwd();
-        try {
-            const result = saveToUploads(buffer, filename, projectPath);
-            logger.info(`${this.logPrefix()} Saved attachment: ${result.filePath} (${result.size} bytes)`);
-            return result.filePath;
-        }
-        catch (e) {
-            logger.warn(`${this.logPrefix()} saveToUploads failed for ${filename}: ${e}`);
-            return null;
-        }
+        return buffer;
     }
     extractAttachmentUrlToken(url) {
         try {
@@ -2547,9 +2578,13 @@ export class AUNChannel {
         // forwardInbound 内部排除 self-echo 与 from-owner。
         // 显式排除 observer.inject：它是 owner 对本 agent 的控制消息，不应镜像给观察者
         // （即便日后 from-owner 排除规则调整，也不会泄漏）。
-        if (inboundType !== AUNChannel.INJECT_REQUEST_TYPE) {
+        if (typeof inboundType !== 'string' || !inboundType.startsWith('observer.inject')) {
             void this.forwardInbound(msg);
         }
+        if (inboundType === 'observer.inject.status' || inboundType === 'observer.inject.ack') {
+            this.acknowledgeImmediately(messageId, seq);
+            return;
+        }
         // 回声过滤：自己发出的消息会被 gateway fanout 回来，
         // 只有 from_aid == self 且 chat_id 不匹配时才丢弃（说明是其它实例发的）
         const msgChatId = typeof payload === 'object' && payload !== null && payload.chat_id;
@@ -2585,6 +2620,9 @@ export class AUNChannel {
             ? 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))}`);
+        if (p2pPayloadType === 'text') {
+            import('../utils/msg-diag.js').then(m => m.diagLog('aun_in', { aid: this.config.aid, from: fromAid, to: this.config.aid, msgId: messageId, text })).catch(() => { });
+        }
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply') {
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId, receivedAt, seq);
@@ -2632,7 +2670,9 @@ export class AUNChannel {
         // observer 插话（v0.3）：只落盘到 pending-hints，不进 Agent、不回 owner。详见 docs/observer-insert-design.md。
         if (p2pPayloadType === AUNChannel.INJECT_REQUEST_TYPE) {
             this.acknowledgeImmediately(messageId, seq);
-            this.handleObserverInject(fromAid, payload, displayName, peerIdentity.type);
+            void Promise.resolve(this.handleObserverInject(fromAid, payload, displayName, peerIdentity.type)).catch(error => {
+                logger.error(`${this.logPrefix()} observer.inject failed: ${error instanceof Error ? error.message : String(error)}`);
+            });
             return;
         }
         // bind.request：Evol App 绑定请求。绕过白名单透传原始 payload JSON 给 bridge，
@@ -2670,7 +2710,7 @@ export class AUNChannel {
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: fromAid, msgId: messageId, kind: 'text', len: finalText.length });
         const isSystemP2P = p2pPayloadType === 'event';
         this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode, isSystemP2P ? 'notify' : 'send');
-        const replyContext = this.buildPrivateReplyContext(threadId, fromAid, msgEncrypted, messageId, msgChatmode, topicName, refMessageId, readTopicLable(payload));
+        const replyContext = this.buildPrivateReplyContext(threadId, fromAid, msgEncrypted, messageId, msgChatmode, topicName, refMessageId, readTopicLabel(payload), readTopicStatus(payload));
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -2717,9 +2757,9 @@ export class AUNChannel {
         const senderAid = env.from ?? '';
         const payload = msg.payload ?? '';
         const inboundType = (payload && typeof payload === 'object') ? payload.type : undefined;
-        if (inboundType === 'observer.forward') {
+        if (inboundType === 'observer.forward' || (typeof inboundType === 'string' && inboundType.startsWith('observer.inject'))) {
             this.acknowledgeImmediately(messageId, seq);
-            logger.debug(`${this.logPrefix()} Group dropped observer.forward control envelope: mid=${messageId}`);
+            logger.debug(`${this.logPrefix()} Group dropped observer control envelope: mid=${messageId}`);
             return;
         }
         const payloadMentionEntries = this.parsePayloadMentionsOrReject(payload, 'group.inbound', messageId, seq);
@@ -2782,7 +2822,7 @@ export class AUNChannel {
                     peerName: displayName,
                     peerType: peerInfo?.type || 'unknown',
                     seq,
-                    replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncryptedFast, messageId, msgChatmodeFast, topicName, groupId, readTopicLable(payload)),
+                    replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncryptedFast, messageId, msgChatmodeFast, topicName, groupId, readTopicLabel(payload), readTopicStatus(payload)),
                     createdAt,
                 });
                 return;
@@ -2819,8 +2859,8 @@ export class AUNChannel {
         if (!msgEncrypted)
             this.plaintextRecv++;
         // mention_mode 是唯一的服务端群 @ 策略字段；缺失/非法时使用协议内置默认 disabled。
-        const serverMentionMode = normalizeMentionMode(msg.mention_mode)
-            ?? normalizeMentionMode(payload?.mention_mode)
+        const serverMentionMode = normalizeAunMentionMode(msg.mention_mode)
+            ?? normalizeAunMentionMode(payload?.mention_mode)
             ?? 'disabled';
         const localMentionMode = normalizeMentionMode(this.mentionModeResolver
             ? await this.mentionModeResolver(groupId).catch(() => undefined)
@@ -2838,6 +2878,13 @@ export class AUNChannel {
         // 命令判定：剥离所有 @ 后看是否 / 开头（多 @ 场景如 @a @b /status 也能正确识别）。
         // echo 消息走独立的 trace 流程，不参与命令语义判定。
         const isCommandMsg = !isEchoMsg && slashCommandText.startsWith('/');
+        const commandMentionAids = payloadMentionAids.length > 0
+            ? payloadMentionAids
+            : this.extractMentionAidsFromText(text);
+        const commandTargetsAnotherAgent = isCommandMsg
+            && commandMentionAids.length > 0
+            && !commandMentionAids.includes(this._aid ?? '')
+            && !mentionedAll;
         const groupSlashRequireMentions = this.groupSlashRequireMentionsResolver
             ? await this.groupSlashRequireMentionsResolver().catch(() => undefined) ?? true
             : true;
@@ -2852,7 +2899,7 @@ export class AUNChannel {
             this.pendingEchoMessages.set(messageId, {
                 text: echoText,
                 channelId: groupId,
-                context: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmodeEcho, topicName, groupId, readTopicLable(payload)),
+                context: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmodeEcho, topicName, groupId, readTopicLabel(payload), readTopicStatus(payload)),
                 receiveTs: Date.now(),
             });
             // 继续走正常 Agent 流程（下面的代码会 dispatch）
@@ -2868,15 +2915,15 @@ export class AUNChannel {
             // slash 命令默认要求结构化 @；Agent 可通过
             // groupSlashRequireMentions=false 选择仅按正文命令格式处理。
             const enforceMention = (mentionMode === 'mention-only' && !isCommandMsg)
-                || (isCommandMsg && groupSlashRequireMentions);
+                || (isCommandMsg && (mentionMode === 'auto' || groupSlashRequireMentions));
             const isMentioned = mentionedSelf || mentionedAll;
             // 过滤逻辑下移到响应层：这里只标记，不过滤
             // 但为了保持现有行为兼容（避免大量未 @ 消息涌入），暂时保留过滤
             // TODO: Phase 6 实施 selective-response 模式后，移除此过滤，只保留 isMentioned 标记
-            if (enforceMention && !isMentioned && !isOwnHandoff) {
+            if ((commandTargetsAnotherAgent || (enforceMention && !isMentioned)) && !isOwnHandoff) {
                 try {
                     if (text.trim() || this.collectAllAttachments(payload).length) {
-                        this.appendInboundPayloadJsonl(groupId, senderAid, messageId, msgEncrypted, true, logDescriptor, threadId, receivedAt, seq, 'unmentioned', 'filtered');
+                        this.appendInboundPayloadJsonl(groupId, senderAid, messageId, msgEncrypted, true, logDescriptor, threadId, receivedAt, seq, isCommandMsg ? 'command' : 'unmentioned', 'filtered');
                     }
                 }
                 catch (error) {
@@ -2888,7 +2935,8 @@ export class AUNChannel {
                     return;
                 }
                 this.acknowledgeImmediately(messageId, seq);
-                logger.info(`${this.logPrefix()} Group dropped: unmentioned (group=${groupId} sender=${senderAid} mid=${messageId} mentionMode=${mentionMode} slashRequireMentions=${groupSlashRequireMentions} isCommand=${isCommandMsg} textPreview=${JSON.stringify(text.slice(0, 80))})`);
+                const dropReason = commandTargetsAnotherAgent ? 'command-targeted-other-agent' : 'unmentioned';
+                logger.info(`${this.logPrefix()} Group dropped: ${dropReason} (group=${groupId} sender=${senderAid} mid=${messageId} mentionMode=${mentionMode} slashRequireMentions=${groupSlashRequireMentions} isCommand=${isCommandMsg} commandMentionAids=${JSON.stringify(commandMentionAids)} textPreview=${JSON.stringify(text.slice(0, 80))})`);
                 return;
             }
         }
@@ -2962,7 +3010,7 @@ export class AUNChannel {
             isMentioned: isOwnHandoff || mentionedSelf || mentionedAll,
             source: isOwnHandoff ? 'handoff' : undefined,
             encrypted: msgEncrypted,
-            replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode, topicName, groupId, readTopicLable(payload)),
+            replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode, topicName, groupId, readTopicLabel(payload), readTopicStatus(payload)),
             mentionMode: serverMentionMode,
             images: inboundImages.length > 0 ? inboundImages : undefined,
             msgType: logDescriptor.msgType,
@@ -3069,7 +3117,7 @@ export class AUNChannel {
     }
     appendInboundPayloadJsonl(channelId, fromAid, msgId, encrypt, isGroup, descriptor, threadId, receivedAt, gatewaySeq, groupAttention, groupDelivery) {
         try {
-            const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', channelId, this.config.aid);
+            const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', channelId, this.config.aid, this.config.channelName);
             const entry = buildInboundEntry({
                 from: fromAid,
                 to: this.config.aid,
@@ -3107,6 +3155,7 @@ export class AUNChannel {
     // observable / owners 不在此处缓存——由 daemon 注入 resolver，从 EvolAgent 的
     // in-memory merged config（启动/重启/热重载时统一更新的唯一缓存）读取，避免重复缓存。
     observerConfigResolver;
+    observerHintRuntime;
     observerGroupMembers = new Map();
     observerGroupMemberFetches = new Map();
     observerGroupMembershipEpoch = new Map();
@@ -3114,6 +3163,15 @@ export class AUNChannel {
     setObserverConfigResolver(fn) {
         this.observerConfigResolver = fn;
     }
+    setObserverHintRuntime(runtime) {
+        this.observerHintRuntime = runtime;
+    }
+    notifyObserverHintConsumed(hint, target, meta) {
+        this.emitInjectStatus(hint.ownerAid, hint.id, target, 'consumed', 0, meta?.action ?? (hint.promoteRequestId ? 'promote' : 'add'), meta?.requestId ?? hint.promoteRequestId);
+    }
+    notifyObserverHintFailed(hint, target, failure) {
+        this.emitInjectStatus(hint.ownerAid, hint.id, target, 'failed', 0, failure.action ?? (hint.promoteRequestId ? 'promote' : 'add'), failure.requestId ?? hint.promoteRequestId, failure);
+    }
     /** 读取 observable 开关 + owners；未接入 daemon 时没有 owning Agent，保持关闭。 */
     getObserverConfig() {
         return this.observerConfigResolver?.() ?? { observable: false, owners: [] };
@@ -3227,7 +3285,7 @@ export class AUNChannel {
         const inboundType = payloadTypeForObserver(data);
         // Observer envelopes are control-plane telemetry. Mirroring one again
         // would amplify every activity event across observer-connected agents.
-        if (inboundType === 'observer.forward' || inboundType?.startsWith('menu.'))
+        if (inboundType === 'observer.forward' || inboundType?.startsWith('observer.inject') || inboundType?.startsWith('menu.'))
             return Promise.resolve();
         const { observable, owners } = this.getObserverConfig();
         if (!observable || owners.length === 0)
@@ -3264,7 +3322,7 @@ export class AUNChannel {
         if (!this.connected || !this.client)
             return Promise.resolve();
         const outboundType = payloadTypeForObserver(result);
-        if (outboundType === 'observer.forward' || outboundType?.startsWith('menu.'))
+        if (outboundType === 'observer.forward' || outboundType?.startsWith('observer.inject') || outboundType?.startsWith('menu.'))
             return Promise.resolve();
         const { observable, owners } = this.getObserverConfig();
         if (!observable || owners.length === 0)
@@ -3309,13 +3367,7 @@ export class AUNChannel {
                 .catch(e => logger.debug(`${this.logPrefix()} observer.forward send to ${ownerAid} failed: ${e}`));
         }
     }
-    // ── 观察者插话（Observer Insert，v0.3 待用上下文提示） ──────────────
-    //
-    // owner 经 message.send 给 agent 自身 AID 发 observer.inject（payload 为对象）。
-    // 鉴权 from∈owners 后，把提示【只落盘】到 agent↔对端 会话的 pending-hints.jsonl
-    // （不 dispatch、不跑 LLM、不回 owner）；下一条对端消息到达时由 message-processor
-    // 回放消费、注入渲染层。action=add 加提示 / remove 撤销。
-    // 详见 docs/observer-insert-design.md 第一部分。
+    // ── 观察者插话 ──────────────
     /** 回 observer.inject.ack 给 owner；加密使用 daemon 的全局 AUN 默认设置。 */
     emitInjectAck(ownerAid, injectId, data, error) {
         if (!this.connected || !this.client)
@@ -3330,12 +3382,51 @@ export class AUNChannel {
         this.callAndTrace('message.send', { to: ownerAid, payload: ackPayload, encrypt: this.shouldEncrypt(ownerAid) })
             .catch(e => logger.warn(`${this.logPrefix()} observer.inject.ack send to ${ownerAid} failed: ${e}`));
     }
-    /** 处理 observer.inject：鉴权 + 校验 + 只落盘到 pending-hints（不触发处理、不回 owner）。 */
-    handleObserverInject(fromAid, payload, displayName, peerType) {
+    emitInjectStatus(ownerAid, hintId, target, status, attempt = 0, action, requestId, failure) {
+        if (!this.getObserverConfig().owners.includes(ownerAid))
+            return;
+        const payload = {
+            type: 'observer.inject.status', id: hintId,
+            target: { channel_id: target.channelId, chat_type: target.chatType,
+                ...(target.threadId ? { thread_id: target.threadId } : {}) },
+            data: {
+                status,
+                hint_id: hintId,
+                ...(action ? { action } : {}),
+                ...(requestId ? { request_id: requestId } : {}),
+                ...(status === 'consumed' ? { consumed_at: Date.now() } : {}),
+                ...(failure ? { error: { code: failure.code, message: failure.message } } : {}),
+            },
+        };
+        const delivery = this.connected && this.client
+            ? this.callAndTrace('message.send', { to: ownerAid, payload, encrypt: this.shouldEncrypt(ownerAid) })
+            : Promise.reject(new Error('AUN is disconnected'));
+        void delivery.catch(error => {
+            if (attempt < 3) {
+                const timer = setTimeout(() => this.emitInjectStatus(ownerAid, hintId, target, status, attempt + 1, action, requestId, failure), [250, 1000, 5000][attempt]);
+                timer.unref?.();
+            }
+            else
+                logger.warn(`${this.logPrefix()} observer.inject.status delivery failed owner=${ownerAid} hint=${hintId} status=${status}: ${error}`);
+        });
+    }
+    async handleObserverInject(fromAid, payload, displayName, peerType) {
         void peerType;
         const { owners } = this.getObserverConfig();
         const ts = Date.now();
         const req = parseInjectRequest(payload, fromAid, owners, ts);
+        const requestAction = req.kind === 'reject' ? req.action : req.kind;
+        const requestHintId = req.kind === 'add' ? req.id : 'targetId' in req ? req.targetId : undefined;
+        const requestTarget = 'channelId' in req && req.channelId
+            ? { channel_id: req.channelId, chat_type: req.chatType ?? 'private', ...(req.threadId ? { thread_id: req.threadId } : {}) }
+            : undefined;
+        const ackData = (status, hintId) => ({
+            status,
+            action: requestAction,
+            ...(hintId || requestHintId ? { hint_id: hintId || requestHintId } : {}),
+            ...(req.injectId ? { request_id: req.injectId } : {}),
+            ...(requestTarget ? { target: requestTarget } : {}),
+        });
         if (req.kind === 'reject') {
             logger.warn(`${this.logPrefix()} observer.inject rejected: ${this.getShortAid(fromAid)} ${req.code}`);
             this.emitInjectAck(fromAid, req.injectId, { status: 'rejected', action: req.action }, { code: req.code, message: req.message });
@@ -3343,24 +3434,67 @@ export class AUNChannel {
         }
         const selfAID = this.config.aid;
         const sessionsDir = resolvePaths().sessionsDir;
-        let ok;
-        if (req.kind === 'remove') {
-            ok = appendHintRemove(sessionsDir, 'aun', req.channelId, selfAID, { targetId: req.targetId, threadId: req.threadId, ts });
-        }
-        else {
-            ok = appendHintAdd(sessionsDir, 'aun', req.channelId, selfAID, { id: req.id, text: req.text, threadId: req.threadId, ownerAid: req.ownerAid, ts });
+        const channelKey = this.config.channelName ?? 'aun';
+        try {
+            await withHintTargetLock(sessionsDir, 'aun', req.channelId, selfAID, req.chatType, req.threadId, async () => {
+                const immediate = (req.kind === 'add' && req.mode === 'interrupt') || req.kind === 'promote';
+                const target = { channelKey, channelId: req.channelId, chatType: req.chatType, threadId: req.threadId, selfAid: selfAID };
+                if (immediate && (!this.observerHintRuntime || !await this.observerHintRuntime.hasSession(target))) {
+                    this.emitInjectAck(fromAid, req.injectId, { status: 'rejected', action: req.kind }, { code: 'SESSION_NOT_FOUND', message: '目标 Agent session 不存在' });
+                    return;
+                }
+                const result = req.kind === 'add'
+                    ? appendHintAddDetailed(sessionsDir, 'aun', req.channelId, selfAID, {
+                        id: req.id, text: req.text, mode: req.mode, chatType: req.chatType,
+                        threadId: req.threadId, ownerAid: req.ownerAid, ts,
+                    }, channelKey)
+                    : req.kind === 'remove'
+                        ? appendHintRemoveDetailed(sessionsDir, 'aun', req.channelId, selfAID, {
+                            targetId: req.targetId, chatType: req.chatType, threadId: req.threadId, ts,
+                        }, channelKey)
+                        : appendHintPromoteDetailed(sessionsDir, 'aun', req.channelId, selfAID, {
+                            targetId: req.targetId, chatType: req.chatType, threadId: req.threadId, requestId: req.injectId, ts,
+                        }, channelKey);
+                if (!result.ok) {
+                    this.emitInjectAck(fromAid, req.injectId, { status: 'rejected', action: req.kind }, { code: result.code ?? 'STORE_FAILED', message: '提示状态操作失败' });
+                    return;
+                }
+                const hintId = req.kind === 'add' ? req.id : req.targetId;
+                logger.info(`${this.logPrefix()} observer.inject ${req.kind} stored: from=${this.getShortAid(fromAid)}(${displayName}) target=${req.channelId} chatType=${req.chatType} thread=${req.threadId ?? 'main'} hint=${hintId ?? 'all'}`);
+                this.emitInjectAck(fromAid, req.injectId, ackData('accepted', hintId));
+                if (req.kind === 'remove') {
+                    for (const hint of result.removedHints ?? [])
+                        this.emitInjectStatus(hint.ownerAid, hint.id, target, 'removed', 0, 'remove', req.injectId);
+                }
+                else if (req.kind === 'add') {
+                    this.emitInjectStatus(req.ownerAid, req.id, target, result.state ?? 'pending', 0, 'add', req.injectId || req.id);
+                }
+                else {
+                    const stored = peekHints(sessionsDir, 'aun', req.channelId, selfAID, req.threadId, req.chatType, undefined, channelKey)
+                        .find(item => item.id === req.targetId);
+                    if (stored)
+                        this.emitInjectStatus(stored.ownerAid, req.targetId, target, 'pending', 0, 'promote', stored.promoteRequestId || req.injectId);
+                }
+                if (immediate && result.state === 'pending') {
+                    try {
+                        const scheduled = await this.observerHintRuntime.schedule({ ...target, hintId: hintId, requestId: req.injectId });
+                        if (scheduled === 'SESSION_NOT_FOUND')
+                            logger.warn(`${this.logPrefix()} observer hint session vanished before scheduling hint=${hintId}`);
+                    }
+                    catch (error) {
+                        logger.warn(`${this.logPrefix()} observer hint scheduling failed hint=${hintId}: ${error}`);
+                    }
+                }
+                const watchText = req.kind === 'add' ? req.text
+                    : req.kind === 'promote' ? `[立即执行提示] id=${req.targetId}`
+                        : `[撤销提示]${req.targetId ? ` id=${req.targetId}` : '（全部）'}`;
+                this.recordInjectWatch('in', fromAid, req.channelId, req.chatType, `inject-${req.injectId || ts}`, watchText, req.threadId, channelKey);
+            }, channelKey);
         }
-        if (!ok) {
-            this.emitInjectAck(fromAid, req.injectId, { status: 'rejected', action: req.kind }, { code: 'STORE_FAILED', message: '提示落盘失败' });
-            return;
+        catch (error) {
+            logger.warn(`${this.logPrefix()} observer.inject failed before acceptance: ${error instanceof Error ? error.message : String(error)}`);
+            this.emitInjectAck(fromAid, req.injectId, { status: 'rejected', action: req.kind }, { code: 'STORE_FAILED', message: '提示状态操作失败' });
         }
-        logger.info(`${this.logPrefix()} observer.inject ${req.kind} stored: from=${this.getShortAid(fromAid)}(${displayName}) target=${req.channelId} chatType=${req.chatType} thread=${req.threadId ?? 'main'}${req.kind === 'add' ? ` textLen=${req.text.length}` : `${req.targetId ? ` targetId=${req.targetId}` : ' (clear-all)'}`}`);
-        this.emitInjectAck(fromAid, req.injectId, { status: 'accepted', action: req.kind });
-        // 记录到 watch（被观察的 agent↔对端 会话），带 owner-inject 标记区分对端真实消息。
-        // v0.3：只记"提示已添加/已撤销"，不触发处理、不产生 agent→owner 回应。
-        const watchText = req.kind === 'remove' ? `[撤销提示]${req.targetId ? ` id=${req.targetId}` : '（全部）'}` : req.text;
-        const synthId = `inject-${req.injectId || ts}`;
-        this.recordInjectWatch('in', fromAid, req.channelId, req.chatType, synthId, watchText, req.threadId);
     }
     /**
      * 把 observer 插话 / 对插话的回应记录到 watch（被观察的 agent↔对端 会话），
@@ -3369,11 +3503,11 @@ export class AUNChannel {
      * @param dir 'in'=owner→agent 插话；'out'=agent→owner 对插话的回应
      * @param peerChannelId 被观察会话的对端（agent↔对端），日志落点 = sessions/aun/<self>/<peerChannelId>/
      */
-    recordInjectWatch(dir, ownerAid, peerChannelId, chatType, msgId, text, threadId) {
+    recordInjectWatch(dir, ownerAid, peerChannelId, chatType, msgId, text, threadId, channelKey) {
         try {
             const selfAID = this.config.aid;
             const isGroup = chatType === 'group';
-            const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', peerChannelId, selfAID);
+            const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', peerChannelId, selfAID, channelKey);
             const entry = dir === 'in'
                 ? buildInboundEntry({
                     from: ownerAid, to: selfAID, chatType,
@@ -4136,6 +4270,9 @@ export class AUNChannel {
         if (isMenuPayload && typeof context?.metadata?.menuClientSdkVersion === 'string') {
             params.menu_client_sdk_version = context.metadata.menuClientSdkVersion;
         }
+        if (isMenuPayload && context?.metadata?.menuClientVolatileV1 === true) {
+            params.menu_client_volatile_v1 = true;
+        }
         if (isMenuPayload && encrypt && context?.metadata?.protectedHeaders) {
             params.protected_headers = context.metadata.protectedHeaders;
         }
@@ -4380,17 +4517,24 @@ export class AUNChannel {
         const rawItem = item && typeof item === 'object' && !Array.isArray(item)
             ? { ...item }
             : { kind: 'unknown', text: String(item ?? '') };
+        // Lift evolCommand out of the item and into the payload's ext dict.
+        const evolCommand = typeof rawItem.evolCommand === 'string' ? rawItem.evolCommand : undefined;
+        if (evolCommand)
+            delete rawItem.evolCommand;
         const displayArguments = rawItem.kind === 'tool_call'
             ? toolInputForDisplay(rawItem.name, rawItem.arguments)
             : undefined;
         const activityItem = rawItem.kind === 'tool_call' && displayArguments !== rawItem.arguments
             ? { ...rawItem, arguments: displayArguments }
             : rawItem;
-        return withAunAttention({
+        const base = {
             ...this.buildTaskPayloadBase(envelope, context),
             type: 'activity',
             item: this.stripUndefinedDeep(activityItem),
-        });
+        };
+        if (evolCommand)
+            base.ext = { evolCommand };
+        return withAunAttention(base);
     }
     async sendReliableStructured(channelId, payload, context, logText) {
         const result = await this.sendContentPayload(channelId, payload, {
@@ -4418,13 +4562,17 @@ export class AUNChannel {
             return { status: 'failed', error: 'message text is empty', code: 'EMPTY_MESSAGE' };
         }
         const delivery = this.requireDelivery(channelId, context);
-        const routedContext = this.withDelivery(context, delivery);
+        let routedContext = this.withDelivery(context, delivery);
         // 长 echo: agent 首次回复前先发 echo trace（echo 自身发送时跳过）
         if (!this.isEchoSending) {
             await this.flushPendingEcho(channelId, delivery, context?.threadId);
         }
         let finalText = text;
-        this.sentCount.set(channelId, (this.sentCount.get(channelId) || 0) + 1);
+        const turnKey = `${channelId}\0${context?.threadId ?? ''}`;
+        const seqInTurn = (this.sentCount.get(turnKey) || 0) + 1;
+        this.sentCount.set(turnKey, seqInTurn);
+        // Carry seq into context so deliverTextEntry can embed it in ext.
+        routedContext = { ...routedContext, ext: { ...routedContext.ext, seqInTurn } };
         if (delivery.chatType === 'group') {
             const requestedMentions = Array.from(new Set((context?.mentionUserIds ?? [])
                 .filter((id) => typeof id === 'string' && id.trim().length > 0)
@@ -4838,7 +4986,23 @@ export class AUNChannel {
         }
         // 从 context.metadata.source 读取 source，默认为 'daemon'
         const source = context?.metadata?.source ?? 'daemon';
+        // Merge ext hints from context into the wire payload.
+        // isFinal: written by response-engine; turnMessageCount: total messages this turn (only on final).
+        let ext = context?.ext
+            ? { ...context.ext }
+            : undefined;
+        if (ext?.isFinal) {
+            const turnKey = `${channelId}\0${context?.threadId ?? ''}`;
+            const total = this.sentCount.get(turnKey) ?? 1;
+            ext = { ...ext, turnMessageCount: total };
+        }
         const payload = withAunAttention({ type: 'text', text: finalText }, context?.attention);
+        if (ext && Object.keys(ext).length > 0)
+            payload.ext = ext;
+        // sentAt 在每次投递尝试时盖戳（outbox 重发取重发时刻）。服务端会用自己的时间覆盖
+        // 顶层 timestamp，两者有毫秒级差异，sentAt 只代表本端时钟。
+        if (context?.debug)
+            payload.debug = { ...context.debug, sentAt: localTimestamp() };
         if (delivery.chatType === 'group') {
             const extracted = this.extractMentionEntriesFromText(finalText);
             if (extracted.length > 0)
@@ -4864,6 +5028,7 @@ export class AUNChannel {
         }
         // 诊断日志：记录 payload 构造结果（含 task_id / thread_id / chatmode）
         logger.info(`${this.logPrefix()} deliverTextEntry: channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} chatmode=${payload.chatmode ?? 'none'} source=${source} textLen=${finalText.length}`);
+        import('../utils/msg-diag.js').then(m => m.diagLog('aun_out', { aid: this.config.aid, from: this.config.aid, to: channelId, msgId: payload.task_id ?? '', taskId: payload.task_id, text: finalText })).catch(() => { });
         const isGroup = delivery.chatType === 'group';
         const targetAid = channelId;
         if (entry.deliveryReceipt) {
@@ -5335,6 +5500,9 @@ export class AUNChannel {
         if (isMenuPayload && typeof context?.metadata?.menuClientSdkVersion === 'string') {
             params.menu_client_sdk_version = context.metadata.menuClientSdkVersion;
         }
+        if (isMenuPayload && context?.metadata?.menuClientVolatileV1 === true) {
+            params.menu_client_volatile_v1 = true;
+        }
         const rawHeaders = context?.metadata?.protectedHeaders;
         if (encrypt && rawHeaders && typeof rawHeaders === 'object' && !Array.isArray(rawHeaders)) {
             const protectedHeaders = {};
@@ -5414,8 +5582,8 @@ export class AUNChannel {
             logger.warn(`${this.logPrefix()} sendFile: file is empty`);
             return { status: 'failed', error: 'file is empty', code: 'EMPTY_FILE' };
         }
-        if (stat.size > 10 * 1024 * 1024) {
-            logger.warn(`${this.logPrefix()} sendFile: file too large (${formatSize(stat.size)}, max 10 MB)`);
+        if (stat.size > MAX_AUN_ATTACHMENT_SIZE) {
+            logger.warn(`${this.logPrefix()} sendFile: file too large (${formatSize(stat.size)}, max ${formatSize(MAX_AUN_ATTACHMENT_SIZE)})`);
             return { status: 'failed', error: `file too large (max ${formatSize(MAX_AUN_ATTACHMENT_SIZE)})`, code: 'FILE_TOO_LARGE' };
         }
         // Write-ahead: persist to outbox
@@ -5869,8 +6037,13 @@ export class AUNChannel {
             return;
         }
         context = this.withDelivery(context, delivery);
-        if (status === 'start')
-            this.sentCount.delete(channelId); // 新任务开始，重置计数
+        if (status === 'start') {
+            // 新任务开始，重置所有以该 channelId 开头的计数（不区分 threadId）
+            for (const key of this.sentCount.keys()) {
+                if (key.startsWith(`${channelId}\0`))
+                    this.sentCount.delete(key);
+            }
+        }
         if (!this.client || !this.connected)
             return;
         const requestedSeverity = extraMeta?.severity;
@@ -6239,6 +6412,8 @@ export class AUNChannelPlugin {
                 if (replyCtx) {
                     replyCtx = { ...replyCtx };
                     delete replyCtx.attention;
+                    // Do not inherit title from a previous payload's reply context.
+                    delete replyCtx.title;
                 }
                 if (attention !== undefined)
                     replyCtx = { ...(replyCtx ?? {}), attention };
@@ -6283,8 +6458,9 @@ export class AUNChannelPlugin {
                                     ? { forkAnchor: payload.metadata.forkAnchor } : {}),
                             },
                         };
-                        if (payload.kind === 'result.text' && payload.isFinal)
+                        if (payload.kind === 'result.text' && payload.isFinal && delivery.chatType === 'private') {
                             sendCtx.title = '✅ 最终回复:';
+                        }
                         let result;
                         try {
                             result = await channel.sendMessage(channelId, payload.text, sendCtx);