evolclaw 2.8.3 → 3.1.0

package/dist/channels/qqbot.js

@@ -1,7 +1,8 @@
 import { logger } from '../utils/logger.js';
 import { markdownToPlainText } from '../utils/rich-content-renderer.js';
-import { requireOptional } from '../utils/init-channel.js';
-import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
+import { requireOptional } from '../utils/npm-ops.js';
+import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { formatItemsAsText } from '../core/message/items-formatter.js';
 // ── QQBotChannel ────────────────────────────────────────────────────────────
 export class QQBotChannel {
     config;
@@ -245,11 +246,11 @@ export class QQBotChannel {
     async sendImage(chatId, png) {
         if (!this.client)
             return;
+        const fs = await import('fs');
+        const path = await import('path');
+        const os = await import('os');
+        const tmpPath = path.join(os.tmpdir(), `evolclaw-qqbot-${Date.now()}.png`);
         try {
-            const fs = await import('fs');
-            const path = await import('path');
-            const os = await import('os');
-            const tmpPath = path.join(os.tmpdir(), `evolclaw-qqbot-${Date.now()}.png`);
             fs.writeFileSync(tmpPath, png);
             const chatType = this.chatTypeCache.get(chatId);
             const msgId = this.msgIdCache.get(chatId);
@@ -260,14 +261,16 @@ export class QQBotChannel {
             else {
                 await this.client.sendPrivateImage(chatId, `file://${tmpPath}`, msgId);
             }
+        }
+        catch (error) {
+            logger.error(`[QQBot] sendImage failed for ${chatId}:`, error?.message || error);
+        }
+        finally {
             try {
                 fs.unlinkSync(tmpPath);
             }
             catch { /* ignore */ }
         }
-        catch (error) {
-            logger.error(`[QQBot] sendImage failed for ${chatId}:`, error?.message || error);
-        }
     }
     // ── Outbound: file ─────────────────────────────────────────────────────────
     async sendFile(chatId, filePath) {
@@ -331,9 +334,47 @@ export class QQBotChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
-                sendText: (id, text) => channel.sendMessage(id, text),
-                sendFile: (id, filePath) => channel.sendFile(id, filePath),
-                sendImage: (id, png) => channel.sendImage(id, png),
+                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
+                send: async (envelope, payload) => {
+                    const ctx = envelope.replyContext;
+                    const channelId = envelope.channelId;
+                    switch (payload.kind) {
+                        case 'result.text':
+                        case 'command.result':
+                        case 'command.error':
+                        case 'system.notice':
+                        case 'system.error':
+                        case 'result.error':
+                            await channel.sendMessage(channelId, payload.text);
+                            return;
+                        case 'result.file':
+                            await channel.sendFile(channelId, payload.filePath);
+                            return;
+                        case 'result.image':
+                            await channel.sendImage(channelId, payload.data);
+                            return;
+                        case 'activity.batch': {
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
+                            if (text)
+                                await channel.sendMessage(channelId, text);
+                            return;
+                        }
+                        case 'interaction':
+                            if (payload.fallbackText)
+                                await channel.sendMessage(channelId, payload.fallbackText);
+                            return;
+                        case 'status.started':
+                        case 'status.completed':
+                        case 'status.interrupted':
+                        case 'status.error':
+                        case 'status.timeout':
+                        case 'custom':
+                            return;
+                        default:
+                            logger.warn(`[QQBot] Unhandled payload kind: ${payload.kind}`);
+                    }
+                },
             };
             const policy = {
                 canSwitchProject: (_chatType, identity) => identity === 'owner' || identity === 'admin',
@@ -378,6 +419,21 @@ export class QQBotChannelPlugin {
                 connect: () => channel.connect(),
                 disconnect: () => channel.disconnect(),
                 onProjectPathRequest: () => Promise.resolve(config.projects?.defaultPath || process.cwd()),
+                registerBridge(bridge, channelType) {
+                    bridge.register(adapter.channelName, (handler) => channel.onMessage(async (event) => {
+                        handler({
+                            channel: adapter.channelName,
+                            channelType,
+                            channelId: event.channelId,
+                            content: event.content,
+                            images: event.images,
+                            chatType: event.chatType || 'private',
+                            peerId: event.peerId || '',
+                            peerName: event.peerName,
+                            messageId: event.messageId,
+                        });
+                    }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
+                },
             });
         }
         return result;

package/dist/channels/wechat.js

@@ -5,6 +5,7 @@ import { resolvePaths } from '../paths.js';
 import { logger } from '../utils/logger.js';
 import { sanitizeFileName, saveToUploads, safeFetch } from '../utils/media-cache.js';
 import { markdownToPlainText } from '../utils/rich-content-renderer.js';
+import { formatItemsAsText } from '../core/message/items-formatter.js';
 const CHANNEL_VERSION = '1.0.0';
 const ILINK_APP_ID = 'bot';
 // iLink-App-ClientVersion: major<<16 | minor<<8 | patch (uint32)
@@ -382,7 +383,7 @@ export class WechatChannel {
                         const authMsg = `⚠️ 微信 token 已过期，通道暂停 ${pauseMin} 分钟后自动重试。\n如需立即恢复，请运行: evolclaw init wechat`;
                         if (this.eventBus) {
                             this.eventBus.publish({
-                                type: 'channel:health',
+                                type: 'channel:error',
                                 channel: 'wechat',
                                 status: 'auth_error',
                                 message: authMsg,
@@ -705,7 +706,7 @@ export class WechatChannel {
         });
     }
 }
-import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
+import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
 export class WechatChannelPlugin {
     name = 'wechat';
     isEnabled(config) {
@@ -729,8 +730,48 @@ export class WechatChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
-                sendText: (id, text) => channel.sendMessage(id, text),
-                sendFile: (id, filePath) => channel.sendFile(id, filePath),
+                capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true },
+                send: async (envelope, payload) => {
+                    const channelId = envelope.channelId;
+                    switch (payload.kind) {
+                        case 'result.text':
+                        case 'command.result':
+                        case 'command.error':
+                        case 'system.notice':
+                        case 'system.error':
+                        case 'result.error':
+                            await channel.sendMessage(channelId, payload.text);
+                            return;
+                        case 'result.file': {
+                            const name = payload.fileName || payload.filePath;
+                            await channel.sendMessage(channelId, `\ud83d\udcce \u6587\u4ef6\u5df2\u751f\u6210\uff1a${name}\n\u8def\u5f84\uff1a${payload.filePath}`);
+                            return;
+                        }
+                        case 'result.image':
+                            return;
+                        case 'activity.batch': {
+                            // 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;
+                        }
+                        case 'interaction':
+                            if (payload.fallbackText)
+                                await channel.sendMessage(channelId, payload.fallbackText);
+                            return;
+                        case 'status.started':
+                        case 'status.completed':
+                        case 'status.interrupted':
+                        case 'status.error':
+                        case 'status.timeout':
+                        case 'custom':
+                            return;
+                        default:
+                            logger.warn(`[WeChat] Unhandled payload kind: ${payload.kind}`);
+                    }
+                },
             };
             const policy = {
                 canSwitchProject: (chatType, identity) => identity === 'owner' || identity === 'admin',
@@ -774,6 +815,24 @@ export class WechatChannelPlugin {
                 connect: () => channel.connect(),
                 disconnect: () => channel.disconnect(),
                 onProjectPathRequest: (channelId) => Promise.resolve(config.projects?.defaultPath || process.cwd()),
+                registerBridge(bridge, channelType) {
+                    bridge.register(adapter.channelName, (handler) => channel.onMessage(async (channelId, content, peerId, images, chatType) => {
+                        await handler({
+                            channel: adapter.channelName,
+                            channelType,
+                            channelId,
+                            content,
+                            images,
+                            chatType: chatType || 'private',
+                            peerId: peerId || '',
+                        });
+                    }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
+                },
+                registerHooks(ctx) {
+                    if (channel.setEventBus) {
+                        channel.setEventBus(ctx.eventBus);
+                    }
+                },
             });
         }
         return result;

package/dist/channels/wecom.js

@@ -1,7 +1,8 @@
 import crypto from 'node:crypto';
 import { logger } from '../utils/logger.js';
-import { requireOptional } from '../utils/init-channel.js';
-import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
+import { requireOptional } from '../utils/npm-ops.js';
+import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { formatItemsAsText } from '../core/message/items-formatter.js';
 // ── WecomChannel ───────────────────────────────────────────────────────────────
 export class WecomChannel {
     config;
@@ -489,9 +490,47 @@ export class WecomChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
-                sendText: (id, text) => channel.sendMessage(id, text),
-                sendFile: (id, filePath) => channel.sendFile(id, filePath),
-                sendImage: (id, png) => channel.sendImage(id, png),
+                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
+                send: async (envelope, payload) => {
+                    const ctx = envelope.replyContext;
+                    const channelId = envelope.channelId;
+                    switch (payload.kind) {
+                        case 'result.text':
+                        case 'command.result':
+                        case 'command.error':
+                        case 'system.notice':
+                        case 'system.error':
+                        case 'result.error':
+                            await channel.sendMessage(channelId, payload.text);
+                            return;
+                        case 'result.file':
+                            await channel.sendFile(channelId, payload.filePath);
+                            return;
+                        case 'result.image':
+                            await channel.sendImage(channelId, payload.data);
+                            return;
+                        case 'activity.batch': {
+                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                            const text = formatItemsAsText(filtered);
+                            if (text)
+                                await channel.sendMessage(channelId, text);
+                            return;
+                        }
+                        case 'interaction':
+                            if (payload.fallbackText)
+                                await channel.sendMessage(channelId, payload.fallbackText);
+                            return;
+                        case 'status.started':
+                        case 'status.completed':
+                        case 'status.interrupted':
+                        case 'status.error':
+                        case 'status.timeout':
+                        case 'custom':
+                            return;
+                        default:
+                            logger.warn(`[WeCom] Unhandled payload kind: ${payload.kind}`);
+                    }
+                },
             };
             const policy = {
                 canSwitchProject: (_chatType, identity) => identity === 'owner' || identity === 'admin',
@@ -536,6 +575,21 @@ export class WecomChannelPlugin {
                 connect: () => channel.connect(),
                 disconnect: () => channel.disconnect(),
                 onProjectPathRequest: () => Promise.resolve(config.projects?.defaultPath || process.cwd()),
+                registerBridge(bridge, channelType) {
+                    bridge.register(adapter.channelName, (handler) => channel.onMessage(async (event) => {
+                        handler({
+                            channel: adapter.channelName,
+                            channelType,
+                            channelId: event.channelId,
+                            content: event.content,
+                            images: event.images,
+                            chatType: event.chatType || 'private',
+                            peerId: event.peerId || '',
+                            peerName: event.peerName,
+                            messageId: event.messageId,
+                        });
+                    }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
+                },
             });
         }
         return result;