evolclaw 3.1.0 → 3.1.2

package/dist/aun/msg/upload.js

@@ -3,21 +3,19 @@ import fs from 'fs';
 import path from 'path';
 import { guessMime, formatSize } from '../../utils/media-cache.js';
 import { inferPayloadType, isValidPayloadType } from './payload-type.js';
-/** 小文件阈值：≤64KB 走 storage.put_object 内联 base64；>64KB 走 create_upload_session + HTTP PUT。 */
-const INLINE_UPLOAD_LIMIT = 64 * 1024;
 /** 单次上传最大大小（与 daemon sendFile 一致）。 */
 const MAX_FILE_SIZE = 10 * 1024 * 1024;
+/** server 端 inline 上限错误的识别特征。优先匹配错误消息里的“inline 上限”字样。 */
+function isInlineLimitError(err) {
+    const msg = err?.message ?? '';
+    return /inline\s*上限|inline limit|create_upload_session/i.test(msg);
+}
 /**
  * 上传本地文件并构造发送用的 payload。
  *
- * 流程：
- * 1. 读文件、算 sha256、推断 content_type
- * 2. 小文件 storage.put_object，大文件 storage.create_upload_session + HTTP PUT + storage.complete_upload
- * 3. 按 as / 扩展名 确定 payload.type
- * 4. 构造 payload（含 attachments 引用）
- *
- * 不做 outbox 持久化、不做 E2EE 加密兜底——这些是 daemon 的职责。
- * CLI 短连接场景假定网络稳定，失败抛异常给调用方处理。
+ * 策略：先无脑 storage.put_object（内联 base64）。server 报“超过 inline 上限”
+ * 时降级到 storage.create_upload_session + HTTP PUT + storage.complete_upload，
+ * 此时通过 onProgress 上报字节级进度。
  */
 export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts) {
     const absPath = path.resolve(filePath);
@@ -29,14 +27,19 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
         throw new Error(`文件为空: ${absPath}`);
     }
     if (stat.size > MAX_FILE_SIZE) {
-        throw new Error(`文件过大 (${formatSize(stat.size)}, 上 ${formatSize(MAX_FILE_SIZE)}): ${absPath}`);
+        throw new Error(`文件过大 (${formatSize(stat.size)}, 上限 ${formatSize(MAX_FILE_SIZE)}): ${absPath}`);
     }
     const filename = path.basename(absPath);
     const fileData = fs.readFileSync(absPath);
     const sha256 = crypto.createHash('sha256').update(fileData).digest('hex');
     const contentType = opts?.contentType ?? guessMime(filename);
     const objectKey = `shared/${crypto.randomUUID()}/${filename}`;
