evolclaw 2.3.0 → 2.4.0

package/dist/channels/aun.js

@@ -16,6 +16,10 @@ export class AUNChannel {
         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;
@@ -48,16 +52,11 @@ export class AUNChannel {
         result = result.replace(/(^|\s)@all(?=$|\s|[.,!?;:，。！？；：]|[\u4e00-\u9fff])/gi, '$1');
         return result.replace(/[ \t]+/g, ' ').trim();
     }
-    buildGroupReplyContext(taskId, senderAid, text) {
+    buildGroupReplyContext(taskId, senderAid) {
         const replyContext = {};
         if (taskId)
             replyContext.threadId = taskId;
-        if (this.hasExplicitMention(text, 'all')) {
-            replyContext.mentionUserIds = ['all'];
-        }
-        else {
-            replyContext.mentionUserIds = [senderAid];
-        }
+        replyContext.peerId = senderAid;
         return replyContext;
     }
     acknowledgeImmediately(messageId, seq) {
@@ -150,6 +149,18 @@ export class AUNChannel {
             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}...`);
@@ -169,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`);
@@ -180,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;
         }
     }
@@ -225,6 +249,10 @@ export class AUNChannel {
         const taskId = msg.task_id;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
+        // 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);
@@ -234,8 +262,10 @@ export class AUNChannel {
             this.acknowledgeImmediately(messageId, seq);
             return;
         }
-        const mentionedSelf = this._aid ? this.hasExplicitMention(text, this._aid) : false;
-        const mentionedAll = this.hasExplicitMention(text, 'all');
+        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;
@@ -256,7 +286,7 @@ export class AUNChannel {
             seq,
             taskId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid, text),
+            replyContext: this.buildGroupReplyContext(taskId, senderAid),
         });
     }
     dispatchMessage(event) {
@@ -338,18 +368,17 @@ export class AUNChannel {
             finalText = '最终回复\n' + text;
         }
         this.sentCount.set(channelId, (this.sentCount.get(channelId) || 0) + 1);
-        // Render outbound mentions for group sends
-        if (channelId.startsWith('grp_') && context?.mentionUserIds?.length) {
-            const mentionPrefix = context.mentionUserIds.includes('all')
-                ? '@all '
-                : context.mentionUserIds.map(id => `@${id}`).join(' ') + ' ';
-            finalText = mentionPrefix + finalText;
+        // 群聊 @ 兜底：提示词已告知 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);
@@ -366,13 +395,9 @@ export class AUNChannel {
         }
     }
     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')
@@ -387,11 +412,11 @@ export class AUNChannel {
         };
         const params = {
             payload,
-            encrypt: true, persist: false,
+            encrypt: true,
         };
         if (context?.threadId)
             params.task_id = context.threadId;
-        if (channelId.startsWith('grp_')) {
+        if (this.isGroupId(channelId)) {
             params.group_id = channelId;
             this.trace('OUT', 'group.send.status', params);
             this.client.call('group.send', params).catch(e => {
@@ -421,7 +446,7 @@ export class AUNChannel {
         }
         const sendParams = {
             to: channelId, payload: payloadObj,
-            encrypt: true, persist: false,
+            encrypt: true,
         };
         this.trace('OUT', 'message.send.custom', sendParams);
         this.client.call('message.send', sendParams).catch(e => {
@@ -549,7 +574,7 @@ export class AUNChannelPlugin {
                 canCreateSession: (chatType, identity) => true,
                 canDeleteSession: (chatType, identity) => true,
                 canImportCliSession: (chatType, identity) => identity === 'owner',
-                messagePrefix: () => '',
+                messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
                 showMiddleResult: (chatType, identity) => {
                     const mode = inst.showActivities ?? config.showActivities ?? 'all';
                     if (mode === 'none')

package/dist/cli.js

@@ -6,6 +6,7 @@ import { promisify } from 'util';
 import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from './paths.js';
 import { loadConfig, validateConfigIntegrity, resolveAnthropicConfig } from './config.js';
 import { migrateProject } from './utils/migrate-project.js';
+import readline from 'readline';
 import { cmdInit } from './utils/init.js';
 import { ipcQuery } from './ipc.js';
 import { cmdInitWechat, cmdInitFeishu, cmdInitAun } from './utils/init-channel.js';
@@ -568,22 +569,111 @@ async function cmdStatus() {
         console.log('  (no log file yet)');
     }
 }
-function cmdLogs() {
+// Log line pattern: [timestamp] [LEVEL] [Module?] message
+const LOG_RE = /^(\[[^\]]+\]) (\[(?:INFO|WARN|ERROR|DEBUG)\]) ((?:\[[^\]]+\] )*)(.*)$/;
+const MAX_MSG = 200; // truncate long messages
+function makeColors(enabled) {
+    const e = (code) => enabled ? code : '';
+    return {
+        reset: e('\x1b[0m'), dim: e('\x1b[2m'), bold: e('\x1b[1m'),
+        red: e('\x1b[31m'), yellow: e('\x1b[33m'), cyan: e('\x1b[36m'),
+        magenta: e('\x1b[35m'), gray: e('\x1b[90m'),
+    };
+}
+function renderLogLine(line, opts) {
+    const m = line.match(LOG_RE);
+    if (!m)
+        return line; // passthrough non-standard lines (stack traces etc.)
+    const [, ts, levelTag, modulePart, msg] = m;
+    const level = levelTag.slice(1, -1); // strip brackets
+    // Level filter
+    if (opts.level) {
+        const want = opts.level.toUpperCase();
+        if (want === 'ERROR' && level !== 'ERROR')
+            return null;
+        if (want === 'WARN' && level !== 'WARN' && level !== 'ERROR')
+            return null;
+    }
+    // Module filter (case-insensitive substring match)
+    if (opts.module) {
+        const mod = modulePart.toLowerCase();
+        if (!mod.includes(opts.module.toLowerCase()))
+            return null;
+    }
+    // Truncate long messages (always, regardless of color)
+    const truncated = msg.length > MAX_MSG ? msg.slice(0, MAX_MSG) + '…' : msg;
+    const C = makeColors(opts.color);
+    // Color by level
+    const levelColor = level === 'ERROR' ? C.red : level === 'WARN' ? C.yellow : level === 'DEBUG' ? C.gray : '';
+    // Highlight user messages: [channel] channelId: text
+    const isUserMsg = modulePart && /^\S+: .+$/.test(truncated);
+    const renderedMsg = isUserMsg
+        ? C.cyan + truncated + C.reset
+        : levelColor + truncated + C.reset;
+    return (C.dim + ts + C.reset + ' ' +
+        levelColor + C.bold + levelTag + C.reset + ' ' +
+        C.magenta + modulePart.trimEnd() + C.reset +
+        (modulePart ? ' ' : '') +
+        renderedMsg);
+}
+function cmdLogs(args) {
+    const raw = args.includes('--raw');
+    const noColor = args.includes('--no-color');
+    const levelIdx = args.indexOf('--level');
+    const moduleIdx = args.indexOf('--module');
+    const level = levelIdx !== -1 ? args[levelIdx + 1] : undefined;
+    const module = moduleIdx !== -1 ? args[moduleIdx + 1] : undefined;
     const p = resolvePaths();
     const mainLog = path.join(p.logs, 'evolclaw.log');
     if (!fs.existsSync(mainLog)) {
         console.log(`❌ Log file not found: ${mainLog}`);
         process.exit(1);
     }
+    if (raw) {
+        // Raw mode: plain tail -f, no rendering at all
+        if (platform.isWindows) {
+            const tail = platform.tailFile(mainLog);
+            platform.onShutdown(() => tail.abort());
+        }
+        else {
+            const child = spawn('tail', ['-f', '-n', '50', mainLog], { stdio: 'inherit' });
+            child.on('exit', (code) => process.exit(code || 0));
+        }
+        return;
+    }
+    // Rendered mode: always filter+truncate, color depends on TTY
+    const useColor = !noColor && !!process.stdout.isTTY;
+    const opts = { level, module, color: useColor };
+    function processLine(line) {
+        const rendered = renderLogLine(line, opts);
+        if (rendered !== null)
+            process.stdout.write(rendered + '\n');
+    }
     if (platform.isWindows) {
-        // Windows: use fs.watch for live tail
-        const tail = platform.tailFile(mainLog);
-        platform.onShutdown(() => tail.abort());
+        // Windows: read existing content + watch
+        const existing = fs.readFileSync(mainLog, 'utf-8').split('\n').slice(-50);
+        existing.forEach(processLine);
+        let size = fs.statSync(mainLog).size;
+        const watcher = fs.watch(mainLog, () => {
+            const newSize = fs.statSync(mainLog).size;
+            if (newSize <= size)
+                return;
+            const buf = Buffer.alloc(newSize - size);
+            const fd = fs.openSync(mainLog, 'r');
+            fs.readSync(fd, buf, 0, buf.length, size);
+            fs.closeSync(fd);
+            size = newSize;
+            buf.toString().split('\n').forEach(l => l && processLine(l));
+        });
+        platform.onShutdown(() => watcher.close());
     }
     else {
-        // Unix: use tail -f
-        const child = spawn('tail', ['-f', mainLog], { stdio: 'inherit' });
+        // Unix: spawn tail -f, pipe through renderer
+        const child = spawn('tail', ['-f', '-n', '50', mainLog]);
+        const rl = readline.createInterface({ input: child.stdout });
+        rl.on('line', processLine);
         child.on('exit', (code) => process.exit(code || 0));
+        platform.onShutdown(() => { child.kill(); });
     }
 }
 /**
@@ -1201,7 +1291,7 @@ export async function main(args) {
             await cmdStatus();
             break;
         case 'logs':
-            cmdLogs();
+            cmdLogs(args.slice(1));
             break;
         case 'restart-monitor':
             await cmdRestartMonitor();
@@ -1227,7 +1317,10 @@ Commands:
   stop          停止服务
   restart       重启服务
   status        查看状态
-  logs          查看日志 (tail -f)
+  logs          查看日志 (tail -f, 着色渲染)
+                  --level error|warn   只显示指定级别及以上
+                  --module <name>      只显示指定模块（如 feishu、AgentRunner）
+                  --raw                原始输出，不着色
   tui           启动 AUN TUI 客户端
   diagnose      诊断启动环境（配置、数据库、进程）
   mv <old> <new>  迁移项目目录（保留 Claude/Codex/EvolClaw 会话）

package/dist/core/command-handler.js

@@ -324,15 +324,25 @@ export class CommandHandler {
      * 返回结构化命令菜单（供 menu.query 使用）
      * admin 看到全部命令分组，guest 仅看到用户级命令
      */
-    getMenuItems(isAdmin) {
+    getMenuItems(isAdmin, chatType = 'private') {
         const items = [];
+        if (!isAdmin && chatType === 'group') {
+            return [
+                {
+                    group: '其他',
+                    commands: [
+                        { cmd: '/status', label: '显示会话状态' },
+                        { cmd: '/help', label: '显示帮助信息' },
+                    ]
+                }
+            ];
+        }
         if (isAdmin) {
             items.push({
                 group: '项目管理',
                 commands: [
                     { cmd: '/pwd', label: '显示当前项目路径' },
-                    { cmd: '/plist', label: '列出所有配置的项目' },
-                    { cmd: '/p', args: '<name|path>', label: '切换项目' },
+                    { cmd: '/p', args: '[name|path]', label: '列出或切换项目' },
                     { cmd: '/bind', args: '<path>', label: '绑定新项目目录' },
                 ]
             });
@@ -340,15 +350,12 @@ export class CommandHandler {
         items.push({
             group: '会话管理',
             commands: [
-                { cmd: '/new', args: '[name]', label: '创建新会话' },
-                { cmd: '/slist', label: '列出当前项目的所有会话' },
-                { cmd: '/slist', args: 'cli', label: '列出 CLI 会话（未导入的）' },
-                { cmd: '/s', args: '<name|index|uuid>', label: '切换到指定会话' },
+                { cmd: '/new', args: '[name]', label: '创建新会话（清空历史请用此命令）' },
+                { cmd: '/s', args: '[cli|name|index|uuid]', label: '列出或切换会话（cli 查看未导入的 CLI 会话）' },
                 { cmd: '/name', args: '<name>', label: '重命名当前会话' },
                 { cmd: '/del', args: '<name>', label: '删除指定会话' },
                 ...(isAdmin ? [
                     { cmd: '/fork', args: '[name]', label: '分支当前会话' },
-                    { cmd: '/clear', label: '清空会话对话历史' },
                     { cmd: '/compact', label: '压缩会话上下文' },
                 ] : []),
             ]
@@ -374,9 +381,7 @@ export class CommandHandler {
                     { cmd: '/status', label: '显示会话状态' },
                     { cmd: '/stop', label: '中断当前任务' },
                     { cmd: '/restart', label: '重启服务' },
-                    { cmd: '/repair', label: '检查并修复会话' },
-                    { cmd: '/safe', label: '进入安全模式' },
-                    { cmd: '/send', args: '[渠道] <path>', label: '发送项目内文件' },
+                    { cmd: '/send', args: '[channel] <path>', label: '发送项目内文件' },
                     { cmd: '/check', args: '[rty <channel>]', label: '检查渠道状态或重连指定渠道' },
                 ]
             });
@@ -434,11 +439,15 @@ export class CommandHandler {
         }
         // 权限检查：区分用户级命令和管理级命令
         const isAdmin = identity.role === 'owner';
+        const activeChatType = activeSession?.chatType || 'private';
         if (normalizedContent.startsWith('/')) {
-            const userCommands = ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s '];
+            const guestGroupCommands = ['/status', '/help'];
+            const userCommands = activeChatType === 'group' && !isAdmin
+                ? guestGroupCommands
+                : ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s '];
             const isUserCommand = userCommands.some(cmd => normalizedContent === cmd.trimEnd() || normalizedContent.startsWith(cmd));
             if (!isUserCommand && !isAdmin) {
-                return '❌ 无权限：此命令仅限管理员使用';
+                return '❌ 无权限：当前群聊仅支持 /status 和 /help';
             }
         }
         // 空闲检查：某些命令需要等待当前会话空闲
@@ -480,16 +489,24 @@ export class CommandHandler {
             return undefined;
         // /help 命令不需要会话
         if (normalizedContent === '/help') {
+            if (!isAdmin && activeChatType === 'group') {
+                const lines = [
+                    '可用命令：',
+                    '',
+                    '其他：',
+                    '  /status - 显示会话状态',
+                    '  /help - 显示此帮助信息',
+                ];
+                return lines.join('\n');
+            }
             if (!isAdmin) {
                 const lines = [
                     '可用命令：',
                     '',
                     '🔄 会话管理：',
-                    '  /new [名称] - 创建新会话（可选命名）',
-                    '  /slist - 列出当前项目的所有会话',
-                    '  /slist cli - 列出 CLI 会话（未导入的）',
-                    '  /s, /session <名称|序号|uuid> - 切换到指定会话',
-                    '  /name, /rename <新名称> - 重命名当前会话',
+                    '  /new [名称] - 创建新会话（清空历史请用此命令，可选命名）',
+                    '  /s [cli|名称|序号|uuid] - 列出或切换会话（cli 查看未导入的 CLI 会话）',
+                    '  /name <新名称> - 重命名当前会话',
                     '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
                     '  /status - 显示会话状态',
                     '',
@@ -503,18 +520,15 @@ export class CommandHandler {
                 '',
                 '📁 项目管理：',
                 '  /pwd - 显示当前项目路径',
-                '  /plist - 列出所有配置的项目',
-                '  /p, /project <name|path> - 切换项目',
+                '  /p [name|path] - 列出或切换项目',
                 '  /bind <path> - 绑定新项目目录',
                 '',
                 '🔄 会话管理：',
-                '  /new [名称] - 创建新会话（可选命名）',
-                '  /slist - 列出当前项目的所有会话',
-                '  /s, /session <名称> - 切换到指定会话',
-                '  /name, /rename <新名称> - 重命名当前会话',
+                '  /new [名称] - 创建新会话（清空历史请用此命令，可选命名）',
+                '  /s [cli|名称|序号|uuid] - 列出或切换会话（cli 查看未导入的 CLI 会话）',
+                '  /name <新名称> - 重命名当前会话',
                 '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
                 '  /fork [名称] - 分支当前会话（从当前对话点创建分支）',
-                '  /clear - 清空当前会话的对话历史',
                 '  /compact - 压缩会话上下文（减少 token 用量）',
                 '',
                 '🤖 Agent 与模型：',
@@ -531,9 +545,7 @@ export class CommandHandler {
                 '  /status - 显示会话状态',
                 '  /stop - 中断当前任务',
                 '  /restart - 重启服务',
-                '  /repair - 检查并修复会话',
-                '  /safe - 进入安全模式',
-                '  /send [渠道] <路径> - 发送项目内文件',
+                '  /send [channel] <path> - 发送项目内文件',
                 '',
                 '❓ 帮助：',
                 '  /help - 显示此帮助信息',
@@ -554,7 +566,8 @@ export class CommandHandler {
                 if (!hasPermissionController(permAgent)) {
                     return '❌ 权限控制不可用';
                 }
-                const currentMode = permSession.metadata?.permissionMode ?? 'bypass';
+                const defaultPermMode = identity.role === 'owner' ? 'bypass' : 'readonly';
+                const currentMode = permSession.metadata?.permissionMode ?? defaultPermMode;
                 const modes = permAgent.listModes();
                 // 尝试发送交互卡片
                 if (this.interactionRouter) {
@@ -1193,8 +1206,8 @@ export class CommandHandler {
                 lines.push('⚠️ 当前处于安全模式（历史上下文已禁用）');
                 lines.push('');
                 lines.push('退出方式：');
-                lines.push('1. /repair - 检查并修复会话（推荐，保留历史）');
-                lines.push('2. /new [名称] - 创建新会话（清空历史）');
+                lines.push('1. /new [名称] - 创建新会话（清空历史）');
+                lines.push('2. 联系管理员使用 /repair 检查并修复会话');
             }
             if (health.lastError) {
                 lines.push('');
@@ -1229,7 +1242,7 @@ export class CommandHandler {
                 await agent.clearSession(session.id, session.agentSessionId || '', session.projectPath);
                 await agent.closeSession(session.id);
             }
-            return `✓ 已创建新会话${sessionName ? `: ${sessionName}` : ''}\n  之前的对话历史已保留，可通过 /slist 查看`;
+            return `✓ 已创建新会话${sessionName ? `: ${sessionName}` : ''}\n  之前的对话历史已保留，可通过 /s 查看`;
         }
         // /check 命令：检查渠道状态 / 手动重连指定渠道
         if (normalizedContent === '/check' || normalizedContent.startsWith('/check ')) {
@@ -1291,7 +1304,6 @@ export class CommandHandler {
                 ? this.statsCollector.getSnapshot().uptimeMs
                 : process.uptime() * 1000;
             lines.push(`  运行时间: ${this.formatUptime(uptimeMs)}`);
-            lines.push(`  当前安全模式会话: ${this.sessionManager.getSafeModeSessionCount()}`);
             // 近 1 小时统计
             if (this.statsCollector) {
                 const snap = this.statsCollector.getSnapshot();
@@ -1311,7 +1323,6 @@ export class CommandHandler {
                     lines.push(`  工具失败: ${h.toolErrors} (${toolBreakdown})`);
                 }
                 lines.push(`  被中断: ${h.interrupts}`);
-                lines.push(`  进入安全模式: ${h.safeModeEntries}`);
                 if (h.completed > 0) {
                     lines.push(`  平均响应耗时: ${(h.avgResponseMs / 1000).toFixed(1)}s`);
                 }
@@ -1641,7 +1652,7 @@ export class CommandHandler {
             else {
                 projectPath = this.projects[arg];
                 if (!projectPath) {
-                    return `❌ 项目 "${arg}" 不存在\n提示: 使用 /plist 查看可用项目`;
+                    return `❌ 项目 "${arg}" 不存在\n提示: 使用 /p 查看可用项目`;
                 }
                 projectName = arg;
             }
@@ -1746,7 +1757,7 @@ export class CommandHandler {
 请先执行以下操作之一：
 1. 发送任意消息 - 自动创建新会话
 2. /new [名称] - 创建命名会话
-3. /project <项目> - 切换到指定项目`;
+3. /p <项目> - 切换到指定项目`;
             }
             const showCliOnly = normalizedContent === '/slist cli';
             // /slist cli — 仅显示 CLI 会话
@@ -1940,13 +1951,17 @@ export class CommandHandler {
                 lines.push('');
             }
             lines.push('使用 /s <序号、name或8位uuid> 切换会话');
-            lines.push('使用 /slist cli 查看 CLI 会话');
+            lines.push('使用 /s cli 查看 CLI 会话');
             return lines.join('\n');
         }
         // /session（无参数）：直接复用 /slist 逻辑（含卡片交互）
         if (normalizedContent === '/session') {
             return this.handle('/slist', channel, channelId, undefined, userId, threadId);
         }
+        // /session cli（= /s cli）：列出未导入的 CLI 会话
+        if (normalizedContent === '/session cli') {
+            return this.handle('/slist cli', channel, channelId, undefined, userId, threadId);
+        }
         // /session 或 /s 命令：切换会话
         if (normalizedContent.startsWith('/session ')) {
             const sessionName = normalizedContent.slice(9).trim();
@@ -1967,7 +1982,7 @@ export class CommandHandler {
                     targetSession = visibleSessions[idx - 1];
                 }
                 else {
-                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /slist 查看可用会话`;
+                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /s 查看可用会话`;
                 }
             }
             if (!targetSession && sessionName.length === 8) {
@@ -1992,7 +2007,7 @@ export class CommandHandler {
                 }
             }
             if (!targetSession) {
-                return `❌ 会话不存在: ${sessionName}\n使用 /slist 查看可用会话`;
+                return `❌ 会话不存在: ${sessionName}\n使用 /s 查看可用会话`;
             }
             const lastInput = targetSession.agentSessionId
                 ? this.sessionManager.readSessionLastUserMessage(targetSession.projectPath, targetSession.agentSessionId, targetSession.agentId)
@@ -2071,14 +2086,14 @@ export class CommandHandler {
                     targetSession = visibleSessions[idx - 1];
                 }
                 else {
-                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /slist 查看可用会话`;
+                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /s 查看可用会话`;
                 }
             }
             if (!targetSession && sessionName.length === 8) {
                 targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
             }
             if (!targetSession) {
-                return `❌ 会话不存在: ${sessionName}\n使用 /slist 查看可用会话`;
+                return `❌ 会话不存在: ${sessionName}\n使用 /s 查看可用会话`;
             }
             if (targetSession.id === session.id) {
                 return `❌ 无法删除当前活跃会话\n请先切换到其他会话`;
@@ -2109,7 +2124,7 @@ export class CommandHandler {
                 const forkedSessionId = await forkAgent.forkSession(session.agentSessionId, session.projectPath, forkName);
                 const newSession = await this.sessionManager.createForkedSession(session, forkedSessionId, forkName);
                 this.eventBus.publish({ type: 'session:forked', sessionId: newSession.id, sourceSessionId: session.id, name: forkName });
-                return `✅ 会话已分支: ${newSession.name}\n新会话已激活，可以继续对话\n\n使用 /slist 查看所有会话，/s <名称> 切换回原会话`;
+                return `✅ 会话已分支: ${newSession.name}\n新会话已激活，可以继续对话\n\n使用 /s 查看所有会话，/s <名称> 切换回原会话`;
             }
             catch (error) {
                 logger.error('[CommandHandler] Fork session failed:', error);

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

@@ -78,7 +78,8 @@ export class MessageBridge {
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
                 const metadata = {};
-                if (msg.replyContext)
+                // 话题会话创建时写入 replyContext（用于 threadId 路由）；主会话不写（避免群聊覆盖）
+                if (msg.threadId && msg.replyContext)
                     metadata.replyContext = msg.replyContext;
                 // 写入实例名（审计 + 精确出站路由）
                 metadata.channelName = channelName;
@@ -151,7 +152,7 @@ export class MessageBridge {
         if (parsed.type === 'menu.query') {
             const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
             const isAdmin = identity.role === 'owner';
-            const items = this.cmdHandler.getMenuItems(isAdmin);
+            const items = this.cmdHandler.getMenuItems(isAdmin, msg.chatType || 'private');
             const response = JSON.stringify({ type: 'menu.response', items });
             if (adapter?.sendCustomPayload) {
                 adapter.sendCustomPayload(msg.channelId, response);

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

@@ -181,7 +181,7 @@ export class MessageProcessor {
                             const msg = showIdleMonitor
                                 ? result.message
                                 : `\u26a0\ufe0f 任务超时（${result.idleSec}秒无响应），已自动中断`;
-                            channelInfo.adapter.sendText(message.channelId, msg, this.getReplyContext(session)).catch(e => {
+                            channelInfo.adapter.sendText(message.channelId, msg, this.getReplyContext(message)).catch(e => {
                                 logger.debug(`[MessageProcessor] Failed to send kill diagnostic message:`, e);
                             });
                         }
@@ -196,7 +196,7 @@ export class MessageProcessor {
                         logger.info(`[MessageProcessor] Idle monitor: ${result.action} after ${result.idleSec}s idle, stream: ${streamKey}`);
                         if (channelInfo && showIdleMonitor && !shouldSuppress()) {
                             if (!isBackground) {
-                                channelInfo.adapter.sendText(message.channelId, result.message, this.getReplyContext(session)).catch(e => {
+                                channelInfo.adapter.sendText(message.channelId, result.message, this.getReplyContext(message)).catch(e => {
                                     logger.debug(`[MessageProcessor] Failed to send idle monitor message:`, e);
                                 });
                             }
@@ -237,7 +237,7 @@ export class MessageProcessor {
                     else {
                         const prefixed = prefixErrorType(ERROR_PREFIX.INFRA, errorType);
                         const newCount = await this.sessionManager.recordError(session.id, prefixed, error.message);
-                        await this.checkSafeMode(session, message.channelId, channelInfo.adapter, safeModeThreshold, newCount);
+                        await this.checkSafeMode(session, message.channelId, channelInfo.adapter, safeModeThreshold, newCount, message);
                     }
                 }
                 catch (statusError) {
@@ -251,18 +251,18 @@ export class MessageProcessor {
                 clearInterval(monitorInterval);
         }
     }
-    /** 从 session 提取渠道预构建的回复上下文 */
-    getReplyContext(session) {
-        return session.metadata?.replyContext;
+    /** 获取回复上下文（跟着任务走） */
+    getReplyContext(message) {
+        return message.replyContext;
     }
     /**
      * 检查是否需要进入安全模式（safeModeThreshold 为 0 时跳过）
      */
-    async checkSafeMode(session, channelId, adapter, safeModeThreshold, consecutiveErrors) {
+    async checkSafeMode(session, channelId, adapter, safeModeThreshold, consecutiveErrors, message) {
         if (safeModeThreshold <= 0)
             return;
         const health = await this.sessionManager.getHealthStatus(session.id);
-        const sendOpts = this.getReplyContext(session);
+        const sendOpts = this.getReplyContext(message);
         const isThread = !!session.threadId;
         if (consecutiveErrors >= safeModeThreshold && !health.safeMode) {
             await this.sessionManager.setSafeMode(session.id, true);
@@ -324,7 +324,7 @@ ${suggestions}`, sendOpts);
             logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}`);
             // 记录开始处理
             this.eventBus.publish({ type: 'message:processing', sessionId: session.id });
-            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, this.getReplyContext(session));
+            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, this.getReplyContext(message));
             logger.message({
                 msgId: messageId,
                 sessionId: session.id,
@@ -341,8 +341,8 @@ ${suggestions}`, sendOpts);
                     const opts = {};
                     if (isFinal)
                         opts.title = '\u2713 \u6700\u7ec8\u56de\u590d:';
-                    // 话题会话：使用 Channel 预构建的 replyContext（确保消息进入话题）
-                    const replyCtx = session.metadata?.replyContext;
+                    // replyContext 跟着任务走：优先用当前 message 的，兜底用 session 的（话题会话创建时写入）
+                    const replyCtx = this.getReplyContext(message);
                     if (replyCtx) {
                         Object.assign(opts, replyCtx);
                     }
@@ -362,17 +362,18 @@ ${suggestions}`, sendOpts);
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
             // 设置权限审批的消息发送回调（指向当前渠道）
             agent.setSendPrompt(async (text) => {
-                await adapter.sendText(message.channelId, text, this.getReplyContext(session));
+                await adapter.sendText(message.channelId, text, this.getReplyContext(message));
             });
             // 设置权限审批的交互上下文（支持交互卡片）
             agent.setPermissionContext?.({
                 adapter,
                 channelId: message.channelId,
-                replyContext: this.getReplyContext(session),
+                replyContext: this.getReplyContext(message),
                 interactionRouter: this.interactionRouter,
             });
-            // 设置 per-session 权限模式
-            agent.setMode(session.metadata?.permissionMode ?? 'bypass');
+            // 设置 per-session 权限模式（动态默认值：owner → bypass，guest → readonly）
+            const defaultPermMode = session.identity?.role === 'owner' ? 'bypass' : 'readonly';
+            agent.setMode(session.metadata?.permissionMode ?? defaultPermMode);
             // 标记会话为处理中（实时持久化，重启后可恢复）
             this.sessionManager.markProcessing(session.id);
             // 检查是否因新消息自动中断 — 包装 prompt 让 Agent 知道上下文
@@ -435,6 +436,10 @@ ${suggestions}`, sendOpts);
                 if (capParts.length > 0) {
                     contextParts.push(`[通道能力] ${capParts.join('、')}`);
                 }
+                // 4. 群聊 @ 规则：告知 agent 应该 @ 谁，由 agent 自行在回复中添加
+                if (message.chatType === 'group' && message.peerId) {
+                    contextParts.push(`[群聊回复规则] 回复时必须在开头添加 @${message.peerId} 来通知对方`);
+                }
                 const effectiveSystemPrompt = [options?.systemPromptAppend, ...contextParts].filter(Boolean).join('\n') || undefined;
                 // 可重试错误（403/429/5xx）指数退避重试，最多 3 次
                 const MAX_RETRIES = 3;
@@ -515,22 +520,22 @@ ${suggestions}`, sendOpts);
                     && targetSpec !== currentChannelType;
                 // 跨通道仅限 owner
                 if (isCrossChannel && session.identity?.role !== 'owner') {
-                    await adapter.sendText(message.channelId, `\u274c 跨通道发送仅限管理员`, this.getReplyContext(session));
+                    await adapter.sendText(message.channelId, `\u274c 跨通道发送仅限管理员`, this.getReplyContext(message));
                     continue;
                 }
                 const resolvedPath = this.resolveFilePath(filePath, absoluteProjectPath);
                 if (!fs.existsSync(resolvedPath)) {
                     logger.warn(`[${adapter.channelName}] File not found: ${resolvedPath}`);
-                    await adapter.sendText(message.channelId, `\u26a0\ufe0f 文件未找到: ${filePath}`, this.getReplyContext(session));
+                    await adapter.sendText(message.channelId, `\u26a0\ufe0f 文件未找到: ${filePath}`, this.getReplyContext(message));
                     continue;
                 }
                 // 找目标 adapter
                 if (!targetInfo) {
-                    await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 未启用或不存在`, this.getReplyContext(session));
+                    await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 未启用或不存在`, this.getReplyContext(message));
                     continue;
                 }
                 if (!targetInfo.adapter.sendFile) {
-                    await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 不支持文件发送`, this.getReplyContext(session));
+                    await adapter.sendText(message.channelId, `\u274c 通道 ${targetLabel} 不支持文件发送`, this.getReplyContext(message));
                     continue;
                 }
                 // 找目标 channelId
@@ -541,21 +546,21 @@ ${suggestions}`, sendOpts);
                     const ownerPeerId = getOwner(this.config, targetAdapterName);
                     targetChannelId = ownerPeerId ? (this.sessionManager.getOwnerChatId(targetChannelType, ownerPeerId) ?? '') : '';
                     if (!targetChannelId) {
-                        await adapter.sendText(message.channelId, `\u274c 未找到 ${targetLabel} 的私聊会话，请先在该通道发送一条消息`, this.getReplyContext(session));
+                        await adapter.sendText(message.channelId, `\u274c 未找到 ${targetLabel} 的私聊会话，请先在该通道发送一条消息`, this.getReplyContext(message));
                         continue;
                     }
                 }
                 logger.info(`[${adapter.channelName}] Sending file via ${targetInfo.adapter.channelName}: ${resolvedPath}`);
                 try {
-                    await targetInfo.adapter.sendFile(targetChannelId, resolvedPath, this.getReplyContext(session));
+                    await targetInfo.adapter.sendFile(targetChannelId, resolvedPath, this.getReplyContext(message));
                     this.eventBus.publish({ type: 'agent:file-sent', sessionId: session.id, filePath: resolvedPath, channel: targetInfo.adapter.channelName });
                     if (isCrossChannel) {
-                        await adapter.sendText(message.channelId, `\ud83d\udcce 文件已通过 ${targetLabel} 发送`, this.getReplyContext(session));
+                        await adapter.sendText(message.channelId, `\ud83d\udcce 文件已通过 ${targetLabel} 发送`, this.getReplyContext(message));
                     }
                 }
                 catch (error) {
                     logger.error(`[${adapter.channelName}] Failed to send file: ${resolvedPath}`, error);
-                    await adapter.sendText(message.channelId, `\u274c 文件发送失败: ${filePath}`, this.getReplyContext(session));
+                    await adapter.sendText(message.channelId, `\u274c 文件发送失败: ${filePath}`, this.getReplyContext(message));
                 }
             }
             // 最终回复文本添加到 flusher（统一在流结束后处理，避免多 complete 事件重复发送）
@@ -580,7 +585,7 @@ ${suggestions}`, sendOpts);
                 const hint = session.threadId
                     ? '\n\n\u26a0\ufe0f 当前处于安全模式（无上下文记忆）。使用 /repair 修复 或 /clear 清空会话'
                     : '\n\n\u26a0\ufe0f 当前处于安全模式（无上下文记忆）。使用 /repair 修复 或 /new 新建会话';
-                await adapter.sendText(message.channelId, hint, this.getReplyContext(session));
+                await adapter.sendText(message.channelId, hint, this.getReplyContext(message));
             }
             // 清理 activeStreams（正常完成）
             agent.cleanupStream(streamKey);
@@ -593,7 +598,7 @@ ${suggestions}`, sendOpts);
                 const errorSummary = streamResult.errors?.join('; ') || '任务执行失败';
                 const rawSubtype = streamResult.subtype || 'agent_error';
                 const errorType = prefixErrorType(ERROR_PREFIX.AGENT, rawSubtype);
-                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, this.getReplyContext(session));
+                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, this.getReplyContext(message));
                 this.eventBus.publish({
                     type: 'message:error',
                     sessionId: session.id,
@@ -609,7 +614,7 @@ ${suggestions}`, sendOpts);
                     const { policy } = channelInfo;
                     if (policy.accumulateErrors(chatType, identityRole)) {
                         const newCount = await this.sessionManager.recordError(session.id, errorType, errorSummary);
-                        await this.checkSafeMode(session, message.channelId, adapter, safeModeThreshold, newCount);
+                        await this.checkSafeMode(session, message.channelId, adapter, safeModeThreshold, newCount, message);
                     }
                 }
                 logger.message({
@@ -623,7 +628,7 @@ ${suggestions}`, sendOpts);
             }
             else {
                 // 真正的成功
-                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, this.getReplyContext(session));
+                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, this.getReplyContext(message));
                 await this.sessionManager.recordSuccess(session.id);
                 this.eventBus.publish({
                     type: 'message:completed',
@@ -676,7 +681,7 @@ ${suggestions}`, sendOpts);
             // 用户主动中断（新消息打断 或 /stop 命令）时静默，不发送中断/错误提示
             if (!isUserInterrupt) {
                 try {
-                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, this.getReplyContext(session));
+                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, this.getReplyContext(message));
                 }
                 catch { }
             }
@@ -724,7 +729,7 @@ ${suggestions}`, sendOpts);
                 let sendOpts;
                 try {
                     const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.config.projects?.defaultPath || process.cwd(), message.threadId);
-                    sendOpts = this.getReplyContext(session);
+                    sendOpts = this.getReplyContext(message);
                 }
                 catch { }
                 await adapter.sendText(message.channelId, userMessage, sendOpts);
@@ -735,11 +740,12 @@ ${suggestions}`, sendOpts);
      * 解析会话和项目路径
      */
     async resolveSession(message) {
-        // 话题会话：使用 Channel 预构建的 replyContext
-        const metadata = message.replyContext
+        // 话题会话创建时写入 replyContext（threadId 路由）；主会话不写（避免群聊覆盖）
+        const metadata = (message.threadId && message.replyContext)
             ? { replyContext: message.replyContext }
             : undefined;
         const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.config.projects?.defaultPath || process.cwd(), message.threadId, metadata, undefined, message.peerId);
+        // replyContext 不再写入 session.metadata（跟着 message 走，避免群聊多人覆盖）
         const absoluteProjectPath = path.isAbsolute(session.projectPath)
             ? session.projectPath
             : path.resolve(process.cwd(), session.projectPath);

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

@@ -798,6 +798,10 @@ export class SessionManager {
             .run(JSON.stringify(metadata), Date.now(), targetSessionId);
         return { ...this.rowToSession(target), metadata, updatedAt: Date.now() };
     }
+    updateMetadata(sessionId, metadata) {
+        this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+            .run(JSON.stringify(metadata), Date.now(), sessionId);
+    }
     async renameSession(sessionId, newName) {
         const result = this.db.prepare(`
       UPDATE sessions SET name = ?, updated_at = ? WHERE id = ?

package/dist/index.js

@@ -214,11 +214,11 @@ async function main() {
                 await handler({
                     channel: channelType, channelId: chatId, content, images, chatType,
                     peerId: peerId || '', peerName, messageId, mentions, threadId,
-                    replyContext: rootId ? { replyToMessageId: rootId, replyInThread: true } : undefined,
+                    replyContext: rootId ? { replyToMessageId: rootId, replyInThread: !!threadId } : undefined,
                 });
             }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, {
                 replyToMessageId: replyContext?.replyToMessageId,
-                replyInThread: true,
+                replyInThread: replyContext?.replyInThread,
             }), inst.adapter, channelType);
             inst.channel.onRecall?.((messageId) => {
                 msgBridge.cancel(messageId);
@@ -303,18 +303,17 @@ async function main() {
         const sourceChannelName = event.channelName || sourceChannelType;
         const msg = event.message;
         logger.error(`[ChannelHealth] ${sourceChannelName} auth_error: ${msg}`);
-        const notified = new Set(); // channelType:ownerId 去重
+        const notified = new Set(); // channelType 去重（同类型只通知一次）
         for (const other of channelInstances) {
             const otherType = other.channelType || other.adapter.channelName;
             if (otherType === sourceChannelType)
                 continue; // 跳过同类型通道
+            if (notified.has(otherType))
+                continue; // 同类型已通知过
             const ownerId = getOwner(config, other.adapter.channelName);
             if (!ownerId)
                 continue;
-            const key = `${otherType}:${ownerId}`;
-            if (notified.has(key))
-                continue; // 同类型已通知过此 owner
-            notified.add(key);
+            notified.add(otherType);
             other.adapter.sendText(ownerId, msg).catch(err => {
                 logger.error(`[ChannelHealth] Failed to notify ${other.adapter.channelName} owner:`, err);
             });
@@ -380,7 +379,7 @@ async function main() {
             const adapter = cmdHandler.getAdapter(pending.channel);
             if (adapter) {
                 const replyContext = pending.rootId
-                    ? { replyToMessageId: pending.rootId, replyInThread: true }
+                    ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId }
                     : undefined;
                 await adapter.sendText(pending.channelId, '✅ 服务重启成功！', replyContext);
                 logger.info(`[Restart] Notification sent via ${pending.channel}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.3.0",
+  "version": "2.4.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",