evolclaw 3.1.1 → 3.1.3

package/dist/channels/aun.js

@@ -6,7 +6,7 @@ import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
-import { resolvePaths, getPackageRoot, agentDir as agentDirPath } from '../paths.js';
+import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath, resolveRoot } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
 import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
@@ -57,6 +57,46 @@ function getEvolclawVersion() {
     }
     return _cachedVersion;
 }
+function migrateAunData(targetPath) {
+    const legacyPath = path.join(os.homedir(), '.aun');
+    if (legacyPath === targetPath)
+        return;
+    // AIDs 迁移：逐个检查每个 AID，缺少 private 的就从 legacy 复制
+    const srcAIDs = path.join(legacyPath, 'AIDs');
+    const dstAIDs = path.join(targetPath, 'AIDs');
+    if (fs.existsSync(srcAIDs)) {
+        fs.mkdirSync(dstAIDs, { recursive: true });
+        try {
+            for (const entry of fs.readdirSync(srcAIDs, { withFileTypes: true })) {
+                if (!entry.isDirectory())
+                    continue;
+                const aidName = entry.name;
+                const srcAidDir = path.join(srcAIDs, aidName);
+                const dstAidDir = path.join(dstAIDs, aidName);
+                const srcPrivate = path.join(srcAidDir, 'private');
+                const dstPrivate = path.join(dstAidDir, 'private');
+                // 如果目标 AID 目录不存在或缺少 private，从源复制整个 AID 目录
+                if (fs.existsSync(srcPrivate) && !fs.existsSync(dstPrivate)) {
+                    fs.cpSync(srcAidDir, dstAidDir, { recursive: true });
+                }
+            }
+        }
+        catch { }
+    }
+    // CA 迁移
+    const srcCA = path.join(legacyPath, 'CA');
+    const dstCA = path.join(targetPath, 'CA');
+    if (fs.existsSync(srcCA) && !fs.existsSync(dstCA)) {
+        fs.cpSync(srcCA, dstCA, { recursive: true });
+    }
+    for (const file of ['.seed', '.device_id']) {
+        const src = path.join(legacyPath, file);
+        const dst = path.join(targetPath, file);
+        if (fs.existsSync(src) && !fs.existsSync(dst)) {
+            fs.copyFileSync(src, dst);
+        }
+    }
+}
 export class AUNChannel {
     config;
     client = null;
@@ -408,10 +448,10 @@ export class AUNChannel {
         }
         return out;
     }