-    if (stat.size <= INLINE_UPLOAD_LIMIT) {
+    const total = stat.size;
+    const report = (phase, bytes) => opts?.onProgress?.({ phase, bytes, total });
+    // 1. 先按 inline 走
+    let inlineRejected = false;
+    try {
+        report('inline', 0);
         await conn.call('storage.put_object', {
             object_key: objectKey,
             content: fileData.toString('base64'),
@@ -44,32 +47,68 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
             is_private: false,
             overwrite: true,
         });
+        report('inline', total);
     }
-    else {
+    catch (e) {
+        if (!isInlineLimitError(e))
+            throw e;
+        inlineRejected = true;
+    }
+    // 2. inline 被拒：降级到 session + HTTP PUT
+    if (inlineRejected) {
+        report('session-create', 0);
         const session = await conn.call('storage.create_upload_session', {
             object_key: objectKey,
-            size_bytes: stat.size,
+            size_bytes: total,
             content_type: contentType,
         });
         const uploadUrl = session?.upload_url;
         if (!uploadUrl)
             throw new Error('storage.create_upload_session 未返回 upload_url');
-        const uploadResp = await fetch(uploadUrl, { method: 'PUT', body: fileData });
+        // 简单 Buffer 上传 + 周期性进度（不用流，避免某些 storage 网关对 chunked / duplex 不友好）
+        report('http-put', 0);
+        const PROGRESS_TICK_MS = 250;
+        let lastBytes = 0;
+        const tickerStart = Date.now();
+        // 简单的“估算”进度：实际上一次性发，但在等待响应期间按 elapsed 模拟字节数，让用户看到在跑
+        const ticker = setInterval(() => {
+            const elapsed = Date.now() - tickerStart;
+            // 假设 2MB/s 估算；不超过 99%
+            const estimated = Math.min(total - 1, Math.floor((elapsed / 1000) * 2 * 1024 * 1024));
+            if (estimated > lastBytes) {
+                lastBytes = estimated;
+                report('http-put', estimated);
+            }
+        }, PROGRESS_TICK_MS);
+        let uploadResp;
+        try {
+            uploadResp = await fetch(uploadUrl, {
+                method: 'PUT',
+                body: new Blob([new Uint8Array(fileData)], { type: contentType }),
+                headers: { 'Content-Type': contentType },
+            });
+        }
+        finally {
+            clearInterval(ticker);
+        }
         if (!uploadResp.ok)
             throw new Error(`HTTP 上传失败: ${uploadResp.status}`);
+        report('http-put', total);
+        report('session-complete', total);
         await conn.call('storage.complete_upload', {
             object_key: objectKey,
             sha256,
             content_type: contentType,
             is_private: false,
-            size_bytes: stat.size,
+            size_bytes: total,
         });
     }
+    report('done', total);
     const attachment = {
         owner_aid: ownerAid,
         object_key: objectKey,
         filename,
-        size_bytes: stat.size,
+        size_bytes: total,
         sha256,
         content_type: contentType,
     };
@@ -91,7 +130,7 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
     if (opts?.text)
         payload.text = opts.text;
     else if (type === 'file')
-        payload.text = `📎 ${filename} (${formatSize(stat.size)})`;
+        payload.text = `📎 ${filename} (${formatSize(total)})`;
     if (type === 'voice' && opts?.transcript)
         payload.transcript = opts.transcript;
     return { payload, type, attachment };

package/dist/channels/aun.js

@@ -6,14 +6,17 @@ import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
-import { resolvePaths, getPackageRoot } from '../paths.js';
+import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
+import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
+import { chatDirPath } from '../core/session/session-fs-store.js';
 import { appendAidLifecycle } from '../aun/aid/identity.js';
 import { loadAgent, saveAgent } from '../config-store.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import * as outbox from '../aun/outbox.js';
 import { guessMime, formatSize } from '../utils/media-cache.js';
+import { PeerIdentityCache } from '../core/relation/peer-identity.js';
 /**
  * 构造 connect extra_info：自描述本进程身份。
  *
@@ -67,6 +70,7 @@ export class AUNChannel {
     queuedHandler = null;
     pendingEchoMessages = new Map();
     isEchoSending = false;
+    agentDir;
     trace(dir, event, data) {
         if (!this.config.aunTrace)
             return;
@@ -404,10 +408,10 @@ export class AUNChannel {
         }
         return out;
     }
-    buildGroupReplyContext(taskId, senderAid, encrypted, messageId) {
-        const replyContext = { metadata: { encrypted } };
-        if (taskId)
-            replyContext.threadId = taskId;
+    buildGroupReplyContext(threadId, senderAid, encrypted, messageId, chatmode) {
+        const replyContext = { metadata: { encrypted, chatmode } };
+        if (threadId)
+            replyContext.threadId = threadId;
         replyContext.peerId = senderAid;
         if (messageId)
             replyContext.replyToMessageId = messageId;
@@ -470,6 +474,7 @@ export class AUNChannel {
     aidStatsCollector;
     constructor(config) {
         this.config = config;
+        this.agentDir = agentDirPath(config.aid);
         if (config.aunTrace) {
             this.traceWriter = new LogWriter({
                 baseName: 'aun',
@@ -726,8 +731,8 @@ export class AUNChannel {
                 logger.info(`${this.logPrefix()} No owner configured, skipping welcome message (will retry after auto-bind)`);
                 return;
             }
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
-            const existingAgentMd = fs.existsSync(agentMdPath) ? fs.readFileSync(agentMdPath, 'utf-8') : '';
+            const agentMdLocalPath = agentMdPathFn(aidName);
+            const existingAgentMd = fs.existsSync(agentMdLocalPath) ? fs.readFileSync(agentMdLocalPath, 'utf-8') : '';
             const existingFrontmatterMatch = existingAgentMd.match(/^---\n([\s\S]*?)\n---/);
             const existingFrontmatter = existingFrontmatterMatch?.[1] ?? '';
             // Fetch owner's agent.md to derive name and validate type
@@ -773,8 +778,8 @@ tags:
 EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 `;
             // Write locally
-            fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
-            fs.writeFileSync(agentMdPath, newAgentMd, 'utf-8');
+            fs.mkdirSync(path.dirname(agentMdLocalPath), { recursive: true });
+            fs.writeFileSync(agentMdLocalPath, newAgentMd, 'utf-8');
             logger.info(`${this.logPrefix()} Updated agent.md for ${aidName}`);
             // Publish to AUN network via auth.uploadAgentMd
             try {
@@ -903,7 +908,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const fromAid = msg.from ?? '';
         const payload = msg.payload ?? '';
         const text = this.extractTextPayload(payload, fromAid);
-        const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
+        const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
         // 回声过滤：自己发出的消息会被 gateway fanout 回来，
@@ -947,12 +952,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // 私聊 channelId = 对端 AID（不再读 payload.chat_id 含 device 三段式）
         // device_id 仅 SDK 内部多实例去重用，evolclaw session 层面跨端共享会话
         const chatId = fromAid;
-        const peerInfo = await this.fetchPeerInfo(fromAid);
+        // 解析对端身份（30天缓存）
+        const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, selfAgentDir, this.client, false);
         const shortAid = this.getShortAid(fromAid);
-        const displayName = peerInfo.name || shortAid;
+        const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
         const p2pPayloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
-        logger.info(`${this.logPrefix()} P2P dispatch decision: mid=${messageId} from=${shortAid}(${displayName}) peerType=${peerInfo.type || 'unknown'} payloadType=${p2pPayloadType} chatId=${chatId} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
+        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')
             return;
@@ -964,7 +971,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 text: JSON.stringify(payload),
                 chatType: 'private', messageId, seq,
                 peerName: displayName || undefined,
-                peerType: peerInfo.type || undefined,
+                peerType: peerIdentity.type,
             });
             return;
         }
@@ -974,13 +981,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.info(`${this.logPrefix()} P2P dropped (type deny): type=${p2pPayloadType} from=${shortAid}(${displayName}) mid=${messageId}`);
             return;
         }
-        logger.info(`${this.logPrefix()} P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} text=${finalText.slice(0, 60)}`);
+        const msgChatmode = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
+        logger.info(`${this.logPrefix()} P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} chatmode=${msgChatmode ?? 'none'} text=${finalText.slice(0, 60)}`);
         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);
-        const replyContext = { metadata: { encrypted: msgEncrypted } };
-        if (taskId)
-            replyContext.threadId = taskId;
+        this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode);
+        const replyContext = { metadata: { encrypted: msgEncrypted, chatmode: msgChatmode } };
+        if (threadId)
+            replyContext.threadId = threadId;
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -988,10 +996,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             chatType: 'private',
             messageId,
             seq,
-            taskId,
+            threadId,
             mentions,
             peerName: displayName || undefined,
-            peerType: peerInfo.type || 'unknown',
+            peerType: peerIdentity.type,
             replyContext,
         });
     }
@@ -1003,7 +1011,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const senderAid = msg.sender_aid ?? '';
         const payload = msg.payload ?? '';
         const text = this.extractTextPayload(payload, groupId, senderAid);
-        const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
+        const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
         // Extract structured mentions from payload (e.g. payload.mentions: ["evolai.agentid.pub"])
@@ -1028,6 +1036,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (/echo/i.test(firstLineFast) && firstLineFast.trim().length <= 10 && !hasEvolClawTrace) {
                 this.acknowledgeImmediately(messageId, seq);
                 const msgEncryptedFast = !!(msg.e2ee);
+                const msgChatmodeFast = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
                 const peerInfo = this.peerInfoCached(senderAid);
                 const shortAid = this.getShortAid(senderAid);
                 const displayName = peerInfo?.name || shortAid;
@@ -1043,7 +1052,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     peerName: displayName,
                     peerType: peerInfo?.type || 'unknown',
                     seq,
-                    replyContext: this.buildGroupReplyContext(undefined, senderAid, msgEncryptedFast, messageId),
+                    replyContext: this.buildGroupReplyContext(undefined, senderAid, msgEncryptedFast, messageId, msgChatmodeFast),
                     createdAt,
                 });
                 return;
@@ -1104,10 +1113,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             };
             let echoText = text;
             echoText += `\n${echoTs()} [EvolClaw.receive] from=${senderAid} mid=${messageId} chat=group self=${this._aid || 'unknown'} conn_uptime=${this.connectedAt ? Math.round((Date.now() - this.connectedAt) / 1000) + 's' : 'unknown'}`;
+            const msgChatmodeEcho = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
             this.pendingEchoMessages.set(messageId, {
                 text: echoText,
                 channelId: groupId,
-                context: this.buildGroupReplyContext(undefined, senderAid, msgEncrypted, messageId),
+                context: this.buildGroupReplyContext(undefined, senderAid, msgEncrypted, messageId, msgChatmodeEcho),
                 receiveTs: Date.now(),
             });
             // 继续走正常 Agent 流程（下面的代码会 dispatch）
@@ -1159,9 +1169,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 finalText = parts.join('\n\n');
             }
         }
-        const peerInfo = await this.fetchPeerInfo(senderAid);
+        const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, selfAgentDir, this.client, false);
         const shortAid = this.getShortAid(senderAid);
-        const displayName = peerInfo.name || shortAid;
+        const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
         const payloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
         const textMentionSelf = this._aid ? this.hasExplicitMention(text, this._aid) : false;
@@ -1173,26 +1184,27 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             : mentionedSelf
                 ? (structMentionSelf ? 'mention.self(struct)' : 'mention.self(text)')
                 : `${dispatchMode}.no-mention`;
-        logger.info(`${this.logPrefix()} Group dispatch decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerInfo.type || 'unknown'} payloadType=${payloadType} dispatchMode=${dispatchMode} reason=${reason} structMentions=${JSON.stringify(payloadMentions)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
+        logger.info(`${this.logPrefix()} Group dispatch decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${payloadType} dispatchMode=${dispatchMode} reason=${reason} structMentions=${JSON.stringify(payloadMentions)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (payloadType === 'action_card_reply')
             return;
-        logger.info(`${this.logPrefix()} Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} text=${finalText.slice(0, 60)}`);
+        const msgChatmode = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
+        logger.info(`${this.logPrefix()} Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} chatmode=${msgChatmode ?? 'none'} text=${finalText.slice(0, 60)}`);
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: senderAid, msgId: messageId, kind: 'text', len: finalText.length, groupId });
-        this.aidStatsCollector?.recordInbound(this.config.aid, senderAid, Buffer.byteLength(finalText, 'utf-8'), finalText, payloadType === 'event');
+        this.aidStatsCollector?.recordInbound(this.config.aid, senderAid, Buffer.byteLength(finalText, 'utf-8'), finalText, payloadType === 'event', msgEncrypted, msgChatmode);
         this.dispatchMessage({
             channelId: groupId,
             groupId,
             userId: senderAid,
             peerName: displayName || undefined,
-            peerType: peerInfo.type || 'unknown',
+            peerType: peerIdentity.type,
             text: finalText,
             chatType: 'group',
             messageId,
             seq,
-            taskId,
+            threadId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted, messageId),
+            replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode),
         });
     }
     dispatchMessage(event) {
@@ -1242,8 +1254,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // Use caller-supplied replyContext (group path builds mentionUserIds);
         // fall back to simple threadId-only context for private messages
         let replyContext = event.replyContext;
-        if (!replyContext && event.taskId) {
-            replyContext = { threadId: event.taskId };
+        if (!replyContext && event.threadId) {
+            replyContext = { threadId: event.threadId };
         }
         this.messageHandler({
             channelId: event.channelId || '',
@@ -1256,7 +1268,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             peerName: event.peerName,
             peerType: event.peerType,
             messageId: event.messageId,
-            threadId: event.taskId,
+            threadId: event.threadId,
             mentions: mentionObjects,
             replyContext,
         }).catch(err => {
@@ -1624,9 +1636,6 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             await this.flushPendingEcho(channelId);
         }
         let finalText = text;
-        if (context?.title && (this.sentCount.get(channelId) || 0) > 0) {
-            finalText = '最终回复\n' + text;
-        }
         this.sentCount.set(channelId, (this.sentCount.get(channelId) || 0) + 1);
         if (this.isGroupId(channelId) && context?.peerId) {
             if (!finalText.includes(`@${context.peerId}`)) {
@@ -1700,6 +1709,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const channelId = entry.channelId;
         const finalText = entry.text;
         const context = entry.context;
+        // 从 context.metadata.source 读取 source，默认为 'daemon'
+        const source = context?.metadata?.source ?? 'daemon';
         const payload = { type: 'text', text: finalText };
         if (this.isGroupId(channelId)) {
             const extracted = this.extractMentionAidsFromText(finalText);
@@ -1713,7 +1724,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (context?.metadata?.chatmode)
             payload.chatmode = context.metadata.chatmode;
         // 诊断日志：记录 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'} textLen=${finalText.length}`);
+        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}`);
         const isGroup = this.isGroupId(channelId);
         const targetAid = channelId;
         const encryptTarget = isGroup ? channelId : targetAid;
@@ -1738,7 +1749,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 else {
                     logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${mid} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     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);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
+                    this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true, 'text', source);
                 }
             }
             else {
@@ -1750,7 +1762,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 else {
                     logger.info(`${this.logPrefix()} message.send ok: to=${this.peerLabel(targetAid)} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: targetAid, msgId: result.message_id, kind: 'text', len: finalText.length });
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
+                    this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false, 'text', source);
                 }
             }
             return true;
@@ -1792,6 +1805,34 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
     }
+    /** 出站消息写入 messages.jsonl（message.send/group.send/thought.put 成功后调用） */
+    appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text', source = 'daemon') {
+        try {
+            const sessionsDir = resolvePaths().sessionsDir;
+            const selfId = this.config.aid;
+            const chatDir = chatDirPath(sessionsDir, 'aun', channelId, selfId);
+            const chatmode = context?.metadata?.chatmode;
+            appendMessageLog(chatDir, buildOutboundEntry({
+                from: selfId,
+                to: channelId,
+                chatType: isGroup ? 'group' : 'private',
+                groupId: isGroup ? channelId : null,
+                msgId,
+                content: text,
+                replyTo: null,
+                agent: null,
+                model: null,
+                durationMs: null,
+                encrypt,
+                chatmode,
+                msgType,
+                source,
+            }));
+        }
+        catch (e) {
+            logger.debug(`${this.logPrefix()} appendOutboundJsonl failed: ${e}`);
+        }
+    }
     /**
      * 发送 thought 内容（Proactive 模式可观测）
      * 群聊：调用 group.thought.put
@@ -1818,17 +1859,45 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         try {
             const itemCount = Array.isArray(payload?.items) ? payload.items.length : 0;
             const stage = payload?.stage ?? `items=${itemCount}`;
+            // 提取 thought 文本（只对 kind=text 的 item 写 jsonl，过滤 tool_use/tool_result 等结构化项）
+            const items = payload?.items;
+            let thoughtText;
+            if (Array.isArray(items) && items.length > 0) {
+                const lastItem = items[items.length - 1];
+                // 优先 text 字段（kind=text 的 item），否则 content
+                if (lastItem?.kind === 'text' && lastItem.text) {
+                    thoughtText = lastItem.text;
+                }
+                else if (lastItem?.text) {
+                    thoughtText = lastItem.text;
+                }
+                else if (lastItem?.content) {
+                    thoughtText = lastItem.content;
+                }
+                else if (typeof lastItem === 'string') {
+                    thoughtText = lastItem;
+                }
+            }
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
                 const putRes = await this.callAndTrace('group.thought.put', params);
                 const tid = putRes?.thought_id;
                 logger.info(`${this.logPrefix()} thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
+                this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
+                // 文本类 thought 写入 jsonl（只对有 text 的 item，过滤 tool 等结构化项）
+                if (thoughtText) {
+                    this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, true, 'thought', 'daemon');
+                }
             }
             else {
                 params.to = targetId;
                 const putRes = await this.callAndTrace('message.thought.put', params);
                 const tid = putRes?.thought_id;
                 logger.info(`${this.logPrefix()} thought.put ok p2p=${this.peerLabel(targetId)} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
+                this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
+                if (thoughtText) {
+                    this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, false, 'thought', 'daemon');
+                }
             }
         }
         catch (e) {
@@ -2085,7 +2154,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // to avoid duplicate "已送达" at the sender CLI
         this.messageSeqMap.delete(messageId);
     }
-    sendProcessingStatus(channelId, status, sessionId, taskId, context) {
+    sendProcessingStatus(channelId, status, sessionId, taskId, context, extraMeta) {
         if (status === 'start')
             this.sentCount.delete(channelId); // 新任务开始，重置计数
         if (!this.client || !this.connected)
@@ -2098,6 +2167,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             error: 'error',
             timeout: 'timeout',
             queued: 'queued',
+            progress: 'progress',
         };
         const statusPayload = {
             type: 'status',
@@ -2105,6 +2175,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             task_id: taskId,
             session_id: sessionId,
             severity,
+            ...(extraMeta && Object.keys(extraMeta).length > 0 && { metadata: extraMeta }),
         };
         if (context?.threadId)
             statusPayload.thread_id = context.threadId;
@@ -2155,7 +2226,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const chatmode = context?.metadata?.chatmode ?? '?';
         const initiator = statusPayload.initiator ?? '';
         const refMsgId = statusPayload.ref_message_id ?? '';
-        logger.info(`${this.logPrefix()} task.${status} task=${taskId} session=${sessionId} chatmode=${chatmode} target=${targetLabel} initiator=${initiator} ref_msg=${refMsgId}`);
+        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}`);
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
@@ -2253,13 +2325,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     loadSelfName(aid) {
         try {
             const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
-            if (!fs.existsSync(agentMdPath)) {
+            const mdPath = agentMdPathFn(aidName);
+            if (!fs.existsSync(mdPath)) {
                 // 异步拉取，不阻塞连接流程
                 this.fetchAndCacheSelfName(aidName);
                 return undefined;
             }
-            const content = fs.readFileSync(agentMdPath, 'utf-8');
+            const content = fs.readFileSync(mdPath, 'utf-8');
             const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
             if (!fmMatch)
                 return undefined;
@@ -2370,6 +2442,7 @@ export class AUNChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name, // channelName 实际上就是 channelKey
                 capabilities: { file: true, image: true, interaction: true, markdown: true, thought: true, status: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -2414,13 +2487,14 @@ export class AUNChannelPlugin {
                                 await channel.sendThought(channelId, envelope.taskId, aunPayload, ctx);
                             }
                             else {
-                                await Promise.all([
-                                    channel.sendThought(channelId, envelope.taskId, aunPayload, ctx),
-                                    channel.sendStructured(channelId, aunPayload, ctx),
-                                ]);
+                                // interactive 模式不发 thought.put，只写入消息历史
+                                await channel.sendStructured(channelId, aunPayload, ctx);
                             }
                             return;
                         }
+                        case 'status.progress':
+                            channel.sendProcessingStatus(channelId, 'progress', envelope.taskId, envelope.taskId, ctx, payload.metadata);
+                            return;
                         case 'status.started':
                             channel.sendProcessingStatus(channelId, 'start', envelope.taskId, envelope.taskId, ctx);
                             return;

package/dist/channels/dingtalk.js

@@ -447,6 +447,7 @@ export class DingtalkChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -482,6 +483,7 @@ export class DingtalkChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default: