evolclaw 3.2.0 → 3.4.0

package/dist/channels/dingtalk.js

@@ -1,6 +1,6 @@
 import { logger } from '../utils/logger.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';
 // ── Webhook SSRF validation ────────────────────────────────────────────────────
 const WEBHOOK_RE = /^https:\/\/(api|oapi)\.dingtalk\.com\//;
@@ -420,145 +420,82 @@ function isValidCredential(value) {
 }
 export class DingtalkChannelPlugin {
     name = 'dingtalk';
-    isEnabled(config) {
-        const raw = config.channels?.dingtalk;
-        if (!raw)
-            return false;
-        if (Array.isArray(raw)) {
-            return raw.some(inst => inst.enabled !== false && isValidCredential(inst.clientId) && isValidCredential(inst.clientSecret));
-        }
-        if (raw.enabled === false)
-            return false;
-        return isValidCredential(raw.clientId) && isValidCredential(raw.clientSecret);
-    }
-    async createChannels(config) {
-        const instances = normalizeChannelInstances(config.channels?.dingtalk, 'dingtalk');
-        const result = [];
-        for (const inst of instances) {
-            if (inst.enabled === false)
-                continue;
-            if (!isValidCredential(inst.clientId) || !isValidCredential(inst.clientSecret))
-                continue;
-            const channel = new DingtalkChannel({
-                clientId: inst.clientId,
-                clientSecret: inst.clientSecret,
-                requireMention: inst.requireMention,
-                freeResponseChats: inst.freeResponseChats,
-            });
-            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(`[DingTalk] Unhandled payload kind: ${payload.kind}`);
+    async createInstance(inst, ctx) {
+        if (inst.enabled === false)
+            return null;
+        if (!isValidCredential(inst.clientId) || !isValidCredential(inst.clientSecret))
+            return null;
+        const channel = new DingtalkChannel({
+            clientId: inst.clientId,
+            clientSecret: inst.clientSecret,
+            requireMention: inst.requireMention,
+            freeResponseChats: inst.freeResponseChats,
+        });
+        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: 'dingtalk',
-                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) => {
-                        await 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('DingTalk 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: 'dingtalk', 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) => {
+                    await 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/feishu.js

@@ -365,6 +365,8 @@ export class FeishuChannel {
                     }
                     catch (err) {
                         logger.error('[Feishu] Failed to handle card action:', err);
+                        const detail = err instanceof Error && err.message ? err.message : String(err || '未知错误');
+                        return { toast: { type: 'error', content: `❌ 操作失败: ${detail}` } };
                     }
                 },
             });
@@ -1038,15 +1040,36 @@ export class FeishuChannel {
             return false;
         }
     }
-    addAckReaction(messageId) {
+    // messageId → Pin reaction create promise（等待 reaction_id 落地，供 promoteAck 删除）
+    pinReactions = new Map();
+    /** 收到消息时添加 Pin 表情（表示"已收到，排队中"） */
+    addPinReaction(messageId) {
         if (!this.client)
             return;
+        const p = this.client.im.messageReaction.create({
+            path: { message_id: messageId },
+            data: { reaction_type: { emoji_type: 'Pin' } },
+        }).then((res) => res?.data?.reaction_id)
+            .catch(() => undefined);
+        this.pinReactions.set(messageId, p);
+    }
+    /** Runner 开始执行时：添加 CheckMark，然后异步移除 Pin（视觉无闪烁） */
+    async promoteAckReaction(messageId) {
+        if (!this.client)
+            return;
+        // 先加 CheckMark，再删 Pin——用户看到的是 Pin→Pin+CheckMark→CheckMark，无空窗
         this.client.im.messageReaction.create({
             path: { message_id: messageId },
-            data: {
-                reaction_type: { emoji_type: 'CheckMark' }
-            }
+            data: { reaction_type: { emoji_type: 'CheckMark' } },
         }).catch(() => { });
+        const pending = this.pinReactions.get(messageId);
+        this.pinReactions.delete(messageId);
+        const reactionId = await pending;
+        if (reactionId) {
+            this.client.im.messageReaction.delete({
+                path: { message_id: messageId, reaction_id: reactionId },
+            }).catch(() => { });
+        }
     }
 }
 export class CardMetaStore {
@@ -1389,159 +1412,107 @@ export function hasMarkdownSyntax(text) {
     ];
     return markdownPatterns.some(pattern => pattern.test(text));
 }
-import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { resolveShowActivities, showActivitiesPolicy } from '../core/channel-loader.js';
 import { resolvePaths } from '../paths.js';
 export class FeishuChannelPlugin {
     name = 'feishu';
-    isEnabled(config) {
-        const raw = config.channels?.feishu;
-        if (!raw)
-            return false;
-        if (Array.isArray(raw)) {
-            return raw.some(inst => inst.enabled !== false && inst.appId && inst.appSecret);
-        }
-        if (raw.enabled === false)
-            return false;
-        return !!(raw.appId && raw.appSecret);
-    }
-    async createChannels(config) {
-        const instances = normalizeChannelInstances(config.channels?.feishu, 'feishu');
-        const result = [];
-        for (const inst of instances) {
-            if (inst.enabled === false || !inst.appId || !inst.appSecret)
-                continue;
-            const channel = new FeishuChannel({
-                appId: inst.appId,
-                appSecret: inst.appSecret,
-                enableRichContent: config.enableRichContent,
-                seenMsgFile: path.join(resolvePaths().dataDir, `feishu-seen-${inst.name}.jsonl`),
-            });
-            const adapter = {
-                channelName: inst.name,
-                channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true, thread: true },
-                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': {
-                            const sendCtx = { ...(ctx ?? {}) };
-                            if (payload.kind === 'result.text' && payload.isFinal)
-                                sendCtx.title = '✅ 最终回复:';
-                            if (ctx?.metadata?.onThreadCreated)
-                                sendCtx.onThreadCreated = ctx.metadata.onThreadCreated;
-                            await channel.sendMessage(channelId, payload.text, sendCtx);
-                            return;
-                        }
-                        case 'result.file':
-                            await channel.sendFile(channelId, payload.filePath, ctx);
-                            return;
-                        case 'result.image':
-                            await channel.sendImage(channelId, payload.data, ctx);
-                            return;
-                        case 'activity.batch': {
-                            // 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':
-                        case 'status.completed':
-                        case 'status.interrupted':
-                        case 'status.error':
-                        case 'status.timeout':
-                        case 'status.progress':
-                            // Feishu 通过 acknowledge (✓ 表情) 表达状态，由 channel 自行处理
-                            return;
-                        case 'interaction': {
-                            const sent = await channel.sendInteraction(channelId, payload.interaction, ctx);
-                            if (!sent)
-                                throw new Error('sendInteraction returned false');
-                            return;
-                        }
-                        case 'custom':
-                            // Feishu 不支持自定义 payload
-                            return;
-                        default:
-                            logger.warn(`[Feishu] Unhandled payload kind: ${payload.kind}`);
+    async createInstance(inst, ctx) {
+        if (inst.enabled === false || !inst.appId || !inst.appSecret)
+            return null;
+        const channel = new FeishuChannel({
+            appId: inst.appId,
+            appSecret: inst.appSecret,
+            enableRichContent: ctx.enableRichContent,
+            seenMsgFile: path.join(resolvePaths().dataDir, `feishu-seen-${inst.name}.jsonl`),
+        });
+        const mode = resolveShowActivities(inst);
+        const adapter = {
+            channelName: inst.name,
+            channelKey: inst.name,
+            capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true, thread: true },
+            send: async (envelope, payload) => {
+                const replyCtx = 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': {
+                        const sendCtx = { ...(replyCtx ?? {}) };
+                        if (payload.kind === 'result.text' && payload.isFinal)
+                            sendCtx.title = '✅ 最终回复:';
+                        if (replyCtx?.metadata?.onThreadCreated)
+                            sendCtx.onThreadCreated = replyCtx.metadata.onThreadCreated;
+                        await channel.sendMessage(channelId, payload.text, sendCtx);
+                        return;
                     }
-                }, acknowledge: (messageId) => { channel.addAckReaction(messageId); return Promise.resolve(); }, onInteraction: (callback) => channel.onInteraction(callback),
-            };
-            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) => (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: (chatType, identity) => true,
-            };
-            const options = {
-                fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
-                supportsImages: true,
-                flushDelay: inst.flushDelay,
-            };
-            result.push({
-                channelType: 'feishu',
-                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: chatId, content, images, peerId, peerName, messageId, mentions, mentionAids, threadId, rootId, chatType, source }) => {
-                        await handler({
-                            channel: adapter.channelName, channelType, channelId: chatId, content, images,
-                            selfAID: inst.agentName,
-                            chatType: chatType || 'private',
-                            peerId: peerId || '', peerName, messageId, mentions, mentionAids, threadId,
-                            replyContext: threadId ? { replyToMessageId: rootId ?? threadId, replyInThread: true } : undefined,
-                            source,
-                        });
-                    }), (channelId, text, replyContext) => channel.sendMessage(channelId, text, {
-                        replyToMessageId: replyContext?.replyToMessageId,
-                        replyInThread: replyContext?.replyInThread,
-                    }), adapter, channelType);
-                },
-            });
-        }
-        return result;
-    }
-    async createChannel(config) {
-        const instances = await this.createChannels(config);
-        if (instances.length === 0) {
-            throw new Error('Feishu config missing');
-        }
-        return instances[0];
+                    case 'result.file':
+                        await channel.sendFile(channelId, payload.filePath, replyCtx);
+                        return;
+                    case 'result.image':
+                        await channel.sendImage(channelId, payload.data, replyCtx);
+                        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, replyCtx);
+                        return;
+                    }
+                    case 'status.started':
+                    case 'status.completed':
+                    case 'status.interrupted':
+                    case 'status.error':
+                    case 'status.timeout':
+                    case 'status.progress': return;
+                    case 'interaction': {
+                        const sent = await channel.sendInteraction(channelId, payload.interaction, replyCtx);
+                        if (!sent)
+                            throw new Error('sendInteraction returned false');
+                        return;
+                    }
+                    case 'custom': return;
+                    default: logger.warn(`[Feishu] Unhandled payload kind: ${payload.kind}`);
+                }
+            },
+            acknowledge: (messageId) => { channel.addPinReaction(messageId); return Promise.resolve(); },
+            promoteAck: (messageId) => channel.promoteAckReaction(messageId),
+            onInteraction: (callback) => channel.onInteraction(callback),
+        };
+        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: 'feishu', 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 ({ channelId: chatId, content, images, peerId, peerName, messageId, mentions, mentionAids, threadId, rootId, chatType, source }) => {
+                    await handler({
+                        channel: adapter.channelName, channelType, channelId: chatId, content, images,
+                        selfAID: ctx.agentName, chatType: chatType || 'private',
+                        peerId: peerId || '', peerName, messageId, mentions, mentionAids, threadId,
+                        replyContext: threadId ? { replyToMessageId: rootId ?? threadId, replyInThread: true } : undefined,
+                        source,
+                    });
+                }), (channelId, text, replyContext) => channel.sendMessage(channelId, text, {
+                    replyToMessageId: replyContext?.replyToMessageId,
+                    replyInThread: replyContext?.replyInThread,
+                }), adapter, channelType);
+            },
+        };
     }
 }