evolclaw 3.2.0 → 3.4.0

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

@@ -109,6 +109,14 @@ export class MessageBridge {
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
+                if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
+                    // 静默丢弃：绝不向群里注入回复。
+                    // 拒绝消息本身会带原 thread_id（AUN replyContext 透传），变成一条新群消息；
+                    // 若发送者也是 agent，该拒绝消息又会 @ 回对方 → A 拒绝→B 收到→B 拒绝→A 收到 的无限循环。
+                    // AUN 自主模式下「不响应」是合法的，因此无权限创建话题时只记日志、直接 return。
+                    logger.info(`[MessageBridge] Thread creation denied (silent drop): channel=${channelName} channelId=${msg.channelId} thread=${msg.threadId} sender=${msg.peerId}`);
+                    return;
+                }
                 const metadata = {};
                 // 话题会话创建时写入 replyContext（用于 threadId 路由）；主会话不写（避免群聊覆盖）
                 if (msg.threadId && msg.replyContext)
@@ -134,7 +142,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 +151,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,
@@ -152,25 +161,30 @@ export class MessageBridge {
                     sameEgressIp: msg.sameEgressIp,
                     messageId: msg.messageId,
                     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 +223,7 @@ export class MessageBridge {
     static MENU_NAME_MAP = {
         pwd: '/pwd',
         session: '/session',
+        topic: '/topic',
         baseagent: '/baseagent',
         model: '/model',
         effort: '/effort',
@@ -220,7 +235,33 @@ export class MessageBridge {
         cli: '/cli',
         agent: '/agent',
         trigger: '/trigger',
+        file: '/file',
     };
+    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;
+        // 群话题创建权限只看「发送者在该群里的角色」（AUN 经 group.get_admins 实时查询，权威源）。
+        // 仅群 owner/admin 可建话题；member / 非成员 / 查询失败（undefined）一律 fail-closed 拒绝。
+        // 这与 bot 的 owner/admin 无关——不引入 resolveIdentity 兜底。
+        // 不暴露群角色的渠道（adapter 无 getGroupMemberRole）不受此守卫约束，放行。
+        const adapter = this.processor?.getChannelInfo?.(channel)?.adapter;
+        if (adapter?.getGroupMemberRole) {
+            const groupRole = await adapter.getGroupMemberRole(msg.channelId, msg.peerId);
+            return groupRole === 'owner' || groupRole === 'admin';
+        }
+        return true;
+    }
     resolveCmd(name, cmd) {
         if (cmd)
             return cmd;
@@ -264,7 +305,7 @@ export class MessageBridge {
         const { id } = req;
         try {
             const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
-            const data = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
+            const data = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private', msg.isControlChannel ? 'control' : 'agent');
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, data }, sendReply);
         }
         catch (err) {
@@ -278,7 +319,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, req.args);
+            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, msg.chatType, msg.isControlChannel ?? false);
             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);
@@ -294,7 +335,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, req.args) ?? [];
+            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, undefined, msg.chatType, msg.isControlChannel ?? false) ?? [];
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data }, sendReply);
         }
         catch (err) {
@@ -305,12 +346,12 @@ export class MessageBridge {
         }
     }
     async handleMenuUpdate(req, channel, msg, adapter, sendReply) {
-        const { id, name, cmd, value } = req;
+        const { id, name, cmd, value, args } = req;
         try {
             if (!value)
                 throw { code: 'MISSING_VALUE', message: '缺少 value 参数' };
             const resolvedCmd = this.resolveCmd(name, cmd);
-            const result = await this.cmdHandler.execMenuUpdate(resolvedCmd, value, channel, msg.channelId, msg.peerId);
+            const result = await this.cmdHandler.execMenuUpdate(resolvedCmd, value, channel, msg.channelId, msg.peerId, undefined, msg.isControlChannel ?? false, args);
             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);
@@ -328,7 +369,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, id, msg.isControlChannel ?? false);
             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);
@@ -445,4 +486,12 @@ export class MessageBridge {
             d.dispose();
         this.debouncers.clear();
     }
+    /** 注销单个渠道的 debouncer（热重载断开渠道时调用） */
+    removeChannel(channelName) {
+        const d = this.debouncers.get(channelName);
+        if (d) {
+            d.dispose();
+            this.debouncers.delete(channelName);
+        }
+    }
 }

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) {