-    buildGroupReplyContext(taskId, senderAid, encrypted, messageId, chatmode) {
+    buildGroupReplyContext(threadId, senderAid, encrypted, messageId, chatmode) {
         const replyContext = { metadata: { encrypted, chatmode } };
-        if (taskId)
-            replyContext.threadId = taskId;
+        if (threadId)
+            replyContext.threadId = threadId;
         replyContext.peerId = senderAid;
         if (messageId)
             replyContext.replyToMessageId = messageId;
@@ -445,6 +485,10 @@ export class AUNChannel {
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
         'merge', 'link', 'location', 'personal_card',
     ]);
+    /** Menu protocol 请求类型：自定义消息快速路径，绕过白名单直接分发到 bridge */
+    static MENU_REQUEST_TYPES = new Set([
+        'menu.list', 'menu.query', 'menu.options', 'menu.update', 'menu.action',
+    ]);
     // Reconnect state
     // SDK 自己跑无限指数退避（1s → 5min）；TS 层只在 SDK 够不到的两类场景下接管：
     //  1. flap：短命 connected 反复出现（SDK 不记忆跨轮 base delay，会从 1s 重新开始）
@@ -541,9 +585,11 @@ export class AUNChannel {
             this.client = null;
         }
         this.connected = false;
-        const aunPath = this.config.keystorePath || path.join(os.homedir(), '.aun');
+        const aunPath = this.config.keystorePath || resolveRoot();
         const aidName = this.config.aid;
         const encryptionSeed = this.config.encryptionSeed || process.env.AUN_ENCRYPTION_SEED || undefined;
+        // Migrate legacy ~/.aun data to EVOLCLAW_HOME on first run
+        migrateAunData(aunPath);
         // Gateway URL 解析：优先用配置的 gatewayUrl，否则通过 well-known 自动发现
         let gateway = this.config.gatewayUrl || '';
         if (!gateway) {
@@ -731,8 +777,8 @@ export class AUNChannel {
                 logger.info(`${this.logPrefix()} No owner configured, skipping welcome message (will retry after auto-bind)`);
                 return;
             }
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
-            const existingAgentMd = fs.existsSync(agentMdPath) ? fs.readFileSync(agentMdPath, 'utf-8') : '';
+            const agentMdLocalPath = agentMdPathFn(aidName);
+            const existingAgentMd = fs.existsSync(agentMdLocalPath) ? fs.readFileSync(agentMdLocalPath, 'utf-8') : '';
             const existingFrontmatterMatch = existingAgentMd.match(/^---\n([\s\S]*?)\n---/);
             const existingFrontmatter = existingFrontmatterMatch?.[1] ?? '';
             // Fetch owner's agent.md to derive name and validate type
@@ -778,12 +824,12 @@ tags:
 EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 `;
             // Write locally
-            fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
-            fs.writeFileSync(agentMdPath, newAgentMd, 'utf-8');
+            fs.mkdirSync(path.dirname(agentMdLocalPath), { recursive: true });
+            fs.writeFileSync(agentMdLocalPath, newAgentMd, 'utf-8');
             logger.info(`${this.logPrefix()} Updated agent.md for ${aidName}`);
-            // Publish to AUN network via auth.uploadAgentMd
+            // Publish to AUN network via publishAgentMd (auto-sign)
             try {
-                await this.client.auth.uploadAgentMd(newAgentMd);
+                await this.client.publishAgentMd();
                 logger.info(`${this.logPrefix()} Published agent.md to AUN network`);
             }
             catch (e) {
@@ -800,8 +846,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 2. **查看帮助**：发送 \`/help\` 查看所有可用命令
 3. **切换项目**：发送 \`/project <项目名>\` 切换到其他项目
 4. **查看状态**：发送 \`/status\` 查看当前会话状态
-5. **查看 Agent 信息**：发送 \`/agentmd\` 查看 agent.md 内容
-6. **会话管理**：发送 \`/session\` 查看和切换会话
+5. **会话管理**：发送 \`/session\` 查看和切换会话
 
 💡 **提示**：
 - 直接发送消息即可与 Claude/Codex 对话
@@ -908,7 +953,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const fromAid = msg.from ?? '';
         const payload = msg.payload ?? '';
         const text = this.extractTextPayload(payload, fromAid);
-        const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
+        const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
         // 回声过滤：自己发出的消息会被 gateway fanout 回来，
@@ -953,7 +998,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // device_id 仅 SDK 内部多实例去重用，evolclaw session 层面跨端共享会话
         const chatId = fromAid;
         // 解析对端身份（30天缓存）
-        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, this.agentDir, this.client, false);
+        const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, selfAgentDir, this.client, false);
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
@@ -962,8 +1008,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply')
             return;
-        // menu.query：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
-        if (p2pPayloadType === 'menu.query') {
+        // menu.* 协议：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
+        if (AUNChannel.MENU_REQUEST_TYPES.has(p2pPayloadType)) {
             this.acknowledgeImmediately(messageId, seq);
             this.dispatchMessage({
                 channelId: chatId, userId: fromAid,
@@ -986,8 +1032,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const isSystemP2P = p2pPayloadType === 'event';
         this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode);
         const replyContext = { metadata: { encrypted: msgEncrypted, chatmode: msgChatmode } };
-        if (taskId)
-            replyContext.threadId = taskId;
+        if (threadId)
+            replyContext.threadId = threadId;
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -995,7 +1041,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             chatType: 'private',
             messageId,
             seq,
-            taskId,
+            threadId,
             mentions,
             peerName: displayName || undefined,
             peerType: peerIdentity.type,
@@ -1010,7 +1056,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const senderAid = msg.sender_aid ?? '';
         const payload = msg.payload ?? '';
         const text = this.extractTextPayload(payload, groupId, senderAid);
-        const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
+        const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
         // Extract structured mentions from payload (e.g. payload.mentions: ["evolai.agentid.pub"])
@@ -1068,8 +1114,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         {
             const payloadObj = (payload && typeof payload === 'object') ? payload : null;
             const payloadType = payloadObj?.type ?? '';
-            // menu.query：自定义消息快速路径
-            if (payloadType === 'menu.query') {
+            // menu.* 协议：自定义消息快速路径
+            if (AUNChannel.MENU_REQUEST_TYPES.has(payloadType)) {
                 this.acknowledgeImmediately(messageId, seq);
                 this.dispatchMessage({
                     channelId: groupId, userId: senderAid,
@@ -1168,7 +1214,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 finalText = parts.join('\n\n');
             }
         }
-        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, this.agentDir, this.client, false);
+        const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, selfAgentDir, this.client, false);
         const shortAid = this.getShortAid(senderAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
@@ -1200,9 +1247,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             chatType: 'group',
             messageId,
             seq,
-            taskId,
+            threadId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted, messageId, msgChatmode),
+            replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode),
         });
     }
     dispatchMessage(event) {
@@ -1252,8 +1299,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // 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 };
+        if (!replyContext && event.threadId) {
+            replyContext = { threadId: event.threadId };
         }
         this.messageHandler({
             channelId: event.channelId || '',
@@ -1266,7 +1313,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             peerName: event.peerName,
             peerType: event.peerType,
             messageId: event.messageId,
-            threadId: event.taskId,
+            threadId: event.threadId,
             mentions: mentionObjects,
             replyContext,
         }).catch(err => {
@@ -1707,6 +1754,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const channelId = entry.channelId;
         const finalText = entry.text;
         const context = entry.context;
+        // 从 context.metadata.source 读取 source，默认为 'daemon'
+        const source = context?.metadata?.source ?? 'daemon';
         const payload = { type: 'text', text: finalText };
         if (this.isGroupId(channelId)) {
             const extracted = this.extractMentionAidsFromText(finalText);
@@ -1720,7 +1769,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (context?.metadata?.chatmode)
             payload.chatmode = context.metadata.chatmode;
         // 诊断日志：记录 payload 构造结果（含 task_id / thread_id / chatmode）
-        logger.info(`${this.logPrefix()} deliverTextEntry: channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} chatmode=${payload.chatmode ?? 'none'} textLen=${finalText.length}`);
+        logger.info(`${this.logPrefix()} deliverTextEntry: channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} chatmode=${payload.chatmode ?? 'none'} source=${source} textLen=${finalText.length}`);
         const isGroup = this.isGroupId(channelId);
         const targetAid = channelId;
         const encryptTarget = isGroup ? channelId : targetAid;
@@ -1746,7 +1795,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${mid} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
                     this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
-                    this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true);
+                    this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true, 'text', source);
                 }
             }
             else {
@@ -1759,7 +1808,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     logger.info(`${this.logPrefix()} message.send ok: to=${this.peerLabel(targetAid)} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: targetAid, msgId: result.message_id, kind: 'text', len: finalText.length });
                     this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
