evolclaw 2.8.3 → 3.1.0

package/dist/core/message/message-bridge.js

@@ -1,5 +1,8 @@
+import { randomBytes } from 'crypto';
 import { logger } from '../../utils/logger.js';
 import { StreamDebouncer } from './stream-debouncer.js';
+import { appendMessageLog, buildInboundEntry } from './message-log.js';
+import { buildEnvelope } from './message-processor.js';
 /**
  * MessageBridge — Channel 与 Core 之间的消息桥梁
  *
@@ -8,7 +11,7 @@ import { StreamDebouncer } from './stream-debouncer.js';
  * 出站：命令响应通过 sendReply 回调直接发送到渠道
  */
 export class MessageBridge {
-    config;
+    defaultProjectPath;
     sessionManager;
     processor;
     messageQueue;
@@ -17,14 +20,14 @@ export class MessageBridge {
     debouncers = new Map();
     defaultDebounce;
     agentRegistry;
-    constructor(config, sessionManager, processor, messageQueue, cmdHandler, eventBus) {
-        this.config = config;
+    constructor(defaultProjectPath, sessionManager, processor, messageQueue, cmdHandler, eventBus, defaultDebounce) {
+        this.defaultProjectPath = defaultProjectPath;
         this.sessionManager = sessionManager;
         this.processor = processor;
         this.messageQueue = messageQueue;
         this.cmdHandler = cmdHandler;
         this.eventBus = eventBus;
-        this.defaultDebounce = config.debounce ?? 2;
+        this.defaultDebounce = defaultDebounce ?? 2;
     }
     /** Inject EvolAgentRegistry so owner lookups/writes route to agent.json for agent-owned channels. */
     setAgentRegistry(registry) {
@@ -33,19 +36,13 @@ export class MessageBridge {
     getDebouncer(channelName, channelType) {
         let d = this.debouncers.get(channelName);
         if (!d) {
+            // 从 owning agent 的 channel 配置取 debounce，找不到用全局默认
             let seconds = this.defaultDebounce;
-            // 查找渠道级 debounce 配置：先用 channelType（如 'feishu'）在 config.channels 里查
-            const type = channelType || channelName;
-            const raw = this.config.channels?.[type];
-            if (raw) {
-                if (Array.isArray(raw)) {
-                    const inst = raw.find((i) => (i.name || type) === channelName);
-                    if (inst?.debounce !== undefined)
-                        seconds = inst.debounce;
-                }
-                else if (raw.debounce !== undefined) {
-                    seconds = raw.debounce;
-                }
+            const agent = this.agentRegistry?.resolveByChannel(channelName);
+            if (agent) {
+                const merged = agent.config;
+                if (merged?.debounce !== undefined)
+                    seconds = merged.debounce;
             }
             d = new StreamDebouncer(seconds);
             this.debouncers.set(channelName, d);
@@ -66,6 +63,8 @@ export class MessageBridge {
         onMessage(async (msg) => {
             try {
                 let content = msg.content.trim();
+                // 渠道入站日志
+                logger.channelIn({ channel: channelName, channelId: msg.channelId, peerId: msg.peerId, peerName: msg.peerName, chatType: msg.chatType, msgId: msg.messageId, threadId: msg.threadId, content, images: msg.images?.length ?? 0, mentions: msg.mentions, replyContext: msg.replyContext });
                 // 0. 自定义消息快速路径（menu.query 等）
                 if (await this.handleCustomPayload(content, channelName, msg, sendReply, adapter))
                     return;
@@ -78,7 +77,10 @@ export class MessageBridge {
                 if (this.cmdHandler.isCommand(cmdContent)) {
                     logger.debug(`[MessageBridge] Command detected: "${cmdContent}", routing to handler`);
                 }
-                if (await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => sendReply(msg.channelId, text, msg.replyContext), msg.peerId, msg.threadId))
+                if (await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
+                    logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId: `cmd-${msg.messageId || Date.now()}`, payload: { kind: 'command.result', text } });
+                    return sendReply(msg.channelId, text, msg.replyContext);
+                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext))
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
@@ -93,13 +95,21 @@ export class MessageBridge {
                     if (msg.peerName)
                         metadata.peerName = msg.peerName;
                 }
-                // Resolve effective project path: agent's projectPath when channel is agent-owned,
-                // otherwise fall back to global config.projects.defaultPath
+                if (chatType === 'group') {
+                    // 群聊：peerId 是当前消息发送者；groupId 在 channel 提供时存到 metadata
+                    if (msg.peerId)
+                        metadata.peerId = msg.peerId;
+                    if (msg.peerName)
+                        metadata.peerName = msg.peerName;
+                    if (msg.groupId)
+                        metadata.groupId = msg.groupId;
+                }
+                // Resolve effective project path: 用通道所属 agent 的 projectPath；
+                // 通道找不到归属时退回到 globalConfig（一般是测试场景）
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelName);
-                const effectiveProjectPath = (owningAgent && !owningAgent.isDefault)
-                    ? owningAgent.projectPath
-                    : (this.config.projects?.defaultPath || process.cwd());
-                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType);
+                const effectiveProjectPath = owningAgent?.projectPath
+                    ?? this.defaultProjectPath;
+                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType, undefined, msg.selfId, msg.channelType || effectiveChannelType, msg.peerType);
                 // 4. 消息前缀（由 policy 决定）
                 const channelInfo = this.processor.getChannelInfo?.(channelName);
                 if (channelInfo?.policy) {
@@ -109,7 +119,10 @@ export class MessageBridge {
                 }
                 // 5. 构造完整消息（channel 字段存实例名，用于 session 精确匹配）
                 const fullMessage = {
-                    channel: channelName, channelId: msg.channelId, content,
+                    channel: channelName,
+                    channelType: msg.channelType || effectiveChannelType,
+                    channelId: msg.channelId, content,
+                    selfId: msg.selfId,
                     chatType,
                     images: msg.images, timestamp: Date.now(),
                     peerId: msg.peerId, peerName: msg.peerName,
@@ -118,6 +131,19 @@ export class MessageBridge {
                     mentions: msg.mentions, threadId: msg.threadId,
                     replyContext: msg.replyContext,
                 };
+                // 5.5 写入消息记录（入方向）
+                const chatDir = this.sessionManager.getChatDir(session);
+                appendMessageLog(chatDir, buildInboundEntry({
+                    from: msg.peerId || 'unknown',
+                    to: msg.selfId || 'self',
+                    chatType,
+                    groupId: msg.groupId ?? null,
+                    msgId: msg.messageId ?? null,
+                    content,
+                    replyTo: msg.replyContext?.replyToMessageId ?? null,
+                    permMode: session.identity?.role ?? null,
+                    timestamp: fullMessage.timestamp,
+                }));
                 // 6. ACK + debounce/enqueue
                 //    ACK 在到达时立即做（每条独立 ACK），不等合并
                 //    Interrupt 模式（单聊）→ 入队前 debounce 合并
@@ -125,7 +151,7 @@ export class MessageBridge {
                 if (fullMessage.messageId)
                     adapter?.acknowledge?.(fullMessage.messageId).catch(() => { });
                 const isInterrupt = chatType !== 'group';
-                const enqueueAgentName = (owningAgent && !owningAgent.isDefault) ? owningAgent.name : '[default]';
+                const enqueueAgentName = owningAgent?.name ?? '<unknown>';
                 const doEnqueue = async (m) => {
                     return this.messageQueue.enqueue(session.id, m, session.projectPath, {
                         interruptible: isInterrupt,
@@ -169,71 +195,98 @@ export class MessageBridge {
                 const result = await this.cmdHandler.execMenu(parsed.cmd, parsed.mode, channel, msg.channelId, msg.peerId);
                 const base = { type: 'menu.response', cmd: parsed.cmd };
                 const response = JSON.stringify('error' in result ? { ...base, error: result.error } : { ...base, data: result.data });
-                if (adapter?.sendCustomPayload) {
-                    adapter.sendCustomPayload(msg.channelId, response);
-                }
-                else {
-                    await sendReply(msg.channelId, response);
-                }
+                await this.sendCustomResponse(adapter, channel, msg.channelId, response, sendReply);
             }
             else if (parsed.cmd) {
                 // 动态子菜单查询
                 const items = await this.cmdHandler.getSubMenuItems(parsed.cmd, channel, msg.channelId, msg.peerId);
                 const response = JSON.stringify({ type: 'menu.response', cmd: parsed.cmd, items: items ?? [] });
-                if (adapter?.sendCustomPayload) {
-                    adapter.sendCustomPayload(msg.channelId, response);
-                }
-                else {
-                    await sendReply(msg.channelId, response);
-                }
+                await this.sendCustomResponse(adapter, channel, msg.channelId, response, sendReply);
             }
             else {
                 // 全量菜单
                 const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
                 const items = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
                 const response = JSON.stringify({ type: 'menu.response', items });
-                if (adapter?.sendCustomPayload) {
-                    adapter.sendCustomPayload(msg.channelId, response);
-                }
-                else {
-                    await sendReply(msg.channelId, response);
-                }
+                await this.sendCustomResponse(adapter, channel, msg.channelId, response, sendReply);
             }
             return true;
         }
         return false;
     }
-    /** 首次交互自动绑定 owner */
+    /** menu.query 响应：优先走 adapter.send(custom)，降级 sendReply */
+    async sendCustomResponse(adapter, channel, channelId, response, sendReply) {
+        if (adapter?.send) {
+            const agentName = this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>';
+            const envelope = buildEnvelope({
+                taskId: `menu-${randomBytes(4).toString('hex')}`,
+                channel,
+                channelId,
+                agentName,
+            });
+            await adapter.send(envelope, { kind: 'custom', channelType: channel, payload: response });
+        }
+        else {
+            await sendReply(channelId, response);
+        }
+    }
+    /** 首次交互自动绑定 owner —— 通过 channel-routed self-agent 完成 */
     async autoBindOwner(channel, userId) {
-        // Registry-first: route owner queries/writes to the agent that owns this channel.
-        // Falls back to evolclaw.json for default-agent channels.
-        const { getOwner, setOwner } = await import('../../config.js');
-        const currentOwner = this.agentRegistry?.getOwner?.(channel) ?? getOwner(this.config, channel);
-        // currentOwner === undefined means either no owner set, or instance not found
-        // In both cases, try to set — setOwner is a no-op for unknown instances
+        const currentOwner = this.agentRegistry?.getOwner?.(channel);
         if (currentOwner === undefined) {
             if (this.agentRegistry?.setChannelOwner) {
                 this.agentRegistry.setChannelOwner(channel, userId);
             }
             else {
-                setOwner(this.config, channel, userId);
+                logger.warn(`[Owner] no agentRegistry; skip auto-bind for ${channel}`);
+                return;
             }
             logger.info(`[Owner] Auto-bound ${channel} owner: ${userId}`);
             this.eventBus.publish({ type: 'channel:owner-bound', channel, userId });
         }
     }
     /** 命令快速路径：返回 true 表示已处理 */
-    async handleCommand(content, channel, channelId, sendReply, userId, threadId) {
+    async handleCommand(content, channel, channelId, sendReply, userId, threadId, chatType, source, replyContext) {
         if (!this.cmdHandler.isCommand(content))
             return false;
-        logger.info(`[${channel}] ${channelId}: ${content}`);
-        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId);
-        logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}, value=${cmdResult === null ? 'null' : cmdResult === undefined ? 'undefined' : 'string'}`);
+        logger.info(`[${channel}] ${channelId}: ${content}${source === 'card-trigger' ? ' [card]' : ''}`);
+        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source);
+        logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}`);
         if (cmdResult === undefined)
             return false;
         if (cmdResult) {
+            // 规范化为 OutboundPayload：string → command.result 包装；object → 透传
+            let payload;
+            if (typeof cmdResult === 'string') {
+                payload = { kind: 'command.result', text: cmdResult };
+            }
+            else if (typeof cmdResult === 'object' && cmdResult !== null && 'kind' in cmdResult) {
+                payload = cmdResult;
+            }
+            else {
+                // 不识别的返回值，按已处理但无回显处理
+                return true;
+            }
+            // 出站走 adapter.send 统一入口
+            const adapter = this.processor.getChannelInfo?.(channel)?.adapter;
+            const envelope = buildEnvelope({
+                taskId: `cmd-${randomBytes(5).toString('hex')}`,
+                channel,
+                channelId,
+                agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
+                chatmode: 'interactive',
+                replyContext,
+            });
             try {
-                await sendReply(cmdResult);
+                if (adapter?.send) {
+                    await adapter.send(envelope, payload);
+                }
+                else {
+                    // 降级路径：渠道未实现 send 时回退到原有 sendReply（仅文本）
+                    const fallbackText = ('text' in payload && typeof payload.text === 'string') ? payload.text : '';
+                    if (fallbackText)
+                        await sendReply(fallbackText);
+                }
             }
             catch (error) {
                 logger.error(`[${channel}] Failed to send command response:`, error);

package/dist/core/message/message-log.js

@@ -0,0 +1,93 @@
+import path from 'path';
+import { appendJsonl, chatDirPath } from '../session/session-fs-store.js';
+import { logger } from '../../utils/logger.js';
+const MESSAGE_LOG_FILE = 'messages.jsonl';
+// 入方向去重：最近 msgId 缓存（LRU 风格，最多 200 条）
+const recentMsgIds = new Set();
+const DEDUP_MAX = 200;
+function isDuplicate(msgId) {
+    if (!msgId)
+        return false;
+    if (recentMsgIds.has(msgId))
+        return true;
+    if (recentMsgIds.size >= DEDUP_MAX) {
+        const first = recentMsgIds.values().next().value;
+        recentMsgIds.delete(first);
+    }
+    recentMsgIds.add(msgId);
+    return false;
+}
+function formatTimestampMs(epochMs) {
+    const d = new Date(epochMs);
+    const yyyy = d.getFullYear();
+    const mo = String(d.getMonth() + 1).padStart(2, '0');
+    const dd = String(d.getDate()).padStart(2, '0');
+    const hh = String(d.getHours()).padStart(2, '0');
+    const mi = String(d.getMinutes()).padStart(2, '0');
+    const ss = String(d.getSeconds()).padStart(2, '0');
+    const ms = String(d.getMilliseconds()).padStart(3, '0');
+    return `${yyyy}-${mo}-${dd} ${hh}:${mi}:${ss}.${ms}`;
+}
+export function messageLogPath(chatDir) {
+    return path.join(chatDir, MESSAGE_LOG_FILE);
+}
+export function resolveChatDir(sessionsDir, channelType, channelId, selfId) {
+    return chatDirPath(sessionsDir, channelType, channelId, selfId);
+}
+export function appendMessageLog(chatDir, entry) {
+    if (entry.dir === 'in' && isDuplicate(entry.msgId)) {
+        logger.debug(`[MessageLog] Duplicate msgId skipped: ${entry.msgId}`);
+        return;
+    }
+    try {
+        appendJsonl(messageLogPath(chatDir), entry);
+    }
+    catch (e) {
+        logger.warn(`[MessageLog] Failed to write message log: ${e}`);
+    }
+}
+export function buildInboundEntry(opts) {
+    const ts = opts.timestamp || Date.now();
+    const isCommand = opts.content.startsWith('/');
+    return {
+        ts,
+        time: formatTimestampMs(ts),
+        dir: 'in',
+        from: opts.from,
+        to: opts.to,
+        chatType: opts.chatType,
+        groupId: opts.groupId ?? null,
+        msgId: opts.msgId ?? null,
+        msgType: isCommand ? 'command' : 'text',
+        content: opts.content,
+        replyTo: opts.replyTo ?? null,
+        agent: null,
+        model: null,
+        permMode: opts.permMode ?? null,
+        cmdParsed: isCommand ? opts.content.split(/\s/)[0] : null,
+        durationMs: null,
+    };
+}
+export function buildOutboundEntry(opts) {
+    const ts = opts.timestamp || Date.now();
+    return {
+        ts,
+        time: formatTimestampMs(ts),
+        dir: 'out',
+        from: opts.from,
+        to: opts.to,
+        chatType: opts.chatType,
+        groupId: opts.groupId ?? null,
+        msgId: opts.msgId ?? null,
+        msgType: 'text',
+        content: opts.content,
+        replyTo: opts.replyTo ?? null,
+        agent: opts.agent ?? null,
+        model: opts.model ?? null,
+        permMode: null,
+        cmdParsed: null,
+        durationMs: opts.durationMs ?? null,
+        numTurns: opts.numTurns ?? null,
+        usage: opts.usage ?? null,
+    };
+}