evolclaw 3.2.0 → 3.3.0

package/dist/channels/qqbot.js

@@ -1,7 +1,7 @@
 import { logger } from '../utils/logger.js';
 import { markdownToPlainText } from '../utils/rich-content-renderer.js';
 import { requireOptional } from '../utils/npm-ops.js';
-import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { resolveShowActivities, showActivitiesPolicy } from '../core/channel-loader.js';
 import { formatItemsAsText } from '../core/message/items-formatter.js';
 // ── QQBotChannel ────────────────────────────────────────────────────────────
 export class QQBotChannel {
@@ -309,143 +309,80 @@ function isValidCredential(value) {
 }
 export class QQBotChannelPlugin {
     name = 'qqbot';
-    isEnabled(config) {
-        const raw = config.channels?.qqbot;
-        if (!raw)
-            return false;
-        if (Array.isArray(raw)) {
-            return raw.some(inst => inst.enabled !== false && isValidCredential(inst.appId) && isValidCredential(inst.clientSecret));
-        }
-        if (raw.enabled === false)
-            return false;
-        return isValidCredential(raw.appId) && isValidCredential(raw.clientSecret);
-    }
-    async createChannels(config) {
-        const instances = normalizeChannelInstances(config.channels?.qqbot, 'qqbot');
-        const result = [];
-        for (const inst of instances) {
-            if (inst.enabled === false)
-                continue;
-            if (!isValidCredential(inst.appId) || !isValidCredential(inst.clientSecret))
-                continue;
-            const channel = new QQBotChannel({
-                appId: inst.appId,
-                clientSecret: inst.clientSecret,
-            });
-            const adapter = {
-                channelName: inst.name,
-                channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: 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 'status.progress':
-                        case 'custom':
-                            return;
-                        default:
-                            logger.warn(`[QQBot] Unhandled payload kind: ${payload.kind}`);
+    async createInstance(inst, ctx) {
+        if (inst.enabled === false)
+            return null;
+        if (!isValidCredential(inst.appId) || !isValidCredential(inst.clientSecret))
+            return null;
+        const channel = new QQBotChannel({
+            appId: inst.appId,
+            clientSecret: inst.clientSecret,
+        });
+        const mode = resolveShowActivities(inst);
+        const adapter = {
+            channelName: inst.name,
+            channelKey: inst.name,
+            capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: false },
+            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':
+                        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;
                     }
-                },
-            };
-            const policy = {
-                canSwitchProject: (_chatType, identity) => identity === 'owner' || identity === 'admin',
-                canListProjects: (_chatType, identity) => identity === 'owner' || identity === 'admin',
-                canCreateSession: () => true,
-                canDeleteSession: () => true,
-                canImportCliSession: (_chatType, identity) => identity === 'owner' || identity === 'admin',
-                messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
-                showMiddleResult: (chatType, identity) => {
-                    const mode = getChannelShowActivities(config, inst.name);
-                    if (mode === 'none')
-                        return false;
-                    if (mode === 'dm-only')
-                        return chatType === 'private';
-                    if (mode === 'owner-dm-only')
-                        return chatType === 'private' && identity === 'owner';
-                    return true;
-                },
-                showIdleMonitor: (chatType, identity) => {
-                    const mode = getChannelShowActivities(config, inst.name);
-                    if (mode === 'none')
-                        return false;
-                    if (mode === 'dm-only')
-                        return chatType === 'private';
-                    if (mode === 'owner-dm-only')
-                        return chatType === 'private' && identity === 'owner';
-                    return true;
-                },
-                accumulateErrors: () => true,
-            };
-            const options = {
-                fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
-                supportsImages: true,
-                flushDelay: inst.flushDelay,
-            };
-            result.push({
-                channelType: 'qqbot',
-                adapter,
-                channel,
-                policy,
-                options,
-                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,
-                            selfAID: inst.agentName,
-                            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;
-    }
-    async createChannel(config) {
-        const instances = await this.createChannels(config);
-        if (instances.length === 0) {
-            throw new Error('QQBot config missing or invalid');
-        }
-        return instances[0];
+                    case 'interaction':
+                        if (payload.fallbackText)
+                            await channel.sendMessage(channelId, payload.fallbackText);
+                        return;
+                    default: return;
+                }
+            },
+        };
+        const policy = {
+            canSwitchProject: (_, identity) => identity === 'owner' || identity === 'admin',
+            canListProjects: (_, identity) => identity === 'owner' || identity === 'admin',
+            canCreateSession: () => true,
+            canDeleteSession: () => true,
+            canImportCliSession: (_, identity) => identity === 'owner' || identity === 'admin',
+            messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
+            showMiddleResult: (chatType, identity) => showActivitiesPolicy(mode, chatType, identity),
+            showIdleMonitor: (chatType, identity) => showActivitiesPolicy(mode, chatType, identity),
+            accumulateErrors: () => true,
+        };
+        return {
+            channelType: 'qqbot', adapter, channel,
+            policy,
+            options: { fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g, supportsImages: true, flushDelay: inst.flushDelay },
+            connect: () => channel.connect(),
+            disconnect: () => channel.disconnect(),
+            onProjectPathRequest: () => Promise.resolve(ctx.defaultProjectPath),
+            registerBridge(bridge, channelType) {
+                bridge.register(adapter.channelName, (handler) => channel.onMessage(async (event) => {
+                    handler({
+                        channel: adapter.channelName, channelType, channelId: event.channelId,
+                        selfAID: ctx.agentName, 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);
+            },
+        };
     }
 }

package/dist/channels/wechat.js

@@ -712,145 +712,84 @@ export class WechatChannel {
         });
     }
 }
-import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { resolveShowActivities, showActivitiesPolicy } from '../core/channel-loader.js';
 export class WechatChannelPlugin {
     name = 'wechat';
-    isEnabled(config) {
-        const raw = config.channels?.wechat;
-        if (!raw)
-            return false;
-        if (Array.isArray(raw)) {
-            return raw.some(inst => inst.enabled !== false && !!inst.token);
-        }
-        return raw.enabled === true && !!raw.token;
-    }
-    async createChannels(config) {
-        const instances = normalizeChannelInstances(config.channels?.wechat, 'wechat');
-        const result = [];
-        for (const inst of instances) {
-            if (inst.enabled === false || !inst.token)
-                continue;
-            const channel = new WechatChannel({
-                baseUrl: inst.baseUrl || 'https://ilinkai.weixin.qq.com',
-                token: inst.token,
-            });
-            const adapter = {
-                channelName: inst.name,
-                channelKey: inst.name,
-                capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true, thread: false },
-                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 'status.progress':
-                        case 'custom':
-                            return;
-                        default:
-                            logger.warn(`[WeChat] Unhandled payload kind: ${payload.kind}`);
+    async createInstance(inst, ctx) {
+        if (inst.enabled === false || !inst.token)
+            return null;
+        const channel = new WechatChannel({
+            baseUrl: inst.baseUrl || 'https://ilinkai.weixin.qq.com',
+            token: inst.token,
+        });
+        const mode = resolveShowActivities(inst);
+        const adapter = {
+            channelName: inst.name,
+            channelKey: inst.name,
+            capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true, thread: false },
+            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, `📎 文件已生成：${name}\n路径：${payload.filePath}`);
+                        return;
                     }
-                },
-            };
-            const policy = {
-                canSwitchProject: (chatType, identity) => identity === 'owner' || identity === 'admin',
-                canListProjects: (chatType, identity) => identity === 'owner' || identity === 'admin',
-                canCreateSession: (chatType, identity) => true,
-                canDeleteSession: (chatType, identity) => true,
-                canImportCliSession: (chatType, identity) => identity === 'owner' || identity === 'admin',
-                messagePrefix: (chatType, peerName) => '',
-                showMiddleResult: (chatType, identity) => {
-                    const mode = getChannelShowActivities(config, inst.name);
-                    if (mode === 'none')
-                        return false;
-                    if (mode === 'dm-only')
-                        return chatType === 'private';
-                    if (mode === 'owner-dm-only')
-                        return chatType === 'private' && identity === 'owner';
-                    return true;
-                },
-                showIdleMonitor: (chatType, identity) => {
-                    const mode = getChannelShowActivities(config, inst.name);
-                    if (mode === 'none')
-                        return false;
-                    if (mode === 'dm-only')
-                        return chatType === 'private';
-                    if (mode === 'owner-dm-only')
-                        return chatType === 'private' && identity === 'owner';
-                    return true;
-                },
-                accumulateErrors: (chatType, identity) => true,
-            };
-            const options = {
-                fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
-                flushDelay: inst.flushDelay ?? 3, // WeChat 默认 3s
-            };
-            result.push({
-                channelType: 'wechat',
-                adapter,
-                channel,
-                policy,
-                options,
-                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,
-                            selfAID: inst.agentName,
-                            content,
-                            images,
-                            chatType: chatType || 'private',
-                            peerId: peerId || '',
-                        });
-                    }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
-                },
-                registerHooks(ctx) {
-                    if (channel.setEventBus) {
-                        channel.setEventBus(ctx.eventBus);
+                    case 'result.image': 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;
                     }
-                },
-            });
-        }
-        return result;
-    }
-    async createChannel(config) {
-        const instances = await this.createChannels(config);
-        if (instances.length === 0) {
-            throw new Error('WeChat config missing');
-        }
-        return instances[0];
+                    case 'interaction':
+                        if (payload.fallbackText)
+                            await channel.sendMessage(channelId, payload.fallbackText);
+                        return;
+                    default: return;
+                }
+            },
+        };
+        const policy = {
+            canSwitchProject: (_, identity) => identity === 'owner' || identity === 'admin',
+            canListProjects: (_, identity) => identity === 'owner' || identity === 'admin',
+            canCreateSession: () => true,
+            canDeleteSession: () => true,
+            canImportCliSession: (_, identity) => identity === 'owner' || identity === 'admin',
+            messagePrefix: () => '',
+            showMiddleResult: (chatType, identity) => showActivitiesPolicy(mode, chatType, identity),
+            showIdleMonitor: (chatType, identity) => showActivitiesPolicy(mode, chatType, identity),
+            accumulateErrors: () => true,
+        };
+        return {
+            channelType: 'wechat', adapter, channel,
+            policy,
+            options: { fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g, flushDelay: inst.flushDelay ?? 3 },
+            connect: () => channel.connect(),
+            disconnect: () => channel.disconnect(),
+            onProjectPathRequest: () => Promise.resolve(ctx.defaultProjectPath),
+            registerBridge(bridge, channelType) {
+                bridge.register(adapter.channelName, (handler) => channel.onMessage(async (channelId, content, peerId, images, chatType) => {
+                    await handler({
+                        channel: adapter.channelName, channelType, channelId,
+                        selfAID: ctx.agentName, content, images,
+                        chatType: chatType || 'private', peerId: peerId || '',
+                    });
+                }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
+            },
+            registerHooks(hookCtx) {
+                if (channel.setEventBus)
+                    channel.setEventBus(hookCtx.eventBus);
+            },
+        };
     }
 }