evolclaw 2.6.1 → 2.6.2

package/dist/channels/aun.js

@@ -58,9 +58,16 @@ export class AUNChannel {
         const logPath = path.join(resolvePaths().logs, `aun-${today}.log`);
         this.traceStream = fs.createWriteStream(logPath, { flags: 'a' });
     }
-    /** 判断 channelId 是否为群组 ID（g-xxx.agentid.pub 或 grp_ 前缀） */
+    /** 判断 channelId 是否为群组 ID
+     *  - 新格式：group.{issuer}/{group_no|group_name}
+     *  - 数字群号：{group_no}.{issuer}（如 11117.agentid.pub）
+     *  - 兼容旧格式：grp_xxx、g-xxx.agentid.pub
+     */
     isGroupId(id) {
-        return id.startsWith('grp_') || (id.startsWith('g-') && id.includes('.'));
+        return (id.startsWith('group.') && id.includes('/'))
+            || /^\d+\./.test(id)
+            || id.startsWith('grp_')
+            || (id.startsWith('g-') && id.includes('.'));
     }
     getShortAid(aid) {
         if (!aid)
@@ -114,6 +121,7 @@ export class AUNChannel {
             this.messageSeqMap.delete(messageId);
     }
     _aid;
+    _selfName; // 本地 agent.md 中的 name，首次 connect 时读取
     _chatId = ''; // aid:device_id:slot_id — 多实例回声过滤
     seenMessages = new Map();
     peerInfoCache = new Map();
@@ -262,6 +270,7 @@ export class AUNChannel {
             this._aid = this.client.aid ?? undefined;
             const deviceId = this.client._device_id ?? '';
             this._chatId = this._aid ? `${this._aid}:${deviceId}:` : '';
+            this._selfName = this.loadSelfName(aidName);
             this.connected = true;
             this.reconnectAttempt = 0;
             // Workaround: SDK e2ee uses _identity.cert for sender_cert_fingerprint;
@@ -388,7 +397,21 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 - 所有命令以 \`/\` 开头
 
 现在，请先使用 \`/bind\` 命令绑定您的项目目录，然后就可以开始工作了！`;
-            await this.sendMessage(owner, welcomeText);
+            // First contact with Owner races against Owner's async cert fetch from
+            // gateway PKI; a 3s pause lets the cert propagate. persist_required asks
+            // the gateway to durably store the message so Owner can recover it via
+            // pull if the initial E2EE push still arrives before the cert resolves.
+            await new Promise(resolve => setTimeout(resolve, 3000));
+            if (!this.client) {
+                logger.warn('[AUN] Client disconnected before welcome message could be sent');
+                return;
+            }
+            await this.client.call('message.send', {
+                to: owner,
+                payload: { type: 'text', text: welcomeText },
+                encrypt: true,
+                persist_required: true,
+            });
             logger.info(`[AUN] Welcome message sent to owner: ${owner}`);
         }
         catch (e) {
@@ -725,7 +748,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const payload = { type: 'text', text: finalText };
         if (context?.threadId)
             payload.thread_id = context.threadId;
-        const params = { payload, encrypt: true };
+        const isGroup = this.isGroupId(channelId);
+        const params = { payload, encrypt: !isGroup };
         // Multi-instance routing: channelId may be "aid:device_id:slot_id"
         const colonIdx = channelId.indexOf(':');
         const targetAid = colonIdx > 0 ? channelId.substring(0, colonIdx) : channelId;
@@ -733,7 +757,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             params.payload.chat_id = channelId;
         }
         try {
-            if (this.isGroupId(channelId)) {
+            if (isGroup) {
                 params.group_id = channelId;
                 this.trace('OUT', 'group.send', params);
                 await this.client.call('group.send', params);
@@ -783,8 +807,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
         catch (e) {
-            this.trace('OUT', 'thought.put.error', { channelId, error: String(e) });
-            logger.debug(`[AUN] thought.put failed to ${channelId}: ${e}`);
+            const err = e;
+            this.trace('OUT', 'thought.put.error', {
+                channelId,
+                errorName: err?.name,
+                errorCode: err?.code,
+                errorMessage: err?.message,
+            });
+            logger.debug(`[AUN] thought.put failed to ${channelId}: ${err?.name}(${err?.code})=${err?.message}`);
         }
     }
     async sendFile(channelId, filePath, context) {
@@ -860,14 +890,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             };
             if (context?.threadId)
                 filePayload.thread_id = context.threadId;
-            const params = { payload: filePayload, encrypt: true };
+            const isGroup = this.isGroupId(channelId);
+            const params = { payload: filePayload, encrypt: !isGroup };
             // Multi-instance routing
             const fileColonIdx = channelId.indexOf(':');
             const fileTargetAid = fileColonIdx > 0 ? channelId.substring(0, fileColonIdx) : channelId;
             if (fileColonIdx > 0) {
                 params.payload.chat_id = channelId;
             }
-            if (this.isGroupId(channelId)) {
+            if (isGroup) {
                 params.group_id = channelId;
                 this.trace('OUT', 'group.send.file', params);
                 await this.client.call('group.send', params);
@@ -909,14 +940,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         };
         if (context?.threadId)
             payload.thread_id = context.threadId;
-        const params = { payload, encrypt: true };
+        const isGroup = this.isGroupId(channelId);
+        const params = { payload, encrypt: !isGroup };
         // Multi-instance routing
         const statusColonIdx = channelId.indexOf(':');
         const statusTargetAid = statusColonIdx > 0 ? channelId.substring(0, statusColonIdx) : channelId;
         if (statusColonIdx > 0) {
             payload.chat_id = channelId;
         }
-        if (this.isGroupId(channelId)) {
+        if (isGroup) {
             params.group_id = channelId;
             this.trace('OUT', 'group.send.status', params);
             this.client.call('group.send', params).catch(e => {
@@ -1038,6 +1070,27 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             maxAttempts: AUNChannel.RECONNECT_DELAYS.length,
         };
     }
+    /** 读取本地 agent.md 中的 name（用于身份上下文展示） */
+    loadSelfName(aid) {
+        try {
+            const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
+            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
+            if (!fs.existsSync(agentMdPath))
+                return undefined;
+            const content = fs.readFileSync(agentMdPath, 'utf-8');
+            const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
+            if (!fmMatch)
+                return undefined;
+            const nameMatch = fmMatch[1].match(/^name:\s*["']?(.+?)["']?\s*$/m);
+            return nameMatch?.[1]?.trim() || undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    getSelfName() {
+        return this._selfName;
+    }
     async fetchPeerInfo(aid) {
         const cached = this.peerInfoCache.get(aid);
         if (cached !== undefined)
@@ -1109,6 +1162,7 @@ export class AUNChannelPlugin {
                 downloadAgentMd: (aid) => channel.downloadAgentMd(aid),
                 putThought: (id, taskId, payload) => channel.sendThought(id, taskId, payload),
                 _selfAid: () => channel.getStatus().aid,
+                _selfName: () => channel.getSelfName(),
             };
             const policy = {
                 canSwitchProject: (chatType, identity) => identity === 'owner' || identity === 'admin',

package/dist/core/command-handler.js

@@ -525,10 +525,10 @@ export class CommandHandler {
         const isAdmin = identity.role === 'owner' || identity.role === 'admin';
         const activeChatType = activeSession?.chatType || 'private';
         if (normalizedContent.startsWith('/')) {
-            const guestGroupCommands = ['/status', '/help', '/check'];
+            const guestGroupCommands = ['/status', '/help', '/check', '/chatmode'];
             const userCommands = activeChatType === 'group' && !isAdmin
                 ? guestGroupCommands
-                : ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s ', '/check'];
+                : ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s ', '/check', '/chatmode'];
             const isUserCommand = userCommands.some(cmd => normalizedContent === cmd.trimEnd() || normalizedContent.startsWith(cmd));
             if (!isUserCommand && !isAdmin) {
                 return activeChatType === 'group'
@@ -1386,9 +1386,9 @@ export class CommandHandler {
             return `✅ 中间输出模式: ${activityArg}（${label}）`;
         }
         // /chatmode 命令：查看/切换 session 会话模式（interactive | proactive）
+        // - 查看：所有人可用
+        // - 设置：单聊任何角色可设置；群聊仅管理员可设置
         if (normalizedContent === '/chatmode' || normalizedContent.startsWith('/chatmode ')) {
-            if (!isAdmin)
-                return '❌ 无权限：此命令仅限管理员使用';
             if (!activeSession)
                 return '❌ 当前无活跃会话';
             const lockedMode = getChannelSessionMode(this.config, channel);
@@ -1401,6 +1401,9 @@ export class CommandHandler {
             if (arg !== 'interactive' && arg !== 'proactive') {
                 return `❌ 无效模式: ${arg}\n可选: interactive / proactive`;
             }
+            if (activeChatType === 'group' && !isAdmin) {
+                return '❌ 无权限：群聊中切换会话模式仅限管理员使用';
+            }
             if (lockedMode) {
                 return `❌ 会话模式由通道配置锁定为 ${lockedMode}，无法切换`;
             }
@@ -1551,15 +1554,18 @@ export class CommandHandler {
                 }
             }
             const lines = [];
+            const sessionMode = session.sessionMode || 'interactive';
+            const lockedMode = getChannelSessionMode(this.config, channel);
+            const chatModeLine = `会话模式: ${sessionMode}${lockedMode ? '（通道锁定）' : ''}`;
             if (isAdmin) {
-                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, `会话轮数: ${sessionTurns}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, chatModeLine, `会话轮数: ${sessionTurns}`);
                 if (health.consecutiveErrors > 0) {
                     lines.push(`异常计数: ${health.consecutiveErrors}`);
                 }
                 lines.push(`最后成功: ${timeStr}`, `${session.agentId}会话: ${session.agentSessionId || '(未初始化)'}`, `创建时间: ${new Date(session.createdAt).toLocaleString('zh-CN')}`, `更新时间: ${new Date(session.updatedAt).toLocaleString('zh-CN')}`);
             }
             else {
-                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${channel} / 项目: ${projectName} / ${session.agentId}会话`, `状态: ${sessionStatus}`, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${channel} / 项目: ${projectName} / ${session.agentId}会话`, `状态: ${sessionStatus}`, chatModeLine, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
             }
             if (health.lastError) {
                 lines.push('');

package/dist/core/message/message-processor.js

@@ -389,15 +389,28 @@ export class MessageProcessor {
                 const peerLabel = session.identity?.role || 'unknown';
                 const peerName = message.peerName || session.metadata?.peerName;
                 const peerType = message.peerType;
+                const peerId = message.peerId;
+                const adapterAny = channelInfo.adapter;
+                const selfAid = typeof adapterAny._selfAid === 'function' ? adapterAny._selfAid() : undefined;
+                const selfName = typeof adapterAny._selfName === 'function' ? adapterAny._selfName() : undefined;
+                const formatIdentity = (name, id) => {
+                    if (name && id)
+                        return `${name} (${id})`;
+                    return name || id || undefined;
+                };
+                const selfIdentity = formatIdentity(selfName, selfAid);
+                const peerIdentity = formatIdentity(peerName, peerId);
                 const envParts = [
                     `会话通道: ${currentChannelType}`,
                     `当前项目: ${path.basename(absoluteProjectPath)}`,
                 ];
                 if (session.name)
                     envParts.push(`会话名称: ${session.name}`);
+                if (selfIdentity)
+                    envParts.push(`当前名称: ${selfIdentity}`);
                 envParts.push(`对端身份: ${peerLabel}`);
-                if (peerName)
-                    envParts.push(`对端名称: ${peerName}`);
+                if (peerIdentity)
+                    envParts.push(`对端名称: ${peerIdentity}`);
                 if (peerType && peerType !== 'unknown')
                     envParts.push(`对端类型: ${peerType}`);
                 if (session.chatType)

package/dist/core/message/thought-emitter.js

@@ -51,7 +51,7 @@ export class ThoughtEmitter {
                     return null;
                 return { type: 'thought', text: event.text, stage: 'thinking' };
             case 'tool_use': {
-                const desc = this.summarizeInput(event.input);
+                const desc = this.summarizeInput(event.input, event.name);
                 return {
                     type: 'thought',
                     text: desc ? `🔧 ${event.name}: ${desc}` : `🔧 ${event.name}`,
@@ -109,9 +109,16 @@ export class ThoughtEmitter {
                 return null;
         }
     }
-    summarizeInput(input) {
+    summarizeInput(input, toolName) {
         if (!input || typeof input !== 'object')
             return '';
+        // Bash + ctl send/file: 显示完整命令内容（含发送的消息正文）
+        if (toolName === 'Bash' && typeof input.command === 'string') {
+            const cmd = input.command;
+            if (cmd.includes('evolclaw ctl send') || cmd.includes('evolclaw ctl file')) {
+                return cmd;
+            }
+        }
         return (input.description ||
             input.file_path ||
             input.pattern ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",