-                    this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false);
+                    this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false, 'text', source);
                 }
             }
             return true;
@@ -1802,7 +1851,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
     }
     /** 出站消息写入 messages.jsonl（message.send/group.send/thought.put 成功后调用） */
-    appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text') {
+    appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text', source = 'daemon') {
         try {
             const sessionsDir = resolvePaths().sessionsDir;
             const selfId = this.config.aid;
@@ -1822,6 +1871,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 encrypt,
                 chatmode,
                 msgType,
+                source,
             }));
         }
         catch (e) {
@@ -1854,12 +1904,24 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         try {
             const itemCount = Array.isArray(payload?.items) ? payload.items.length : 0;
             const stage = payload?.stage ?? `items=${itemCount}`;
-            // 提取 thought 文本（取最后一项的 text 或 content 字段）
+            // 提取 thought 文本（只对 kind=text 的 item 写 jsonl，过滤 tool_use/tool_result 等结构化项）
             const items = payload?.items;
             let thoughtText;
             if (Array.isArray(items) && items.length > 0) {
                 const lastItem = items[items.length - 1];
-                thoughtText = lastItem?.text || lastItem?.content || (typeof lastItem === 'string' ? lastItem : undefined);
+                // 优先 text 字段（kind=text 的 item），否则 content
+                if (lastItem?.kind === 'text' && lastItem.text) {
+                    thoughtText = lastItem.text;
+                }
+                else if (lastItem?.text) {
+                    thoughtText = lastItem.text;
+                }
+                else if (lastItem?.content) {
+                    thoughtText = lastItem.content;
+                }
+                else if (typeof lastItem === 'string') {
+                    thoughtText = lastItem;
+                }
             }
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
@@ -1867,7 +1929,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 const tid = putRes?.thought_id;
                 logger.info(`${this.logPrefix()} thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
-                // thought jsonl 写入已改为按 LLM 调用次数统计（在 complete 事件处写入），此处不再写
+                // 文本类 thought 写入 jsonl（只对有 text 的 item，过滤 tool 等结构化项）
+                if (thoughtText) {
+                    this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, true, 'thought', 'daemon');
+                }
             }
             else {
                 params.to = targetId;
@@ -1875,7 +1940,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 const tid = putRes?.thought_id;
                 logger.info(`${this.logPrefix()} thought.put ok p2p=${this.peerLabel(targetId)} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
-                // thought jsonl 写入已改为按 LLM 调用次数统计（在 complete 事件处写入），此处不再写
+                if (thoughtText) {
+                    this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, false, 'thought', 'daemon');
+                }
             }
         }
         catch (e) {
@@ -2303,13 +2370,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     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)) {
+            const mdPath = agentMdPathFn(aidName);
+            if (!fs.existsSync(mdPath)) {
                 // 异步拉取，不阻塞连接流程
                 this.fetchAndCacheSelfName(aidName);
                 return undefined;
             }
-            const content = fs.readFileSync(agentMdPath, 'utf-8');
+            const content = fs.readFileSync(mdPath, 'utf-8');
             const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
             if (!fmMatch)
                 return undefined;
@@ -2351,7 +2418,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!this.client)
             return { type: null };
         try {
-            const md = await this.client.auth.downloadAgentMd(aid);
+            const { agentmdSync } = await import('../aun/aid/agentmd.js');
+            const result = await agentmdSync(aid, { client: this.client });
+            const md = result.content ?? '';
             const typeMatch = md.match(/^type:\s*["']?(\w+)["']?/m);
             const nameMatch = md.match(/^name:\s*["']?(.+?)["']?\s*$/m);
             const type = typeMatch?.[1] === 'human' ? 'human' : 'ai';
@@ -2363,7 +2432,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
         catch (e) {
             logger.debug(`${this.logPrefix()} fetchPeerInfo failed for ${aid}: ${e}`);
-            return { type: null }; // no agent.md → unknown
+            return { type: null };
         }
     }
     /** 同步取 peerInfo 缓存，未命中返回 undefined，不发起任何网络请求。 */
@@ -2379,12 +2448,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     async uploadAgentMd(content) {
         if (!this.client)
             throw new Error('not connected');
-        await this.client.auth.uploadAgentMd(content);
+        const { agentMdPath } = await import('../paths.js');
+        const localPath = agentMdPath(this.config.aid);
+        fs.mkdirSync(path.dirname(localPath), { recursive: true });
+        fs.writeFileSync(localPath, content, 'utf-8');
+        await this.client.publishAgentMd();
     }
     async downloadAgentMd(aid) {
         if (!this.client)
             throw new Error('not connected');
-        return this.client.auth.downloadAgentMd(aid);
+        const { agentmdSync } = await import('../aun/aid/agentmd.js');
+        const result = await agentmdSync(aid, { client: this.client });
+        return result.content ?? '';
     }
 }
 // Plugin implementation
@@ -2420,6 +2495,7 @@ export class AUNChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name, // channelName 实际上就是 channelKey
                 capabilities: { file: true, image: true, interaction: true, markdown: true, thought: true, status: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -2464,10 +2540,8 @@ export class AUNChannelPlugin {
                                 await channel.sendThought(channelId, envelope.taskId, aunPayload, ctx);
                             }
                             else {
-                                await Promise.all([
-                                    channel.sendThought(channelId, envelope.taskId, aunPayload, ctx),
-                                    channel.sendStructured(channelId, aunPayload, ctx),
-                                ]);
+                                // interactive 模式不发 thought.put，只写入消息历史
+                                await channel.sendStructured(channelId, aunPayload, ctx);
                             }
                             return;
                         }

package/dist/channels/dingtalk.js

@@ -447,6 +447,7 @@ export class DingtalkChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;

package/dist/channels/feishu.js

@@ -329,12 +329,11 @@ export class FeishuChannel {
                             }
                             logger.info(`[Feishu] CommandCard trigger: command=${value._command}, operator=${operatorId}`);
                             if (this.messageHandler) {
-                                // Feishu chatId 前缀：oc_ = group chat，ou_ = private user open_id
-                                const chatType = typeof chatId === 'string' && chatId.startsWith('oc_') ? 'group' : 'private';
+                                // 卡片回调不传 chatType——oc_ 前缀不区分群聊/单聊，
+                                // 由 ensureSession 从已有 session 中继承正确的 chatType
                                 await this.messageHandler({
                                     channelId: chatId,
                                     content: value._command,
-                                    chatType,
                                     peerId: operatorId,
                                     messageId: `card-trigger-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                                     source: 'card-trigger',
@@ -1327,6 +1326,7 @@ export class FeishuChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -1424,7 +1424,8 @@ export class FeishuChannelPlugin {
                 registerBridge(bridge, channelType) {
                     bridge.register(adapter.channelName, (handler) => channel.onMessage(async ({ channelId: chatId, content, images, peerId, peerName, messageId, mentions, threadId, rootId, chatType, source }) => {
                         await handler({
-                            channel: adapter.channelName, channelType, channelId: chatId, content, images, chatType,
+                            channel: adapter.channelName, channelType, channelId: chatId, content, images,
+                            chatType: chatType || 'private',
                             peerId: peerId || '', peerName, messageId, mentions, threadId,
                             replyContext: threadId ? { replyToMessageId: rootId ?? threadId, replyInThread: true } : undefined,
                             source,

package/dist/channels/qqbot.js

@@ -334,6 +334,7 @@ export class QQBotChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;

package/dist/channels/wechat.js

@@ -730,6 +730,7 @@ export class WechatChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true },
                 send: async (envelope, payload) => {
                     const channelId = envelope.channelId;

package/dist/channels/wecom.js

@@ -490,6 +490,7 @@ export class WecomChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;