evolclaw 2.2.0 → 2.4.0

package/dist/channels/aun.js

@@ -1,10 +1,73 @@
-import { AUNClient } from '@aun/core-node';
-import { logger } from '../utils/logger.js';
+import { AUNClient } from '@eleans/aun-core-node';
+import fs from 'fs';
+import path from 'path';
+import { logger, localTimestamp } from '../utils/logger.js';
+import { normalizeChannelInstances } from '../config.js';
+import { resolvePaths } from '../paths.js';
 export class AUNChannel {
     config;
     client = null;
     messageHandler;
     connected = false;
+    traceStream = null;
+    trace(dir, event, data) {
+        if (!this.traceStream)
+            return;
+        const line = JSON.stringify({ ts: localTimestamp(), dir, event, data });
+        this.traceStream.write(line + '\n');
+    }
+    /** 判断 channelId 是否为群组 ID（g-xxx.agentid.pub 或 grp_ 前缀） */
+    isGroupId(id) {
+        return id.startsWith('grp_') || (id.startsWith('g-') && id.includes('.'));
+    }
+    getShortAid(aid) {
+        if (!aid)
+            return undefined;
+        const trimmed = aid.trim();
+        if (!trimmed)
+            return undefined;
+        return trimmed.split('.')[0] || trimmed;
+    }
+    extractTextPayload(payload) {
+        if (typeof payload === 'string')
+            return payload;
+        if (payload && typeof payload === 'object') {
+            const text = payload.text;
+            if (typeof text === 'string')
+                return text;
+            return JSON.stringify(payload);
+        }
+        return '';
+    }
+    hasExplicitMention(text, target) {
+        const escaped = target.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        return new RegExp(`(^|\\s)@${escaped}(?=$|\\s|[.,!?;:，。！？；：]|[\\u4e00-\\u9fff])`).test(text);
+    }
+    stripTriggerMentions(text, selfAid) {
+        let result = text;
+        if (selfAid) {
+            const escapedAid = selfAid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            result = result.replace(new RegExp(`(^|\\s)@${escapedAid}(?=$|\\s|[.,!?;:，。！？；：]|[\\u4e00-\\u9fff])`, 'g'), '$1');
+        }
+        result = result.replace(/(^|\s)@all(?=$|\s|[.,!?;:，。！？；：]|[\u4e00-\u9fff])/gi, '$1');
+        return result.replace(/[ \t]+/g, ' ').trim();
+    }
+    buildGroupReplyContext(taskId, senderAid) {
+        const replyContext = {};
+        if (taskId)
+            replyContext.threadId = taskId;
+        replyContext.peerId = senderAid;
+        return replyContext;
+    }
+    acknowledgeImmediately(messageId, seq) {
+        if (seq != null && this.client) {
+            this.client.call('message.ack', { seq }).catch(e => {
+                logger.debug(`[AUN] Immediate ack failed: ${e}`);
+            });
+        }
+        if (messageId)
+            this.messageSeqMap.delete(messageId);
+    }
     _aid;
     seenMessages = new Map();
     messageSeqMap = new Map(); // messageId → seq (for ack)
@@ -17,6 +80,11 @@ export class AUNChannel {
     onChannelDown;
     constructor(config) {
         this.config = config;
+        if (config.aunTrace) {
+            const logPath = path.join(resolvePaths().logs, 'aun-trace.log');
+            this.traceStream = fs.createWriteStream(logPath, { flags: 'a' });
+            logger.info(`[AUN] Trace logging enabled: ${logPath}`);
+        }
     }
     async connect() {
         this.intentionalDisconnect = false;
@@ -53,21 +121,51 @@ export class AUNChannel {
         logger.info(`[AUN] Initializing: aid=${aidName}, gateway=${gateway}, aun_path=${aunPath}`);
         // Create client with FileSecretStore (AES-256-GCM)
         // 不传 encryption_seed 时，SDK 自动从 {aun_path}/.seed 文件派生密钥（与 aun_cli.py 对齐）
+        const rootCaPath = `${aunPath}/CA/root/root.crt`;
         this.client = new AUNClient({
             aun_path: aunPath,
+            root_ca_path: rootCaPath,
             ...(encryptionSeed && { encryption_seed: encryptionSeed }),
         });
         // Set gateway URL (internal property, same as Python SDK)
         this.client._gatewayUrl = gateway;
         // Register event handlers before connecting
-        this.client.on('message.received', (data) => this.handleIncomingPrivateMessage(data));
-        this.client.on('group.message_created', (data) => this.handleIncomingGroupMessage(data));
-        this.client.on('connection.state', (data) => this.handleConnectionState(data));
+        this.client.on('message.received', (data) => {
+            this.trace('IN', 'message.received', data);
+            const kind = (data && typeof data === 'object') ? data.kind ?? '' : '';
+            const keys = (data && typeof data === 'object') ? Object.keys(data).join(',') : typeof data;
+            logger.info(`[AUN][DIAG] message.received: kind=${kind} keys=${keys}`);
+            this.handleIncomingPrivateMessage(data);
+        });
+        this.client.on('group.message_created', (data) => {
+            this.trace('IN', 'group.message_created', data);
+            const gid = (data && typeof data === 'object') ? data.group_id ?? '' : '';
+            const sender = (data && typeof data === 'object') ? data.sender_aid ?? '' : '';
+            logger.info(`[AUN][DIAG] group.message_created: group_id=${gid} sender=${sender}`);
+            this.handleIncomingGroupMessage(data);
+        });
+        this.client.on('connection.state', (data) => {
+            this.trace('IN', 'connection.state', data);
+            this.handleConnectionState(data);
+        });
         // Authenticate
+        // Workaround: SDK 0.3.x _loadIdentityOrRaise doesn't set identity.aid from requested aid,
+        // causing gateway "missing aid" error. Patch to backfill aid on loaded identity.
+        const authFlow = this.client._auth;
+        if (authFlow && typeof authFlow._loadIdentityOrRaise === 'function') {
+            const origLoad = authFlow._loadIdentityOrRaise.bind(authFlow);
+            authFlow._loadIdentityOrRaise = (aid) => {
+                const identity = origLoad(aid);
+                if (identity && !identity.aid)
+                    identity.aid = aid ?? authFlow._aid;
+                return identity;
+            };
+        }
         let accessToken;
         try {
             logger.info(`[AUN] Authenticating as ${aidName}...`);
             const auth = await this.client.auth.authenticate(aidName ? { aid: aidName } : undefined);
+            this.trace('IN', 'auth.result', { aid: auth.aid, gateway: auth.gateway, hasToken: !!auth.access_token });
             accessToken = auth.access_token;
             const resolvedGateway = auth.gateway || gateway;
             this.client._gatewayUrl = resolvedGateway;
@@ -82,7 +180,8 @@ export class AUNChannel {
             // Fallback: try direct token from env/config (legacy)
             accessToken = this.config.accessToken || process.env.AUN_ACCESS_TOKEN || '';
             if (!accessToken) {
-                logger.error(`[AUN] No accessToken fallback available, AUN channel disabled`);
+                logger.error(`[AUN] No accessToken fallback available, scheduling retry`);
+                this.scheduleReconnect();
                 return;
             }
             logger.warn(`[AUN] Using accessToken fallback`);
@@ -93,10 +192,22 @@ export class AUNChannel {
             this._aid = this.client.aid ?? undefined;
             this.connected = true;
             this.reconnectAttempt = 0;
+            // Workaround: SDK e2ee uses _identity.cert for sender_cert_fingerprint;
+            // if cert is missing, it falls back to public key SPKI fingerprint which
+            // causes peer cert lookup failures. Backfill from keystore if needed.
+            const clientAny = this.client;
+            if (clientAny._identity && !clientAny._identity.cert) {
+                const cert = clientAny._keystore?.loadCert?.(aidName);
+                if (cert) {
+                    clientAny._identity.cert = cert;
+                    logger.info('[AUN] Backfilled identity.cert from keystore for e2ee fingerprint');
+                }
+            }
             logger.info(`[AUN] Connected as ${this._aid}`);
         }
         catch (e) {
             logger.error(`[AUN] Connection failed: ${e}`);
+            this.scheduleReconnect();
             return;
         }
     }
@@ -107,7 +218,7 @@ export class AUNChannel {
         const msg = data;
         const fromAid = msg.from ?? '';
         const payload = msg.payload ?? '';
-        const text = typeof payload === 'string' ? payload : (payload ? JSON.stringify(payload) : '');
+        const text = this.extractTextPayload(payload);
         const taskId = msg.task_id;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
@@ -134,24 +245,48 @@ export class AUNChannel {
         const groupId = msg.group_id ?? '';
         const senderAid = msg.sender_aid ?? msg.from ?? '';
         const payload = msg.payload ?? '';
-        const text = typeof payload === 'string' ? payload : (payload ? JSON.stringify(payload) : '');
+        const text = this.extractTextPayload(payload);
         const taskId = msg.task_id;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
-        // Detect @mentions
-        const mentions = [];
-        if (this._aid && text.includes(`@${this._aid}`)) {
-            mentions.push(this._aid);
+        // Extract structured mentions from payload (e.g. payload.mentions: ["evolai.agentid.pub"])
+        const payloadMentions = Array.isArray(payload?.mentions)
+            ? payload.mentions.filter((m) => typeof m === 'string')
+            : [];
+        logger.info(`[AUN][DIAG-GRP] full_msg=${JSON.stringify(msg).substring(0, 500)}`);
+        if (!groupId || !senderAid) {
+            this.acknowledgeImmediately(messageId, seq);
+            return;
+        }
+        if (this._aid && senderAid === this._aid) {
+            this.acknowledgeImmediately(messageId, seq);
+            return;
+        }
+        const mentionedSelf = this._aid
+            ? (this.hasExplicitMention(text, this._aid) || payloadMentions.includes(this._aid))
+            : false;
+        const mentionedAll = this.hasExplicitMention(text, 'all') || payloadMentions.includes('all');
+        if (!mentionedSelf && !mentionedAll) {
+            this.acknowledgeImmediately(messageId, seq);
+            return;
         }
+        const strippedText = this.stripTriggerMentions(text, this._aid);
+        if (!strippedText) {
+            this.acknowledgeImmediately(messageId, seq);
+            return;
+        }
+        const mentions = mentionedAll ? ['all'] : (this._aid ? [this._aid] : []);
         this.dispatchMessage({
             channelId: groupId,
             userId: senderAid,
-            text,
+            peerName: this.getShortAid(senderAid),
+            text: strippedText,
             chatType: 'group',
             messageId,
             seq,
             taskId,
             mentions,
+            replyContext: this.buildGroupReplyContext(taskId, senderAid),
         });
     }
     dispatchMessage(event) {
@@ -169,8 +304,10 @@ export class AUNChannel {
         if (!this.messageHandler)
             return;
         const mentionObjects = event.mentions?.map(aid => ({ userId: aid }));
-        let replyContext;
-        if (event.taskId) {
+        // Use caller-supplied replyContext (group path builds mentionUserIds);
+        // fall back to simple threadId-only context for private messages
+        let replyContext = event.replyContext;
+        if (!replyContext && event.taskId) {
             replyContext = { threadId: event.taskId };
         }
         this.messageHandler({
@@ -178,6 +315,7 @@ export class AUNChannel {
             content: event.text || '',
             chatType: event.chatType,
             peerId: event.userId || event.channelId || '',
+            peerName: event.peerName,
             messageId: event.messageId,
             threadId: event.taskId,
             mentions: mentionObjects,
@@ -230,60 +368,88 @@ export class AUNChannel {
             finalText = '最终回复\n' + text;
         }
         this.sentCount.set(channelId, (this.sentCount.get(channelId) || 0) + 1);
-        const params = { payload: finalText, encrypt: true };
+        // 群聊 @ 兜底：提示词已告知 agent 要 @，但如果 agent 没写，系统自动补上
+        if (this.isGroupId(channelId) && context?.peerId) {
+            if (!finalText.includes(`@${context.peerId}`)) {
+                finalText = `@${context.peerId} ` + finalText;
+            }
+        }
+        const params = { payload: { text: finalText }, encrypt: true };
         if (context?.threadId)
             params.task_id = context.threadId;
         try {
-            if (channelId.startsWith('grp_')) {
+            if (this.isGroupId(channelId)) {
                 params.group_id = channelId;
+                this.trace('OUT', 'group.send', params);
                 await this.client.call('group.send', params);
             }
             else {
                 params.to = channelId;
+                this.trace('OUT', 'message.send', params);
                 await this.client.call('message.send', params);
             }
         }
         catch (e) {
+            this.trace('OUT', 'send.error', { channelId, error: String(e) });
             logger.error(`[AUN] Send failed to ${channelId}: ${e}`);
         }
     }
     acknowledge(messageId) {
-        const seq = this.messageSeqMap.get(messageId);
-        if (seq != null && this.client) {
-            this.client.call('message.ack', { seq }).catch(e => {
-                logger.debug(`[AUN] Ack failed: ${e}`);
-            });
-            this.messageSeqMap.delete(messageId);
-        }
+        // Gateway auto-delivery-ack is sufficient; skip explicit message.ack RPC
+        // to avoid duplicate "已送达" at the sender CLI
+        this.messageSeqMap.delete(messageId);
     }
     sendProcessingStatus(channelId, status, sessionId, context) {
         if (status === 'start')
             this.sentCount.delete(channelId); // 新任务开始，重置计数
         if (!this.client || !this.connected)
             return;
-        const payload = JSON.stringify({
+        const payload = {
             type: 'processing',
             status,
             sessionId,
             timestamp: Math.floor(Date.now() / 1000),
-        });
+        };
         const params = {
-            to: channelId, payload,
-            encrypt: true, persist: false,
+            payload,
+            encrypt: true,
         };
         if (context?.threadId)
             params.task_id = context.threadId;
-        this.client.call('message.send', params).catch(e => {
-            logger.debug(`[AUN] Processing status failed: ${e}`);
-        });
+        if (this.isGroupId(channelId)) {
+            params.group_id = channelId;
+            this.trace('OUT', 'group.send.status', params);
+            this.client.call('group.send', params).catch(e => {
+                logger.debug(`[AUN] Processing status failed: ${e}`);
+            });
+        }
+        else {
+            params.to = channelId;
+            this.trace('OUT', 'message.send.status', params);
+            this.client.call('message.send', params).catch(e => {
+                logger.debug(`[AUN] Processing status failed: ${e}`);
+            });
+        }
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
             return;
-        this.client.call('message.send', {
-            to: channelId, payload,
-            encrypt: true, persist: false,
-        }).catch(e => {
+        // SDK 0.3.0 E2EE requires payload to be an object
+        let payloadObj;
+        try {
+            const parsed = JSON.parse(payload);
+            payloadObj = (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+                ? parsed : { text: payload };
+        }
+        catch {
+            payloadObj = { text: payload };
+        }
+        const sendParams = {
+            to: channelId, payload: payloadObj,
+            encrypt: true,
+        };
+        this.trace('OUT', 'message.send.custom', sendParams);
+        this.client.call('message.send', sendParams).catch(e => {
             logger.debug(`[AUN] Custom payload failed: ${e}`);
         });
     }
@@ -301,6 +467,10 @@ export class AUNChannel {
             this.client = null;
         }
         this.connected = false;
+        if (this.traceStream) {
+            this.traceStream.end();
+            this.traceStream = null;
+        }
         logger.info('[AUN] Disconnected');
     }
     // ── TS-layer reconnect (fallback when SDK auto_reconnect exhausted) ──
@@ -367,69 +537,87 @@ export class AUNChannel {
 export class AUNChannelPlugin {
     name = 'aun';
     isEnabled(config) {
-        return config.channels?.aun?.enabled !== false && !!config.channels?.aun?.aid;
+        const raw = config.channels?.aun;
+        if (!raw)
+            return false;
+        if (Array.isArray(raw)) {
+            return raw.some(inst => inst.enabled !== false && !!inst.aid);
+        }
+        return raw.enabled !== false && !!raw.aid;
+    }
+    async createChannels(config) {
+        const instances = normalizeChannelInstances(config.channels?.aun, 'aun');
+        const result = [];
+        for (const inst of instances) {
+            if (inst.enabled === false || !inst.aid)
+                continue;
+            const channel = new AUNChannel({
+                aid: inst.aid,
+                keystorePath: inst.keystorePath,
+                gatewayPort: inst.gatewayPort,
+                gatewayUrl: inst.gatewayUrl,
+                accessToken: inst.accessToken,
+                flushDelay: inst.flushDelay,
+                encryptionSeed: inst.encryptionSeed,
+                aunTrace: config.debug?.aunTrace,
+            });
+            const adapter = {
+                channelName: inst.name,
+                sendText: (id, text, context) => channel.sendMessage(id, text, context),
+                acknowledge: (messageId) => { channel.acknowledge(messageId); return Promise.resolve(); },
+                sendProcessingStatus: (id, status, sessionId, context) => channel.sendProcessingStatus(id, status, sessionId, context),
+                sendCustomPayload: (id, payload) => channel.sendCustomPayload(id, payload),
+            };
+            const policy = {
+                canSwitchProject: (chatType, identity) => identity === 'owner',
+                canListProjects: (chatType, identity) => identity === 'owner',
+                canCreateSession: (chatType, identity) => true,
+                canDeleteSession: (chatType, identity) => true,
+                canImportCliSession: (chatType, identity) => identity === 'owner',
+                messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
+                showMiddleResult: (chatType, identity) => {
+                    const mode = inst.showActivities ?? config.showActivities ?? 'all';
+                    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 = inst.showActivities ?? config.showActivities ?? 'all';
+                    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 = {
+                flushDelay: inst.flushDelay ?? 3,
+                fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
+            };
+            result.push({
+                channelType: 'aun',
+                adapter,
+                channel,
+                policy,
+                options,
+                connect: () => channel.connect(),
+                disconnect: () => channel.disconnect(),
+            });
+        }
+        return result;
     }
     async createChannel(config) {
-        const aunConfig = config.channels?.aun;
-        if (!aunConfig?.aid) {
+        const instances = await this.createChannels(config);
+        if (instances.length === 0) {
             throw new Error('AUN config missing (aid required, e.g. "mybot.agentid.pub")');
         }
-        const channel = new AUNChannel({
-            aid: aunConfig.aid,
-            keystorePath: aunConfig.keystorePath,
-            gatewayPort: aunConfig.gatewayPort,
-            gatewayUrl: aunConfig.gatewayUrl,
-            accessToken: aunConfig.accessToken,
-            flushDelay: aunConfig.flushDelay,
-            encryptionSeed: aunConfig.encryptionSeed,
-        });
-        const adapter = {
-            name: 'aun',
-            sendText: (id, text, context) => channel.sendMessage(id, text, context),
-            acknowledge: (messageId) => { channel.acknowledge(messageId); return Promise.resolve(); },
-            sendProcessingStatus: (id, status, sessionId, context) => channel.sendProcessingStatus(id, status, sessionId, context),
-            sendCustomPayload: (id, payload) => channel.sendCustomPayload(id, payload),
-        };
-        const policy = {
-            canSwitchProject: (chatType, identity) => identity === 'owner',
-            canListProjects: (chatType, identity) => identity === 'owner',
-            canCreateSession: (chatType, identity) => true,
-            canDeleteSession: (chatType, identity) => true,
-            canImportCliSession: (chatType, identity) => identity === 'owner',
-            messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
-            showMiddleResult: (chatType, identity) => {
-                const mode = aunConfig.showActivities ?? config.showActivities ?? 'all';
-                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 = aunConfig.showActivities ?? config.showActivities ?? 'all';
-                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 = {
-            flushDelay: aunConfig.flushDelay ?? 3,
-            fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
-        };
-        return {
-            adapter,
-            channel,
-            policy,
-            options,
-            connect: () => channel.connect(),
-            disconnect: () => channel.disconnect(),
-        };
+        return instances[0];
     }
 }