evolclaw 3.1.11 → 3.3.0

package/dist/core/message/items-formatter.js

@@ -34,7 +34,7 @@ function formatItem(item) {
         case 'tool_result': {
             if (!item.ok) {
                 const errMsg = item.error || (typeof item.result === 'string' ? item.result : '执行失败');
-                return `⚠️ ${item.name}: ${errMsg}`;
+                return `⚠️ ${item.name}: ${capLines(errMsg, 5)}`;
             }
             return item.text ? `✓ ${item.name}: ${item.text}` : `✓ ${item.name}`;
         }
@@ -48,6 +48,14 @@ function formatItem(item) {
             return '';
     }
 }
+/** 把多行文本截断到最多 maxLines 行，超出部分用省略提示替代。用于工具报错输出，避免刷屏。 */
+function capLines(text, maxLines) {
+    const lines = text.split('\n');
+    if (lines.length <= maxLines)
+        return text;
+    const omitted = lines.length - maxLines;
+    return lines.slice(0, maxLines).join('\n') + `\n…(省略 ${omitted} 行)`;
+}
 function summarizeArgs(args) {
     if (!args || typeof args !== 'object')
         return '';

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

@@ -109,6 +109,10 @@ export class MessageBridge {
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
+                if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
+                    await sendReply(msg.channelId, '群聊中无权限创建话题', msg.replyContext);
+                    return;
+                }
                 const metadata = {};
                 // 话题会话创建时写入 replyContext（用于 threadId 路由）；主会话不写（避免群聊覆盖）
                 if (msg.threadId && msg.replyContext)
@@ -134,7 +138,7 @@ export class MessageBridge {
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelName);
                 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.selfAID, msg.channelType || effectiveChannelType, msg.peerType);
+                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, this.extractTopicName(msg), msg.peerId, chatType, undefined, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType);
                 // 4. 群聊发送者标注由消息渲染层（message-renderer）逐条承担，不再在此硬编码前缀，
                 //    消息日志因此保存干净原文。policy.messagePrefix 暂保留（未来清理）。
                 // 5. 构造完整消息（channel 字段存实例名，用于 session 精确匹配）
@@ -143,6 +147,7 @@ export class MessageBridge {
                     channelType: msg.channelType || effectiveChannelType,
                     channelId: msg.channelId, content,
                     selfAID: msg.selfAID,
+                    agentId: session.agentId,
                     chatType,
                     images: msg.images, timestamp: Date.now(),
                     peerId: msg.peerId, peerName: msg.peerName,
@@ -151,26 +156,31 @@ export class MessageBridge {
                     sameNetwork: msg.sameNetwork,
                     sameEgressIp: msg.sameEgressIp,
                     messageId: msg.messageId,
-                    mentions: msg.mentions, threadId: msg.threadId,
+                    mentions: msg.mentions, mentionAids: msg.mentionAids, threadId: msg.threadId,
+                    topicName: this.extractTopicName(msg),
                     replyContext: msg.replyContext,
+                    source: msg.source,
+                    dispatchMode: msg.dispatchMode,
                 };
-                // 5.5 写入消息记录（入方向）
-                const chatDir = this.sessionManager.getChatDir(session);
-                const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
-                const inboundChatmode = msg.replyContext?.metadata?.chatmode;
-                appendMessageLog(chatDir, buildInboundEntry({
-                    from: msg.peerId || 'unknown',
-                    to: msg.selfAID || 'self',
-                    chatType,
-                    groupId: msg.groupId ?? null,
-                    msgId: msg.messageId ?? null,
-                    content,
-                    replyTo: msg.replyContext?.replyToMessageId ?? null,
-                    permMode: session.identity?.role ?? null,
-                    timestamp: fullMessage.timestamp,
-                    encrypt: inboundEncrypt,
-                    chatmode: inboundChatmode,
-                }));
+                // 5.5 写入消息记录（入方向）。
+                {
+                    const chatDir = this.sessionManager.getChatDir(session);
+                    const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
+                    const inboundChatmode = msg.replyContext?.metadata?.chatmode;
+                    appendMessageLog(chatDir, buildInboundEntry({
+                        from: msg.peerId || 'unknown',
+                        to: msg.selfAID || 'self',
+                        chatType,
+                        groupId: msg.groupId ?? null,
+                        msgId: msg.messageId ?? null,
+                        content,
+                        replyTo: msg.replyContext?.replyToMessageId ?? null,
+                        permMode: session.identity?.role ?? null,
+                        timestamp: fullMessage.timestamp,
+                        encrypt: inboundEncrypt,
+                        chatmode: inboundChatmode,
+                    }));
+                }
                 // 6. ACK + debounce/enqueue
                 //    ACK 在到达时立即做（每条独立 ACK），不等合并
                 //    Interrupt 模式（单聊）→ 入队前 debounce 合并
@@ -209,6 +219,7 @@ export class MessageBridge {
     static MENU_NAME_MAP = {
         pwd: '/pwd',
         session: '/session',
+        topic: '/topic',
         baseagent: '/baseagent',
         model: '/model',
         effort: '/effort',
@@ -218,7 +229,26 @@ export class MessageBridge {
         activity: '/activity',
         system: '/system',
         cli: '/cli',
+        agent: '/agent',
+        trigger: '/trigger',
     };
+    extractTopicName(msg) {
+        const raw = msg.topicName
+            ?? msg.replyContext?.title
+            ?? msg.replyContext?.metadata?.topicName
+            ?? msg.replyContext?.metadata?.title;
+        const name = typeof raw === 'string' ? raw.trim() : '';
+        return name || undefined;
+    }
+    async canCreateThreadSession(channel, msg, chatType) {
+        if (chatType !== 'group' || !msg.threadId)
+            return true;
+        const existing = await this.sessionManager.getThreadSession(channel, msg.channelId, msg.threadId);
+        if (existing)
+            return true;
+        const role = this.sessionManager.resolveIdentity(channel, msg.peerId).role;
+        return role === 'owner' || role === 'admin';
+    }
     resolveCmd(name, cmd) {
         if (cmd)
             return cmd;
@@ -276,7 +306,7 @@ export class MessageBridge {
         const { id, name, cmd } = req;
         try {
             const resolvedCmd = this.resolveCmd(name, cmd);
-            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId);
+            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, msg.chatType);
             if ('error' in result)
                 throw { code: result.code || 'EXEC_FAILED', message: result.error };
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data: result.data }, sendReply);
@@ -292,7 +322,7 @@ export class MessageBridge {
         const { id, name, cmd } = req;
         try {
             const resolvedCmd = this.resolveCmd(name, cmd);
-            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId) ?? [];
+            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, undefined, msg.chatType) ?? [];
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data }, sendReply);
         }
         catch (err) {
@@ -326,7 +356,7 @@ export class MessageBridge {
             if (!action)
                 throw { code: 'MISSING_VALUE', message: '缺少 action 参数' };
             const resolvedCmd = this.resolveCmd(name, cmd);
-            const result = await this.cmdHandler.execMenuAction(resolvedCmd, action, args, channel, msg.channelId, msg.peerId);
+            const result = await this.cmdHandler.execMenuAction(resolvedCmd, action, args, channel, msg.channelId, msg.peerId, undefined, msg.chatType);
             if ('error' in result)
                 throw { code: result.code || 'EXEC_FAILED', message: result.error };
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data: result.data }, sendReply);

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

@@ -68,6 +68,7 @@ export function buildInboundEntry(opts) {
         durationMs: null,
         encrypt: opts.encrypt,
         chatmode: opts.chatmode,
+        source: opts.source,
     };
 }
 export function buildOutboundEntry(opts) {