evolclaw 3.0.0 → 3.1.1

package/dist/channels/dingtalk.js

@@ -467,7 +467,8 @@ export class DingtalkChannelPlugin {
                             await channel.sendImage(channelId, payload.data);
                             return;
                         case 'activity.batch': {
-                            const text = formatItemsAsText(payload.items);
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
                             if (text)
                                 await channel.sendMessage(channelId, text);
                             return;
@@ -481,6 +482,7 @@ export class DingtalkChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default:

package/dist/channels/feishu.js

@@ -82,8 +82,6 @@ export class FeishuChannel {
                     if (msg.thread_id) {
                         logger.info('[Feishu] Thread message, thread_id:', msg.thread_id, 'root_id:', msg.root_id);
                     }
-                    // [DEBUG] 临时：记录所有消息的 root_id/thread_id，用于排查图片回复带引用问题
-                    logger.info('[Feishu][DEBUG] msg_type:', msg.message_type, 'root_id:', msg.root_id ?? '(empty)', 'thread_id:', msg.thread_id ?? '(empty)', 'parent_id:', msg.parent_id ?? '(empty)');
                     // 提取 @ 提及列表（排除机器人自身）
                     const mentions = (msg.mentions || []).map((m) => ({
                         userId: m.id?.open_id || '',
@@ -181,6 +179,16 @@ export class FeishuChannel {
                                         quotedText = `> 以下是引用的原消息\n> ================\n> [文件消息]\n> ================\n\n`;
                                     }
                                 }
+                                else if (quotedMsgType === 'merge_forward') {
+                                    const { text: mergedText, images: mergedImages } = await this.extractMergeForwardContent(msg.parent_id, msg.chat_id);
+                                    if (mergedText) {
+                                        quotedText = `> 以下是引用的原消息\n> ================\n> [合并转发消息]\n> ================\n\n${mergedText}\n\n`;
+                                        quotedImages.push(...mergedImages);
+                                    }
+                                    else {
+                                        quotedText = `> 以下是引用的原消息\n> ================\n> [合并转发消息]\n> ================\n\n`;
+                                    }
+                                }
                                 else {
                                     quotedText = `> 以下是引用的原消息\n> ================\n> [${quotedMsgType}消息]\n> ================\n\n`;
                                 }
@@ -189,6 +197,7 @@ export class FeishuChannel {
                                 logger.warn({ err }, '[Feishu] Failed to fetch quoted message');
                             }
                         }
+                        logger.info(`[Feishu] Incoming message_type=${msg.message_type} content=${msg.content?.substring(0, 200)}`);
                         // 处理文本消息
                         if (msg.message_type === 'text') {
                             const parsed = JSON.parse(msg.content);
@@ -210,7 +219,7 @@ export class FeishuChannel {
                             const imageData = await this.downloadAndSaveImage(imageKey, msg.chat_id, msg.message_id, projectPath);
                             if (imageData) {
                                 const allImages = [...quotedImages, imageData];
-                                const prompt = quotedText + '用户发送了一张图片，请分析这张图片的内容。';
+                                const prompt = quotedText + '用户发送了一张图片，请结合上下文理解用户意图并回应。';
                                 await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: allImages, peerId, peerName, messageId: msg.message_id, threadId, rootId, chatType });
                             }
                             else {
@@ -269,6 +278,19 @@ export class FeishuChannel {
                             const allImages = [...quotedImages, ...postImages];
                             await this.messageHandler({ channelId: msg.chat_id, content: finalContent, images: allImages.length > 0 ? allImages : undefined, peerId, peerName, messageId: msg.message_id, threadId, rootId, chatType });
                         }
+                        // 处理合并转发消息
+                        else if (msg.message_type === 'merge_forward') {
+                            const { text: mergedText, images: mergedImages } = await this.extractMergeForwardContent(msg.message_id, msg.chat_id);
+                            if (mergedText) {
+                                const finalContent = quotedText + mergedText;
+                                const allImages = [...quotedImages, ...mergedImages];
+                                await this.messageHandler({ channelId: msg.chat_id, content: finalContent, images: allImages.length > 0 ? allImages : undefined, peerId, peerName, messageId: msg.message_id, threadId, rootId, chatType });
+                            }
+                            else {
+                                const prompt = quotedText + '[合并转发消息解析失败]';
+                                await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: quotedImages.length > 0 ? quotedImages : undefined, peerId, peerName, messageId: msg.message_id, threadId, rootId, chatType });
+                            }
+                        }
                         // 处理其他类型消息
                         else {
                             logger.debug('[Feishu] Unsupported message type:', msg.message_type);
@@ -551,7 +573,14 @@ export class FeishuChannel {
                 const truncated = content.slice(0, 28000) + '\n\n⚠️ 消息过长，已截断';
                 return this.sendMessage(chatId, truncated, options);
             }
-            logger.error('[Feishu] Failed to send message:', error);
+            const respData = error?.response?.data;
+            const code = respData?.code;
+            logger.error('[Feishu] Failed to send message:', respData ? JSON.stringify(respData) : error?.message ?? error);
+            // post 格式相关错误（400/230001）：降级为纯文本重试
+            if (!options?.forceText && (error?.response?.status === 400 || code === 230001)) {
+                logger.warn('[Feishu] Retrying as plain text (forceText)');
+                return this.sendMessage(chatId, content, { ...options, forceText: true });
+            }
             throw error;
         }
     }
@@ -802,6 +831,94 @@ export class FeishuChannel {
             return null;
         }
     }
+    /**
+     * 提取合并转发消息的子消息内容。
+     * 调用 im.message.get 获取子消息列表，逐条解析 text/image/post/file 类型。
+     */
+    async extractMergeForwardContent(messageId, chatId) {
+        const empty = { text: '', images: [] };
+        if (!this.client)
+            return empty;
+        try {
+            const res = await this.client.im.message.get({
+                path: { message_id: messageId }
+            });
+            const items = res.data?.items;
+            if (!items || items.length === 0) {
+                logger.warn('[Feishu] merge_forward: no sub-messages found');
+                return empty;
+            }
+            logger.info(`[Feishu] merge_forward: ${items.length} sub-messages`);
+            const projectPath = this.projectPathProvider
+                ? await this.projectPathProvider(chatId)
+                : process.cwd();
+            const textParts = [];
+            const images = [];
+            const MAX_IMAGES = 10;
+            textParts.push('以下是用户转发的合并消息：\n---');
+            for (const item of items) {
+                const msgType = item.msg_type;
+                const content = item.body?.content;
+                if (!content)
+                    continue;
+                try {
+                    if (msgType === 'text') {
+                        const parsed = JSON.parse(content);
+                        textParts.push(parsed.text || '');
+                    }
+                    else if (msgType === 'post') {
+                        const parsed = JSON.parse(content);
+                        let text = '';
+                        const postContent = parsed.zh_cn?.content || parsed.en_us?.content || parsed.content;
+                        if (postContent) {
+                            for (const line of postContent) {
+                                for (const elem of line) {
+                                    if (elem.tag === 'img' && elem.image_key && item.message_id && images.length < MAX_IMAGES) {
+                                        const imageData = await this.downloadAndSaveImage(elem.image_key, chatId, item.message_id, projectPath);
+                                        if (imageData)
+                                            images.push(imageData);
+                                    }
+                                    else if (elem.text) {
+                                        text += elem.text;
+                                    }
+                                }
+                                text += '\n';
+                            }
+                        }
+                        const title = parsed.zh_cn?.title || parsed.en_us?.title || parsed.title;
+                        textParts.push(title ? `${title}\n${text.trim()}` : text.trim());
+                    }
+                    else if (msgType === 'image' && item.message_id) {
+                        const parsed = JSON.parse(content);
+                        if (parsed.image_key && images.length < MAX_IMAGES) {
+                            const imageData = await this.downloadAndSaveImage(parsed.image_key, chatId, item.message_id, projectPath);
+                            if (imageData) {
+                                images.push(imageData);
+                                textParts.push('[图片]');
+                            }
+                        }
+                    }
+                    else if (msgType === 'file') {
+                        const parsed = JSON.parse(content);
+                        textParts.push(`[文件: ${parsed.file_name || 'unknown'}]`);
+                    }
+                    else {
+                        textParts.push(`[${msgType}]`);
+                    }
+                }
+                catch (parseErr) {
+                    logger.debug('[Feishu] merge_forward: failed to parse sub-message:', parseErr);
+                    textParts.push(`[${msgType}: 解析失败]`);
+                }
+            }
+            textParts.push('---');
+            return { text: textParts.join('\n'), images };
+        }
+        catch (error) {
+            logger.error('[Feishu] Failed to extract merge_forward content:', error);
+            return empty;
+        }
+    }
     async downloadFile(fileKey, fileName, messageId, projectPath) {
         if (!this.client)
             return null;
@@ -1223,7 +1340,7 @@ export class FeishuChannelPlugin {
                         case 'result.error': {
                             const sendCtx = { ...(ctx ?? {}) };
                             if (payload.kind === 'result.text' && payload.isFinal)
-                                sendCtx.title = '✓ 最终回复:';
+                                sendCtx.title = '✅ 最终回复:';
                             await channel.sendMessage(channelId, payload.text, sendCtx);
                             return;
                         }
@@ -1234,9 +1351,12 @@ export class FeishuChannelPlugin {
                             await channel.sendImage(channelId, payload.data, ctx);
                             return;
                         case 'activity.batch': {
-                            const text = formatItemsAsText(payload.items);
-                            if (text)
+                            // Feishu 不发送成功的 tool_result（信息密度低，刷屏）
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
+                            if (text) {
                                 await channel.sendMessage(channelId, text, ctx);
+                            }
                             return;
                         }
                         case 'status.started':
@@ -1244,6 +1364,7 @@ export class FeishuChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                             // Feishu 通过 acknowledge (✓ 表情) 表达状态，由 channel 自行处理
                             return;
                         case 'interaction':

package/dist/channels/qqbot.js

@@ -354,7 +354,8 @@ export class QQBotChannelPlugin {
                             await channel.sendImage(channelId, payload.data);
                             return;
                         case 'activity.batch': {
-                            const text = formatItemsAsText(payload.items);
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
                             if (text)
                                 await channel.sendMessage(channelId, text);
                             return;
@@ -368,6 +369,7 @@ export class QQBotChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default:

package/dist/channels/wechat.js

@@ -750,7 +750,9 @@ export class WechatChannelPlugin {
                         case 'result.image':
                             return;
                         case 'activity.batch': {
-                            const text = formatItemsAsText(payload.items);
+                            // WeChat 不发送成功的 tool_result
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
                             if (text)
                                 await channel.sendMessage(channelId, text);
                             return;
@@ -764,6 +766,7 @@ export class WechatChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default:

package/dist/channels/wecom.js

@@ -510,7 +510,8 @@ export class WecomChannelPlugin {
                             await channel.sendImage(channelId, payload.data);
                             return;
                         case 'activity.batch': {
-                            const text = formatItemsAsText(payload.items);
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
                             if (text)
                                 await channel.sendMessage(channelId, text);
                             return;
@@ -524,6 +525,7 @@ export class WecomChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default: