evolclaw 2.7.2 → 2.8.0

package/dist/agents/claude-runner.js

@@ -204,7 +204,7 @@ export class AgentRunner {
         // 没有交互上下文（无渠道适配器），回退到纯文本
         const permCtx = this.permissionContexts.get(sessionId);
         if (!permCtx?.adapter?.sendInteraction || !permCtx?.channelId) {
-            return this.handleAskUserQuestionFallback(input, questions);
+            return this.handleAskUserQuestionFallback(sessionId, input, questions);
         }
         const answers = {};
         // 从 permCtx 构造 per-session 的发送函数，避免全局 sendPromptFn 被其他 channel 实例覆盖
@@ -307,20 +307,43 @@ export class AgentRunner {
         return { behavior: 'allow', updatedInput, decisionClassification: 'user_temporary' };
     }
     /**
-     * AskUserQuestion 纯文本 fallback：发送文本格式的问题，直接 allow
+     * AskUserQuestion 纯文本 fallback：发送选项列表，等待用户通过 /ask 命令选择
+     * 注册到 interactionRouter，用户回复 /ask 1 或 /ask 自定义内容
      */
-    async handleAskUserQuestionFallback(input, questions) {
-        // 自动选择每个问题的第一个选项
+    async handleAskUserQuestionFallback(sessionId, input, questions) {
+        const permCtx = this.permissionContexts.get(sessionId);
+        const sendPrompt = permCtx?.adapter && permCtx?.channelId
+            ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
+            : this.sendPromptFn;
         const answers = {};
         if (questions?.length) {
-            const lines = questions.map(q => {
-                const firstLabel = q.options[0]?.label || '';
-                answers[q.question] = firstLabel;
+            for (const q of questions) {
                 const optText = q.options.map((o, i) => `  ${i + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n');
-                return `${q.question}\n${optText}\n  → 自动选择：${firstLabel}`;
-            });
-            if (this.sendPromptFn) {
-                await this.sendPromptFn(`💬 以下问题已自动选择第一项：\n\n${lines.join('\n\n')}`);
+                const prompt = `💬 ${q.question}\n${optText}\n\n回复 /ask <数字> 选择，或 /ask <自定义内容>`;
+                if (sendPrompt && permCtx?.interactionRouter) {
+                    await sendPrompt(prompt);
+                    const requestId = `ask-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+                    const answer = await new Promise((resolve) => {
+                        permCtx.interactionRouter.register(requestId, sessionId, (action) => {
+                            const num = parseInt(action.trim(), 10);
+                            if (num >= 1 && num <= q.options.length) {
+                                resolve(q.options[num - 1].label);
+                            }
+                            else {
+                                resolve(action.trim());
+                            }
+                        }, { timeoutMs: 120_000, onTimeout: () => resolve(q.options[0]?.label || '') });
+                    });
+                    answers[q.question] = answer;
+                }
+                else {
+                    // 无交互能力，自动选第一项
+                    const firstLabel = q.options[0]?.label || '';
+                    answers[q.question] = firstLabel;
+                    if (sendPrompt) {
+                        await sendPrompt(`${prompt}\n  → 自动选择：${firstLabel}`);
+                    }
+                }
             }
         }
         const updatedInput = { ...input, answers };
@@ -331,51 +354,71 @@ export class AgentRunner {
      */
     async handleExitPlanMode(sessionId, input, options) {
         const permCtx = this.permissionContexts.get(sessionId);
-        // 从 permCtx 构造 per-session 的发送函数，避免全局 sendPromptFn 被其他 channel 实例覆盖
         const sendPrompt = permCtx?.adapter && permCtx?.channelId
             ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
             : this.sendPromptFn;
-        // 无交互上下文，直接 allow（防御性兜底）
-        if (!permCtx?.adapter?.sendInteraction || !permCtx?.channelId || !sendPrompt) {
+        // 无任何交互能力，直接 allow
+        if (!permCtx?.channelId || !sendPrompt) {
             return { behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' };
         }
-        const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const interaction = {
-            type: 'interaction',
-            id: requestId,
-            kind: {
-                kind: 'action',
-                title: '📋 计划审批',
-                body: 'AI 已完成规划，等待审批。\n请查看以上计划内容后决定。',
-                buttons: [
-                    { key: 'approve', label: '✅ 批准执行', style: 'primary' },
-                    { key: 'reject', label: '❌ 拒绝', style: 'danger' },
-                ],
-            },
-            channelId: permCtx.channelId,
-            sessionId,
-        };
+        // 尝试发送交互卡片
         let cardSent = false;
-        try {
-            const result = await permCtx.adapter.sendInteraction(permCtx.channelId, interaction, permCtx.replyContext);
-            cardSent = !!result;
-        }
-        catch (err) {
-            logger.warn('[AgentRunner] ExitPlanMode card send failed:', err);
-        }
-        if (!cardSent) {
-            await sendPrompt('📋 计划审批\nAI 已完成规划，等待审批。\n回复 /plan approve 批准执行 | /plan reject 拒绝');
+        if (permCtx.adapter?.sendInteraction) {
+            const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+            const interaction = {
+                type: 'interaction',
+                id: requestId,
+                kind: {
+                    kind: 'action',
+                    title: '📋 计划审批',
+                    body: 'AI 已完成规划，等待审批。\n请查看以上计划内容后决定。',
+                    buttons: [
+                        { key: 'approve', label: '✅ 批准执行', style: 'primary' },
+                        { key: 'reject', label: '❌ 拒绝', style: 'danger' },
+                    ],
+                },
+                channelId: permCtx.channelId,
+                sessionId,
+            };
+            try {
+                const result = await permCtx.adapter.sendInteraction(permCtx.channelId, interaction, permCtx.replyContext);
+                cardSent = !!result;
+            }
+            catch (err) {
+                logger.warn('[AgentRunner] ExitPlanMode card send failed:', err);
+            }
+            if (cardSent) {
+                return new Promise((resolve) => {
+                    permCtx.interactionRouter?.register(requestId, sessionId, (action) => {
+                        if (action === 'approve') {
+                            resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
+                        }
+                        else {
+                            resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
+                        }
+                    });
+                });
+            }
         }
-        return new Promise((resolve) => {
-            permCtx?.interactionRouter?.register(requestId, sessionId, (action) => {
-                if (action === 'approve') {
-                    resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
-                }
-                else {
-                    resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
-                }
+        // 文本 fallback：注册到 interactionRouter，等待用户 /ask 回复
+        if (permCtx.interactionRouter) {
+            await sendPrompt('📋 计划审批\nAI 已完成规划，等待审批。\n\n  1. 批准执行\n  2. 拒绝\n\n回复 /ask 1 批准，/ask 2 拒绝：');
+            const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+            return new Promise((resolve) => {
+                permCtx.interactionRouter.register(requestId, sessionId, (action) => {
+                    const trimmed = action.trim();
+                    if (trimmed === '2' || trimmed.toLowerCase() === 'reject' || trimmed === '拒绝') {
+                        resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
+                    }
+                    else {
+                        resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
+                    }
+                }, { timeoutMs: 300_000, onTimeout: () => resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' }) });
             });
-        });
+        }
+        // 无交互能力，发提示后直接 allow
+        await sendPrompt('📋 计划审批\nAI 已完成规划，自动批准执行。');
+        return { behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' };
     }
     /**
      * SDK 原始事件 → 标准 AgentEvent 转换

package/dist/channels/aun.js

@@ -131,8 +131,27 @@ export class AUNChannel {
             .replace(/[ \t]+/g, ' ')
             .trim();
     }
-    buildGroupReplyContext(taskId, senderAid) {
-        const replyContext = {};
+    extractMentionAids(mentions) {
+        const aids = [];
+        for (const m of mentions) {
+            if (typeof m === 'string')
+                aids.push(m);
+            else if (m && typeof m === 'object' && typeof m.aid === 'string')
+                aids.push(m.aid);
+        }
+        return aids;
+    }
+    hasMentionAll(mentions) {
+        for (const m of mentions) {
+            if (m === 'all')
+                return true;
+            if (m && typeof m === 'object' && m.scope === 'all')
+                return true;
+        }
+        return false;
+    }
+    buildGroupReplyContext(taskId, senderAid, encrypted) {
+        const replyContext = { metadata: { encrypted } };
         if (taskId)
             replyContext.threadId = taskId;
         replyContext.peerId = senderAid;
@@ -167,6 +186,11 @@ export class AUNChannel {
     peerE2ee = new Map();
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
     plaintextRecv = 0;
+    sessionModeResolver;
+    static PROACTIVE_ALLOW_TYPES = new Set([
+        'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
+        'merge', 'link', 'location', 'personal_card',
+    ]);
     // Reconnect state (TS-layer fallback, on top of SDK auto_reconnect)
     intentionalDisconnect = false;
     reconnectAttempt = 0;
@@ -555,16 +579,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.debug(`[AUN] P2P dropped: echo from self (from=${fromAid} mid=${messageId})`);
             return;
         }
-        // E2EE 能力探测：收到加密消息则标记对端支持，明文则计数审计
+        // 记录入站消息加密状态，透传到出站 ReplyContext
         const msgEncrypted = !!(msg.e2ee);
-        if (fromAid) {
-            if (msgEncrypted) {
-                this.peerE2ee.set(fromAid, { ok: true, ts: Date.now() });
-            }
-            else {
-                this.plaintextRecv++;
-            }
-        }
+        if (!msgEncrypted)
+            this.plaintextRecv++;
         // Detect @mentions
         const mentions = [];
         if (this._aid && text.includes(`@${this._aid}`)) {
@@ -600,7 +618,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const peerInfo = await this.fetchPeerInfo(fromAid);
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerInfo.name || shortAid;
-        logger.info(`[AUN] P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} text=${finalText.slice(0, 60)}`);
+        logger.info(`[AUN] P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} text=${finalText.slice(0, 60)}`);
+        const replyContext = { metadata: { encrypted: msgEncrypted } };
+        if (taskId)
+            replyContext.threadId = taskId;
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -612,6 +633,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             mentions,
             peerName: displayName || undefined,
             peerType: peerInfo.type || 'unknown',
+            replyContext,
         });
     }
     async handleIncomingGroupMessage(data) {
@@ -640,16 +662,33 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.debug(`[AUN] Group dropped: own message (group=${groupId} mid=${messageId})`);
             return;
         }
-        // E2EE 能力探测：收到加密群消息则标记发送者支持
-        const msgEncrypted = !!(msg.e2ee);
-        if (senderAid) {
-            if (msgEncrypted) {
-                this.peerE2ee.set(senderAid, { ok: true, ts: Date.now() });
-            }
-            else {
-                this.plaintextRecv++;
+        // ── proactive 模式入站白名单 ──
+        if (this.sessionModeResolver) {
+            const sessionMode = await this.sessionModeResolver(groupId).catch(() => undefined);
+            if (sessionMode === 'proactive') {
+                const payloadObj = (payload && typeof payload === 'object') ? payload : null;
+                const payloadType = payloadObj?.type ?? '';
+                if (!AUNChannel.PROACTIVE_ALLOW_TYPES.has(payloadType)) {
+                    this.acknowledgeImmediately(messageId, seq);
+                    logger.debug(`[AUN] Group dropped (proactive deny): type=${payloadType} group=${groupId} sender=${senderAid} mid=${messageId}`);
+                    return;
+                }
+                const rawText = typeof payloadObj?.text === 'string' ? payloadObj.text : '';
+                const rawMentions = Array.isArray(payloadObj?.mentions) ? payloadObj.mentions : [];
+                const mentionAids = this.extractMentionAids(rawMentions);
+                const mentionsSelf = !!this._aid && (this.hasExplicitMention(rawText, this._aid) || mentionAids.includes(this._aid));
+                const mentionsAll = this.hasExplicitMention(rawText, 'all') || this.hasMentionAll(rawMentions);
+                if (!mentionsSelf && !mentionsAll) {
+                    this.acknowledgeImmediately(messageId, seq);
+                    logger.debug(`[AUN] Group dropped (proactive whitelist): type=${payloadType} group=${groupId} sender=${senderAid} mid=${messageId}`);
+                    return;
+                }
             }
         }
+        // 记录入站消息加密状态，透传到出站 ReplyContext
+        const msgEncrypted = !!(msg.e2ee);
+        if (!msgEncrypted)
+            this.plaintextRecv++;
         // dispatch_mode from server tells agent how to work in this group
         const dispatchMode = msg.dispatch_mode ?? payload?.dispatch_mode ?? 'mention';
         const mentionedSelf = this._aid
@@ -712,7 +751,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             seq,
             taskId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid),
+            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted),
         });
     }
     dispatchMessage(event) {
@@ -812,6 +851,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     onMessage(handler) {
         this.messageHandler = handler;
     }
+    setSessionModeResolver(resolver) {
+        this.sessionModeResolver = resolver;
+    }
     onRecall(handler) {
         this.recallHandler = handler;
     }
@@ -851,17 +893,25 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             payload.chat_id = channelId;
         }
         const encryptTarget = isGroup ? channelId : targetAid;
-        const encrypt = this.shouldEncrypt(encryptTarget);
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(encryptTarget);
         const params = { payload, encrypt };
         try {
             if (isGroup) {
                 params.group_id = channelId;
                 const result = await this.callAndTrace('group.send', params);
                 if (!result || !result.message_id) {
-                    logger.warn(`[AUN] group.send returned no message_id: ${JSON.stringify(result)}`);
+                    const dispatchStatus = result?.message_dispatch?.status;
+                    if (dispatchStatus === 'debounced' || dispatchStatus === 'dispatched') {
+                        logger.info(`[AUN] group.send ok (${dispatchStatus}): group=${channelId} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
+                    }
+                    else {
+                        logger.warn(`[AUN] group.send returned no message_id: ${JSON.stringify(result)}`);
+                    }
                 }
                 else {
-                    logger.info(`[AUN] group.send ok: group=${channelId} mid=${result.message_id} text=${finalText.slice(0, 60)}`);
+                    logger.info(`[AUN] group.send ok: group=${channelId} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                 }
             }
             else {
@@ -871,7 +921,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     logger.warn(`[AUN] message.send returned no message_id: ${JSON.stringify(result)}`);
                 }
                 else {
-                    logger.info(`[AUN] message.send ok: to=${targetAid} mid=${result.message_id} text=${finalText.slice(0, 60)}`);
+                    logger.info(`[AUN] message.send ok: to=${targetAid} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                 }
             }
         }
@@ -917,7 +967,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
      * selector 使用 context: { type: 'task', id: taskId }
      * 存储键：group_id/peer_aid + sender_aid + context.type + context.id
      */
-    async sendThought(channelId, taskId, payload) {
+    async sendThought(channelId, taskId, payload, context) {
         if (!this.connected || !this.client)
             return;
         if (!taskId)
@@ -925,22 +975,25 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // Multi-instance routing
         const colonIdx = channelId.indexOf(':');
         const targetId = colonIdx > 0 ? channelId.substring(0, colonIdx) : channelId;
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(targetId);
         const params = {
             context: { type: 'task', id: taskId },
             payload,
-            encrypt: true,
+            encrypt,
         };
         try {
             const stage = payload?.stage ?? 'unknown';
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
                 await this.callAndTrace('group.thought.put', params);
-                logger.info(`[AUN] thought.put ok group=${targetId} task=${taskId} stage=${stage}`);
+                logger.info(`[AUN] thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt}`);
             }
             else {
                 params.to = targetId;
                 await this.callAndTrace('message.thought.put', params);
-                logger.info(`[AUN] thought.put ok p2p=${targetId} task=${taskId} stage=${stage}`);
+                logger.info(`[AUN] thought.put ok p2p=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt}`);
             }
         }
         catch (e) {
@@ -1035,7 +1088,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 filePayload.chat_id = channelId;
             }
             const encryptTarget = isGroup ? channelId : fileTargetAid;
-            const encrypt = this.shouldEncrypt(encryptTarget);
+            const encrypt = context?.metadata?.encrypted != null
+                ? !!(context.metadata.encrypted)
+                : this.shouldEncrypt(encryptTarget);
             const params = { payload: filePayload, encrypt };
             try {
                 if (isGroup) {
@@ -1127,7 +1182,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             payload.chat_id = channelId;
         }
         const encryptTarget = isGroup ? channelId : statusTargetAid;
-        const encrypt = this.shouldEncrypt(encryptTarget);
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(encryptTarget);
         const params = { payload, encrypt };
         const sendWithFallback = (method) => {
             this.client.call(method, params).catch(e => {
@@ -1154,7 +1211,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.trace('OUT', 'message.send.status', params);
             sendWithFallback('message.send');
         }
-        logger.info(`[AUN] task.${status} task=${taskId} session=${sessionId} target=${channelId}`);
+        logger.info(`[AUN] task.${status} task=${taskId} session=${sessionId} encrypt=${encrypt} target=${channelId}`);
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
@@ -1367,7 +1424,7 @@ export class AUNChannelPlugin {
                 sendCustomPayload: (id, payload) => channel.sendCustomPayload(id, payload),
                 uploadAgentMd: (content) => channel.uploadAgentMd(content),
                 downloadAgentMd: (aid) => channel.downloadAgentMd(aid),
-                putThought: (id, taskId, payload) => channel.sendThought(id, taskId, payload),
+                putThought: (id, taskId, payload, context) => channel.sendThought(id, taskId, payload, context),
                 _selfAid: () => channel.getStatus().aid,
                 _selfName: () => channel.getSelfName(),
             };

package/dist/core/command-handler.js

@@ -104,7 +104,7 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/aid', '/agentmd', '/chatmode'];
+const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/aid', '/agentmd', '/chatmode', '/ask'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -113,7 +113,7 @@ const aliases = {
     '/rw': '/rewind'
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/aid', '/agentmd'];
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/aid', '/agentmd', '/ask'];
 export class CommandHandler {
     sessionManager;
     config;
@@ -401,6 +401,10 @@ export class CommandHandler {
                                 { value: 'high', label: 'High' },
                                 { value: 'max', label: 'Max' },
                             ] } },
+                    { cmd: '/chatmode', label: '切换会话模式', desc: '控制 Agent 主动性（被动响应或主动推进）', next: { type: 'select', items: [
+                                { value: 'interactive', label: '交互模式', desc: '仅在收到消息时响应' },
+                                { value: 'proactive', label: '主动模式', desc: 'Agent 可主动推进任务' },
+                            ] } },
                 ]
             });
             items.push({
@@ -515,6 +519,57 @@ export class CommandHandler {
         }
         return null;
     }
+    /** 菜单 exec 模式：查询状态或执行命令，返回结构化数据 */
+    async execMenu(cmd, mode, channel, channelId, userId) {
+        const session = await this.sessionManager.getActiveSession(channel, channelId);
+        if (!session)
+            return { error: '当前无活跃会话' };
+        const trimmed = cmd.trim();
+        const cmdBase = trimmed.split(' ')[0];
+        if (!cmdBase)
+            return { error: '缺少命令' };
+        const arg = trimmed.slice(cmdBase.length).trim();
+        if (cmdBase === '/perm') {
+            const currentMode = session.metadata?.permissionMode ?? DEFAULT_PERMISSION_MODE;
+            if (mode === 'query') {
+                return { data: { mode: currentMode } };
+            }
+            // update
+            if (!arg)
+                return { error: '缺少目标模式' };
+            const identity = this.sessionManager.resolveIdentity(channel, userId);
+            if (identity.role !== 'owner')
+                return { error: '无权限' };
+            const permAgent = this.getAgent(session.agentId);
+            const validModes = hasPermissionController(permAgent)
+                ? permAgent.listModes().filter(m => m.available).map(m => m.key)
+                : ['auto', 'bypass', 'plan', 'edit', 'request', 'noask'];
+            if (!validModes.includes(arg))
+                return { error: `无效模式: ${arg}` };
+            const metadata = { ...(session.metadata || {}), permissionMode: arg };
+            await this.sessionManager.updateSession(session.id, { metadata });
+            return { data: { mode: arg } };
+        }
+        if (cmdBase === '/chatmode') {
+            const currentMode = session.sessionMode || 'interactive';
+            if (mode === 'query') {
+                return { data: { mode: currentMode } };
+            }
+            // update
+            if (!arg)
+                return { error: '缺少目标模式' };
+            if (arg !== 'interactive' && arg !== 'proactive')
+                return { error: `无效模式: ${arg}` };
+            const identity = this.sessionManager.resolveIdentity(channel, userId);
+            const chatType = session.chatType || 'private';
+            if (chatType === 'group' && identity.role !== 'owner' && identity.role !== 'admin') {
+                return { error: '无权限：群聊中仅管理员可切换' };
+            }
+            await this.sessionManager.updateSession(session.id, { sessionMode: arg });
+            return { data: { mode: arg } };
+        }
+        return { error: `不支持 exec 模式: ${cmdBase}` };
+    }
     isCommand(content) {
         return content === '/p' || content === '/s' || quickCommandPrefixes.some(cmd => content.startsWith(cmd));
     }
@@ -817,6 +872,31 @@ export class CommandHandler {
             const allModeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'auto|bypass|request|edit|plan|noask';
             return `❌ 未知参数: ${args}\n用法: /perm <${allModeKeys}> 或 /perm allow|always|deny`;
         }
+        // /ask 命令：回答 AskUserQuestion / ExitPlanMode 的交互式问题
+        if (normalizedContent.startsWith('/ask')) {
+            const args = normalizedContent.slice(4).trim();
+            if (!args) {
+                // 无参数：列出当前 pending 的交互请求
+                const askResult = await this.ensureSession(channel, channelId, threadId);
+                if ('error' in askResult)
+                    return askResult.error;
+                const pendingIds = this.interactionRouter?.getPending(askResult.session.id) || [];
+                if (pendingIds.length === 0)
+                    return '当前没有待回答的问题';
+                return `当前有 ${pendingIds.length} 个待回答问题，请回复 /ask <选项>`;
+            }
+            const askResult = await this.ensureSession(channel, channelId, threadId);
+            if ('error' in askResult)
+                return askResult.error;
+            const { session: askSession } = askResult;
+            const pendingIds = this.interactionRouter?.getPending(askSession.id) || [];
+            if (pendingIds.length === 0)
+                return '❌ 当前没有待回答的问题';
+            // 路由到最早的 pending interaction
+            const targetId = pendingIds[0];
+            this.interactionRouter.handle({ type: 'interaction.response', id: targetId, action: args, operatorId: userId });
+            return `✓ 已回答`;
+        }
         // /agent 命令：查看或切换 Agent 后端
         if (normalizedContent === '/agent' || normalizedContent.startsWith('/agent ')) {
             const args = normalizedContent.slice(6).trim();
@@ -2809,6 +2889,7 @@ export class CommandHandler {
      * 从 session 恢复 ReplyContext，用于 ctl send 主动发送文本时的路由
      * - 群聊话题：metadata.replyContext.{threadId,peerId}
      * - 私聊：metadata.peerId
+     * - taskId/chatmode：从 processing_state 和 sessionMode 注入
      */
     buildCtlReplyContext(session) {
         const ctx = {};
@@ -2819,6 +2900,18 @@ export class CommandHandler {
             ctx.peerId = meta.replyContext.peerId;
         if (!ctx.peerId && meta?.peerId)
             ctx.peerId = meta.peerId;
+        const taskId = this.sessionManager.getActiveTaskId(session.id);
+        const chatmode = session.sessionMode || 'interactive';
+        const encrypted = this.sessionManager.getSessionEncrypt(session.id);
+        if (taskId || chatmode !== 'interactive' || encrypted != null) {
+            ctx.metadata = {};
+            if (taskId)
+                ctx.metadata.taskId = taskId;
+            if (chatmode !== 'interactive')
+                ctx.metadata.chatmode = chatmode;
+            if (encrypted != null)
+                ctx.metadata.encrypted = encrypted;
+        }
         return Object.keys(ctx).length > 0 ? ctx : undefined;
     }
     /**

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

@@ -151,8 +151,19 @@ export class MessageBridge {
         if (!parsed || typeof parsed !== 'object' || !parsed.type)
             return false;
         if (parsed.type === 'menu.query') {
-            const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
-            if (parsed.cmd) {
+            if (parsed.cmd && (parsed.mode === 'query' || parsed.mode === 'update')) {
+                // exec 模式：查询状态或执行命令
+                const result = await this.cmdHandler.execMenu(parsed.cmd, parsed.mode, channel, msg.channelId, msg.peerId);
+                const base = { type: 'menu.response', cmd: parsed.cmd };
+                const response = JSON.stringify('error' in result ? { ...base, error: result.error } : { ...base, data: result.data });
+                if (adapter?.sendCustomPayload) {
+                    adapter.sendCustomPayload(msg.channelId, response);
+                }
+                else {
+                    await sendReply(msg.channelId, response);
+                }
+            }
+            else if (parsed.cmd) {
                 // 动态子菜单查询
                 const items = await this.cmdHandler.getSubMenuItems(parsed.cmd, channel, msg.channelId, msg.peerId);
                 const response = JSON.stringify({ type: 'menu.response', cmd: parsed.cmd, items: items ?? [] });
@@ -165,6 +176,7 @@ export class MessageBridge {
             }
             else {
                 // 全量菜单
+                const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
                 const items = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
                 const response = JSON.stringify({ type: 'menu.response', items });
                 if (adapter?.sendCustomPayload) {

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

@@ -316,7 +316,8 @@ export class MessageProcessor {
             });
             const imageInfo = message.images && message.images.length > 0 ? ` [${message.images.length} image(s)]` : '';
             const modeInfo = isBackground ? ' [\u540e\u53f0]' : '';
-            logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}`);
+            const e2eeInfo = message.replyContext?.metadata?.encrypted != null ? ` encrypt=${message.replyContext.metadata.encrypted}` : '';
+            logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}${e2eeInfo}`);
             logger.info(`[MessageProcessor] session=${session.id} task=${taskId} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
             // 记录开始处理
             this.eventBus.publish({ type: 'message:processing', sessionId: session.id });
@@ -363,7 +364,7 @@ export class MessageProcessor {
             // Proactive 模式可观测：创建 ThoughtEmitter，将静默的流式事件转发为 thought
             // selector: context = { type: 'task', id: taskId }
             if (isProactive && adapter.putThought) {
-                thoughtEmitter = new ThoughtEmitter(adapter, message.channelId, taskId, chatmode);
+                thoughtEmitter = new ThoughtEmitter(adapter, message.channelId, taskId, chatmode, this.getReplyContext(message));
             }
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
             // 捕获当前消息的上下文（闭包），避免后续消息处理时串台
@@ -389,7 +390,10 @@ export class MessageProcessor {
             // 设置 per-session 权限模式（默认 bypass，所有角色统一）
             agent.setMode(session.metadata?.permissionMode ?? DEFAULT_PERMISSION_MODE);
             // 标记会话为处理中（实时持久化，重启后可恢复）
-            this.sessionManager.markProcessing(session.id);
+            this.sessionManager.markProcessing(session.id, taskId);
+            if (message.replyContext?.metadata?.encrypted != null) {
+                this.sessionManager.setSessionEncrypt(session.id, !!(message.replyContext.metadata.encrypted));
+            }
             logger.info(`[MessageProcessor] session ${session.id} marked as processing task=${taskId}`);
             // 检查是否因新消息自动中断 — 包装 prompt 让 Agent 知道上下文
             const prevInterruptReason = this.interruptedSessions.get(session.id);

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

@@ -14,8 +14,9 @@ export class ThoughtEmitter {
     channelId;
     taskId;
     chatmode;
+    replyContext;
     hasEmittedText = false;
-    constructor(adapter, channelId, taskId, chatmode = 'proactive') {
+    constructor(adapter, channelId, taskId, chatmode = 'proactive', replyContext) {
         if (!taskId) {
             throw new Error('[ThoughtEmitter] taskId is required at construction');
         }
@@ -23,6 +24,7 @@ export class ThoughtEmitter {
         this.channelId = channelId;
         this.taskId = taskId;
         this.chatmode = chatmode;
+        this.replyContext = replyContext;
         logger.info(`[ThoughtEmitter] created channel=${channelId} task=${taskId} chatmode=${chatmode}`);
     }
     async emit(event) {
@@ -45,7 +47,7 @@ export class ThoughtEmitter {
         payload.task_id = this.taskId;
         payload.chatmode = this.chatmode;
         try {
-            await this.adapter.putThought(this.channelId, this.taskId, payload);
+            await this.adapter.putThought(this.channelId, this.taskId, payload, this.replyContext);
         }
         catch (err) {
             logger.debug(`[ThoughtEmitter] putThought failed: ${err.message}`);

package/dist/core/session/session-manager.js

@@ -13,6 +13,7 @@ export class SessionManager {
     adminResolver;
     sessionModeResolver;
     fileAdapters = new Map();
+    sessionEncryptState = new Map();
     constructor(dbPath = resolvePaths().db, eventBus, ownerResolver, adminResolver) {
         ensureDir(path.dirname(dbPath));
         this.db = new DatabaseSync(dbPath);
@@ -428,11 +429,21 @@ export class SessionManager {
     }
     /**
      * 标记会话为处理中（实时写 DB，crash 也能恢复）
+     * processing_state 格式: "timestamp:taskId"
      */
-    markProcessing(sessionId) {
+    markProcessing(sessionId, taskId) {
         const now = Date.now();
+        const state = taskId ? `${now}:${taskId}` : String(now);
         this.db.prepare(`UPDATE sessions SET processing_state = ?, updated_at = ? WHERE id = ?`)
-            .run(String(now), now, sessionId);
+            .run(state, now, sessionId);
+    }
+    /** 从 processing_state 解析当前活跃 taskId */
+    getActiveTaskId(sessionId) {
+        const row = this.db.prepare(`SELECT processing_state FROM sessions WHERE id = ?`).get(sessionId);
+        if (!row?.processing_state)
+            return undefined;
+        const colonIdx = row.processing_state.indexOf(':');
+        return colonIdx > 0 ? row.processing_state.slice(colonIdx + 1) : undefined;
     }
     /**
      * 清除会话处理中状态
@@ -440,6 +451,13 @@ export class SessionManager {
     clearProcessing(sessionId) {
         this.db.prepare(`UPDATE sessions SET processing_state = NULL, updated_at = ? WHERE id = ?`)
             .run(Date.now(), sessionId);
+        this.sessionEncryptState.delete(sessionId);
+    }
+    setSessionEncrypt(sessionId, encrypted) {
+        this.sessionEncryptState.set(sessionId, encrypted);
+    }
+    getSessionEncrypt(sessionId) {
+        return this.sessionEncryptState.get(sessionId);
     }
     /**
      * 获取所有处于 processing 状态的会话（用于重启后恢复）
@@ -453,7 +471,8 @@ export class SessionManager {
         const now = Date.now();
         const result = [];
         for (const row of rows) {
-            const ts = parseInt(row.processing_state, 10);
+            const colonIdx = row.processing_state.indexOf(':');
+            const ts = parseInt(colonIdx > 0 ? row.processing_state.slice(0, colonIdx) : row.processing_state, 10);
             if (!isNaN(ts) && (now - ts) < maxAgeMs) {
                 result.push(this.rowToSession(row));
             }

package/dist/index.js

@@ -289,6 +289,14 @@ async function main() {
                     });
                 });
             }
+            // proactive 模式入站白名单：注入 sessionMode 查询器
+            if (typeof inst.channel.setSessionModeResolver === 'function') {
+                const chName = inst.adapter.channelName;
+                inst.channel.setSessionModeResolver(async (channelId) => {
+                    const session = await sessionManager.getActiveSession(chName, channelId);
+                    return session?.sessionMode;
+                });
+            }
         }
         if (channelType === 'dingtalk') {
             msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {

package/dist/templates/prompts.md

@@ -22,6 +22,7 @@
 调用 Bash 工具执行命令 ：evolclaw ctl send "<消息内容>"
 发送文件： evolclaw ctl file <路径>
 可多次调用发送多条消息 ，如果不想回复停止调用即可。
+禁止使用 AskUserQuestion 和 ExitPlanMode 工具——proactive 模式下应由你主动用 ctl send 与用户沟通。
 
 
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.7.2",
+  "version": "2.8.0",
   "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",
@@ -23,7 +23,7 @@
     "prepublishOnly": "npm run build && npm test"
   },
   "dependencies": {
-    "@agentunion/fastaun": "^0.2.15",
+    "@agentunion/fastaun": "^0.2.17",
     "@anthropic-ai/claude-agent-sdk": "^0.2.100",
     "image-type": "^6.0.0",
     "qrcode-terminal": "^0.12.0"