evolclaw 2.5.0 → 2.5.2

package/dist/agents/claude-runner.js

@@ -259,14 +259,7 @@ export class AgentRunner {
             }
             // 等待用户交互
             const answer = await new Promise((resolve) => {
-                const timer = setTimeout(() => {
-                    permCtx?.interactionRouter?.cancel(requestId);
-                    permCtx?.cancelIntercept?.(sessionId);
-                    logger.info(`[AgentRunner] AskUserQuestion timeout for ${requestId}`);
-                    resolve(null);
-                }, 5 * 60 * 1000);
                 permCtx?.interactionRouter?.register(requestId, sessionId, (action, values) => {
-                    clearTimeout(timer);
                     if (action === 'cancel') {
                         resolve(null);
                     }
@@ -292,7 +285,7 @@ export class AgentRunner {
                 });
             });
             if (answer === null) {
-                // 超时或取消，自动选第一项
+                // 取消，自动选第一项
                 const firstLabel = q.options[0]?.label || '';
                 answers[q.question] = q.multiSelect ? [firstLabel] : firstLabel;
             }
@@ -323,6 +316,54 @@ export class AgentRunner {
         const updatedInput = { ...input, answers };
         return { behavior: 'allow', updatedInput, decisionClassification: 'user_temporary' };
     }
+    /**
+     * 处理 ExitPlanMode 工具调用：plan mode 审批，等待用户批准后才继续执行
+     */
+    async handleExitPlanMode(sessionId, input, options) {
+        const permCtx = this.permissionContexts.get(sessionId);
+        const sendPrompt = this.sendPromptFn;
+        // 无交互上下文，直接 allow（防御性兜底）
+        if (!permCtx?.adapter?.sendInteraction || !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 拒绝');
+        }
+        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' });
+                }
+            });
+        });
+    }
     /**
      * SDK 原始事件 → 标准 AgentEvent 转换
      * 所有 SDK 特有的事件类型引用封装在此方法内
@@ -538,6 +579,10 @@ export class AgentRunner {
             if (toolName === 'AskUserQuestion') {
                 return await this.handleAskUserQuestion(sessionId, input, options);
             }
+            // 特殊处理：ExitPlanMode 工具（plan mode 审批）
+            if (toolName === 'ExitPlanMode') {
+                return await this.handleExitPlanMode(sessionId, input, options);
+            }
             // bypass 模式：一律 allow
             if (this.permissionMode === 'bypass') {
                 return { behavior: 'allow', updatedInput: input, decisionClassification: 'user_permanent' };

package/dist/channels/aun.js

@@ -2,6 +2,7 @@ import { AUNClient, GatewayDiscovery } from '@eleans/aun-core-sdk';
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
 import { resolvePaths } from '../paths.js';
@@ -171,7 +172,7 @@ export class AUNChannel {
         }
         if (!gateway) {
             logger.error('[AUN] Cannot resolve gateway URL from AID');
-            return;
+            throw new Error('Cannot resolve gateway URL from AID');
         }
         logger.info(`[AUN] Initializing: aid=${aidName}, gateway=${gateway}, aun_path=${aunPath}`);
         // Create client with FileSecretStore (AES-256-GCM)
@@ -251,7 +252,7 @@ export class AUNChannel {
             if (!accessToken) {
                 logger.error(`[AUN] No accessToken fallback available, scheduling retry`);
                 this.scheduleReconnect();
-                return;
+                throw new Error('Authentication failed and no accessToken fallback available');
             }
             logger.warn(`[AUN] Using accessToken fallback`);
         }
@@ -275,11 +276,97 @@ export class AUNChannel {
                 }
             }
             logger.info(`[AUN] Connected as ${this._aid}`);
+            // Send welcome message to owner after first connection
+            await this.sendWelcomeMessage();
         }
         catch (e) {
             logger.error(`[AUN] Connection failed: ${e}`);
             this.scheduleReconnect();
-            return;
+            throw e;
+        }
+    }
+    async sendWelcomeMessage() {
+        try {
+            const owner = this.config.owner;
+            if (!owner) {
+                logger.info('[AUN] No owner configured, skipping welcome message');
+                return;
+            }
+            // Check agent.md initialized field
+            const aid = this.config.aid;
+            const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
+            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
+            if (!fs.existsSync(agentMdPath)) {
+                logger.warn('[AUN] agent.md not found, skipping welcome message');
+                return;
+            }
+            const agentMdContent = fs.readFileSync(agentMdPath, 'utf-8');
+            const match = agentMdContent.match(/^---\n([\s\S]*?)\n---/);
+            if (!match) {
+                logger.warn('[AUN] agent.md frontmatter not found');
+                return;
+            }
+            const frontmatter = match[1];
+            const initializedMatch = frontmatter.match(/^initialized:\s*(true|false)/m);
+            if (!initializedMatch || initializedMatch[1] === 'true') {
+                logger.info('[AUN] Agent already initialized, skipping welcome message');
+                return;
+            }
+            // Generate new agent.md with proper fields
+            const ownerShortId = owner.split('@')[0].slice(0, 8);
+            const newAgentMd = `---
+aid: "${aid}"
+name: "${ownerShortId}的Evol助手"
+type: "codeagent"
+version: "1.0.0"
+description: "EvolClaw AI Agent Gateway - 连接 Claude/Codex 到消息通道"
+tags:
+  - evolclaw
+  - ai-agent
+  - gateway
+initialized: true
+---
+
+# ${ownerShortId}的Evol助手
+
+EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
+`;
+            // Write locally
+            fs.writeFileSync(agentMdPath, newAgentMd, 'utf-8');
+            logger.info('[AUN] Updated agent.md with initialized=true');
+            // Publish to AUN network via auth.uploadAgentMd
+            try {
+                await this.client.auth.uploadAgentMd(newAgentMd);
+                logger.info('[AUN] Published agent.md to AUN network');
+            }
+            catch (e) {
+                logger.warn(`[AUN] Failed to publish agent.md: ${e}`);
+            }
+            // Send welcome message
+            const welcomeText = `🎉 欢迎使用 EvolClaw！
+
+我是您的 AI Agent 网关，已成功连接到 AUN 网络。
+
+📋 **日常使用方法**：
+
+1. **绑定项目**：发送 \`/bind <项目路径>\` 绑定工作目录
+2. **查看帮助**：发送 \`/help\` 查看所有可用命令
+3. **切换项目**：发送 \`/project <项目名>\` 切换到其他项目
+4. **查看状态**：发送 \`/status\` 查看当前会话状态
+5. **查看 Agent 信息**：发送 \`/agentmd\` 查看 agent.md 内容
+6. **会话管理**：发送 \`/session\` 查看和切换会话
+
+💡 **提示**：
+- 直接发送消息即可与 Claude/Codex 对话
+- 支持多项目会话管理，每个项目独立会话
+- 所有命令以 \`/\` 开头
+
+现在，请先使用 \`/bind\` 命令绑定您的项目目录，然后就可以开始工作了！`;
+            await this.sendMessage(owner, welcomeText);
+            logger.info(`[AUN] Welcome message sent to owner: ${owner}`);
+        }
+        catch (e) {
+            logger.warn(`[AUN] Failed to send welcome message: ${e}`);
         }
     }
     // ── Event handlers ──────────────────────────────────────────
@@ -939,6 +1026,7 @@ export class AUNChannelPlugin {
                 accessToken: inst.accessToken,
                 flushDelay: inst.flushDelay,
                 encryptionSeed: inst.encryptionSeed,
+                owner: inst.owner,
                 aunTrace: config.debug?.aunTrace,
             });
             const adapter = {

package/dist/cli.js

@@ -1306,6 +1306,10 @@ async function cmdCtl(args) {
     }
 }
 // ==================== Main ====================
+function getArgValue(args, flag) {
+    const idx = args.indexOf(flag);
+    return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+}
 export async function main(args) {
     const cmd = args[0] || 'start';
     switch (cmd) {
@@ -1329,7 +1333,19 @@ export async function main(args) {
                 await cmdInitWecom();
             }
             else {
-                await cmdInit();
+                const nonInteractive = args.includes('--non-interactive');
+                if (nonInteractive) {
+                    await cmdInit({
+                        nonInteractive: true,
+                        defaultPath: getArgValue(args, '--default-path') || process.cwd(),
+                        channel: getArgValue(args, '--channel') || 'aun',
+                        aunAid: getArgValue(args, '--aun-aid'),
+                        aunOwner: getArgValue(args, '--aun-owner'),
+                    });
+                }
+                else {
+                    await cmdInit();
+                }
             }
             break;
         case 'start':

package/dist/core/command-handler.js

@@ -112,7 +112,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', '/send', '/check', '/p ', '/s ', '/name ', '/rewind', '/rw', '/rw ', '/activity'];
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/send', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity'];
 export class CommandHandler {
     sessionManager;
     config;
@@ -338,23 +338,23 @@ export class CommandHandler {
             items.push({
                 group: '项目管理',
                 commands: [
-                    { cmd: '/pwd', label: '显示当前项目路径' },
-                    { cmd: '/p', args: '[name|path]', label: '列出或切换项目' },
-                    ...(isOwner ? [{ cmd: '/bind', args: '<path>', label: '绑定新项目目录' }] : []),
+                    { cmd: '/pwd', label: '显示当前项目路径', desc: '查看当前会话绑定的项目目录' },
+                    { cmd: '/p', label: '列出或切换项目', desc: '切换到其他已配置的项目', next: { type: 'select', dynamic: true } },
+                    ...(isOwner ? [{ cmd: '/bind', label: '绑定新项目目录', desc: '将当前会话绑定到指定项目路径', next: { type: 'text' } }] : []),
                 ]
             });
         }
         items.push({
             group: '会话管理',
             commands: [
-                { 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: '删除指定会话' },
+                { cmd: '/new', label: '创建新会话', desc: '清空历史，开始全新对话', next: { type: 'text' } },
+                { cmd: '/s', label: '切换会话', desc: '切换到同项目下的其他会话', next: { type: 'select', dynamic: true } },
+                { cmd: '/name', label: '重命名当前会话', desc: '为当前会话设置一个易识别的名称', next: { type: 'text' } },
+                { cmd: '/del', label: '删除指定会话', desc: '永久删除一个非活跃会话', next: { type: 'select', dynamic: true } },
                 ...(isAdmin ? [
-                    { cmd: '/fork', args: '[name]', label: '分支当前会话' },
-                    { cmd: '/rewind', args: '[N] [chat|file|all]', label: '查看历史/撤销指定轮次 (别名: /rw)' },
-                    { cmd: '/compact', label: '压缩会话上下文' },
+                    { cmd: '/fork', label: '分支当前会话', desc: '基于当前会话创建独立分支', next: { type: 'text' } },
+                    { cmd: '/rewind', label: '查看历史/撤销指定轮次', desc: '回退会话到指定轮次，可选择撤销文件改动' },
+                    { cmd: '/compact', label: '压缩会话上下文', desc: '将长对话压缩为摘要以节省 token' },
                 ] : []),
             ]
         });
@@ -362,31 +362,55 @@ export class CommandHandler {
             items.push({
                 group: 'Agent 与模型',
                 commands: [
-                    { cmd: '/agent', args: '[name]', label: '查看或切换 Agent 后端' },
-                    { cmd: '/model', args: '[model]', label: '查看或切换模型' },
-                    { cmd: '/effort', args: '[level]', label: '查看或切换推理强度' },
+                    { cmd: '/agent', label: '切换 Agent 后端', desc: '切换当前会话使用的 AI 后端', next: { type: 'select', dynamic: true } },
+                    { cmd: '/model', label: '切换模型', desc: '切换当前 Agent 使用的模型版本', next: { type: 'select', dynamic: true } },
+                    { cmd: '/effort', label: '切换推理强度', desc: '调整模型推理深度，影响响应速度与质量', next: { type: 'select', items: [
+                                { value: 'low', label: 'Low' },
+                                { value: 'medium', label: 'Medium' },
+                                { value: 'high', label: 'High' },
+                                { value: 'max', label: 'Max' },
+                            ] } },
                 ]
             });
             items.push({
                 group: '权限管理',
                 commands: [
-                    { cmd: '/perm', args: isOwner ? '[mode|allow|always|deny]' : '[allow|always|deny]', label: '权限模式管理' },
+                    { cmd: '/perm', label: '权限模式管理', desc: '控制工具调用的审批策略', next: { type: 'select', items: [
+                                ...(isOwner ? [
+                                    { value: 'auto', label: '自动模式', desc: '根据风险等级自动决定是否审批' },
+                                    { value: 'bypass', label: '免审批模式', desc: '跳过所有工具审批确认' },
+                                    { value: 'plan', label: '计划模式', desc: '仅允许只读操作，写操作需审批' },
+                                    { value: 'edit', label: '编辑模式', desc: '允许文件编辑，其他操作需审批' },
+                                    { value: 'request', label: '请求模式', desc: '所有操作均需审批' },
+                                    { value: 'noask', label: '静默模式', desc: '不弹出审批，自动拒绝未授权操作' },
+                                ] : []),
+                                { value: 'allow', label: '允许此操作', desc: '本次允许当前待审批操作' },
+                                { value: 'always', label: '始终允许', desc: '永久允许同类操作' },
+                                { value: 'deny', label: '拒绝此操作', desc: '拒绝当前待审批操作' },
+                            ] } },
                 ]
             });
             items.push({
                 group: '运维',
                 commands: [
-                    { cmd: '/status', label: '显示会话状态' },
-                    { cmd: '/stop', label: '中断当前任务' },
-                    { cmd: '/check', label: '检查渠道状态' },
-                    { cmd: '/activity', args: '[all|dm|owner|none]', label: '查看/控制中间输出显示模式' },
+                    { cmd: '/status', label: '显示会话状态', desc: '查看当前会话、项目、Agent 的详细状态' },
+                    { cmd: '/stop', label: '中断当前任务', desc: '立即中断正在执行的 Agent 任务' },
+                    { cmd: '/check', label: '检查渠道状态', desc: '检查各消息渠道的连接健康状态' },
+                    { cmd: '/activity', label: '控制中间输出显示', desc: '设置工具调用过程的可见范围', next: { type: 'select', items: [
+                                { value: 'all', label: '全部显示', desc: '所有用户均可见中间输出' },
+                                { value: 'dm', label: '仅私聊', desc: '仅私聊中显示中间输出' },
+                                { value: 'owner', label: '仅 owner 私聊', desc: '仅 owner 的私聊中显示' },
+                                { value: 'none', label: '不显示', desc: '关闭所有中间输出' },
+                            ] } },
                     ...(isAdmin ? [
-                        { cmd: '/restart', args: '<channel>', label: '重连指定渠道' },
+                        { cmd: '/restart', label: '重启/重连', desc: '重启服务或重连指定渠道', next: { type: 'select', dynamic: true } },
                     ] : []),
                     ...(isOwner ? [
-                        { cmd: '/restart', label: '重启服务' },
-                        { cmd: '/send', args: '[channel] <path>', label: '发送项目内文件' },
-                        { cmd: '/agentmd', args: '[put|set <内容>]', label: '管理 agent.md' },
+                        { cmd: '/send', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
+                        { cmd: '/agentmd', label: '管理 agent.md', desc: '查看或更新 AUN 网络上的 agent.md 身份文件', next: { type: 'select', items: [
+                                    { value: 'put', label: '上传当前', desc: '将本地 agent.md 上传到 AUN 网络' },
+                                    { value: 'set', label: '直接设置', desc: '输入内容直接更新 agent.md', next: { type: 'text' } },
+                                ] } },
                     ] : []),
                 ]
             });
@@ -395,22 +419,67 @@ export class CommandHandler {
             items.push({
                 group: '其他',
                 commands: [
-                    { cmd: '/status', label: '显示会话状态' },
-                    { cmd: '/check', label: '检查渠道健康' },
+                    { cmd: '/status', label: '显示会话状态', desc: '查看当前会话的基本状态' },
+                    { cmd: '/check', label: '检查渠道健康', desc: '检查消息渠道连接状态' },
                 ]
             });
         }
         items.push({
             group: '帮助',
             commands: [
-                { cmd: '/help', label: '显示帮助信息' },
+                { cmd: '/help', label: '显示帮助信息', desc: '列出所有可用命令及说明' },
             ]
         });
         return items;
     }
-    /**
-     * 快速判断是否为命令（不进队列的命令）
-     */
+    /** 动态子菜单：根据 cmd 路径返回选项列表（供 menu.query + cmd 使用） */
+    async getSubMenuItems(cmd, channel, channelId, userId) {
+        const session = await this.sessionManager.getActiveSession(channel, channelId);
+        if (cmd === '/s' || cmd === '/del') {
+            const sessions = await this.sessionManager.listSessions(channel, channelId);
+            const active = cmd === '/del' ? await this.sessionManager.getActiveSession(channel, channelId) : null;
+            const items = sessions
+                .filter(s => !active || s.id !== active.id)
+                .map(s => {
+                const shortId = s.agentSessionId ? s.agentSessionId.substring(0, 8) : '';
+                const time = s.updatedAt ? formatIdleTime(Date.now() - s.updatedAt) : '';
+                const parts = [shortId, time].filter(Boolean).join(' · ');
+                return {
+                    value: s.name || s.id.slice(0, 8),
+                    label: s.name || s.id.slice(0, 8),
+                    desc: parts || undefined,
+                };
+            });
+            if (cmd === '/s') {
+                items.push({ value: 'cli', label: '查看 CLI 会话', desc: '列出未导入的 CLI 本地会话' });
+            }
+            return items;
+        }
+        if (cmd === '/p') {
+            const list = this.config.projects?.list || {};
+            return Object.entries(list).map(([name, path]) => ({ value: name, label: name, desc: path }));
+        }
+        if (cmd === '/agent') {
+            return [...this.agentMap.keys()].map(name => ({ value: name, label: name }));
+        }
+        if (cmd === '/model') {
+            const agent = this.getAgent(session?.agentId);
+            if (hasModelSwitcher(agent) && agent.listModels) {
+                const models = await agent.listModels() ?? [];
+                if (models.length > 0)
+                    return models.map((m) => ({ value: m, label: m }));
+            }
+            return null;
+        }
+        if (cmd === '/restart') {
+            const isOwner = userId ? this.sessionManager.resolveIdentity(channel, userId).role === 'owner' : false;
+            const channels = [...this.adapters.keys()].map(name => ({ value: name, label: name, desc: '重连此渠道' }));
+            if (isOwner)
+                channels.unshift({ value: '', label: '重启服务', desc: '重启整个 EvolClaw 服务进程' });
+            return channels;
+        }
+        return null;
+    }
     isCommand(content) {
         return content === '/p' || content === '/s' || quickCommandPrefixes.some(cmd => content.startsWith(cmd));
     }
@@ -1879,6 +1948,8 @@ export class CommandHandler {
             return response;
         }
         // /bind 命令：持久化项目到配置（不切换）（owner only）
+        if (normalizedContent === '/bind')
+            return '用法: /bind <路径>';
         if (normalizedContent.startsWith('/bind ')) {
             if (!isOwner)
                 return '❌ 无权限：此命令仅限 owner 使用';
@@ -2205,6 +2276,9 @@ export class CommandHandler {
             return `✓ 已切换到会话: ${targetSession.name || sessionName}${continueHint}${lastInputLine}`;
         }
         // /rename 或 /name 命令：重命名当前会话
+        if (normalizedContent === '/rename' || normalizedContent === '/name') {
+            return '用法: /name <新名称> 或 /rename <新名称>';
+        }
         if (normalizedContent.startsWith('/rename ')) {
             const newName = normalizedContent.slice(8).trim();
             if (!newName)

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

@@ -152,13 +152,27 @@ export class MessageBridge {
             return false;
         if (parsed.type === 'menu.query') {
             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) {
-                adapter.sendCustomPayload(msg.channelId, response);
+            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 ?? [] });
+                if (adapter?.sendCustomPayload) {
+                    adapter.sendCustomPayload(msg.channelId, response);
+                }
+                else {
+                    await sendReply(msg.channelId, response);
+                }
             }
             else {
-                await sendReply(msg.channelId, response);
+                // 全量菜单
+                const items = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
+                const response = JSON.stringify({ type: 'menu.response', items });
+                if (adapter?.sendCustomPayload) {
+                    adapter.sendCustomPayload(msg.channelId, response);
+                }
+                else {
+                    await sendReply(msg.channelId, response);
+                }
             }
             return true;
         }

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

@@ -337,15 +337,18 @@ export class MessageProcessor {
             // 保存当前 flusher，用于 compact 事件
             this.currentFlusher = flusher;
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
+            // 捕获当前消息的上下文（闭包），避免后续消息处理时串台
+            const capturedChannelId = message.channelId;
+            const capturedReplyContext = this.getReplyContext(message);
             // 设置权限审批的消息发送回调（指向当前渠道）
             agent.setSendPrompt(async (text) => {
-                await adapter.sendText(message.channelId, text, this.getReplyContext(message));
+                await adapter.sendText(capturedChannelId, text, capturedReplyContext);
             });
             // 设置权限审批的交互上下文（支持交互卡片）
             agent.setPermissionContext?.(session.id, {
                 adapter,
-                channelId: message.channelId,
-                replyContext: this.getReplyContext(message),
+                channelId: capturedChannelId,
+                replyContext: capturedReplyContext,
                 interactionRouter: this.interactionRouter,
                 interceptNextMessage: this.messageQueue
                     ? (sessionKey, handler) => this.messageQueue.interceptNext(sessionKey, handler)

package/dist/core/permission.js

@@ -94,6 +94,12 @@ export function summarizeToolInput(toolName, input) {
         'Glob': (i) => `pattern: ${i.pattern}`,
         'Agent': (i) => i.description || i.prompt?.substring(0, 80),
         'Skill': (i) => i.skill ? `${i.skill}${i.args ? ' ' + i.args : ''}` : undefined,
+        'ExitPlanMode': (i) => {
+            if (i.allowedPrompts?.length) {
+                return `计划包含 ${i.allowedPrompts.length} 项操作权限`;
+            }
+            return '计划审批';
+        },
         'TodoWrite': (i) => {
             if (Array.isArray(i.todos)) {
                 return i.todos.map((t) => t.content || t.task || t.text).filter(Boolean).join(', ').substring(0, 80);
@@ -186,7 +192,6 @@ export class PermissionGateway {
             },
             channelId: context?.channelId || '',
             sessionId,
-            expiresAt: Date.now() + this.timeout,
         };
         // 尝试富交互
         let interactionSent = false;
@@ -204,16 +209,7 @@ export class PermissionGateway {
             await sendPrompt(`🔐 权限请求\n工具：${toolName}\n操作：${displaySummary}${reasonLine}\n\n回复 /perm allow 本次允许 | always 始终允许 | deny 拒绝`);
         }
         return new Promise((resolve) => {
-            const timer = setTimeout(() => {
-                this.pending.delete(requestId);
-                // 清理 router 注册（仅删除本次请求，不影响其他交互）
-                if (interactionSent && context?.interactionRouter) {
-                    context.interactionRouter.cancel(requestId);
-                }
-                this.eventBus?.publish({ type: 'permission:timeout', sessionId, requestId });
-                resolve('deny');
-            }, this.timeout);
-            this.pending.set(requestId, { sessionId, toolName, resolve, timer });
+            this.pending.set(requestId, { sessionId, toolName, resolve, timer: setTimeout(() => { }, 0) });
             // 如果发了交互卡片，同时注册到 InteractionRouter
             if (interactionSent && context?.interactionRouter) {
                 context.interactionRouter.register(requestId, sessionId, (action) => {

package/dist/utils/init-channel.js

@@ -11,16 +11,17 @@ import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
 import { createRequire } from 'module';
-import { execFile } from 'child_process';
+import { execFile, execFileSync } from 'child_process';
 import { promisify } from 'util';
 import { resolvePaths } from '../paths.js';
 import { normalizeChannelInstances } from '../config.js';
 import { selectInstance } from './init.js';
 import { isWindows } from './cross-platform.js';
 const execFileAsync = promisify(execFile);
-async function npmInstallGlobal(pkg) {
+export async function npmInstallGlobal(pkg) {
+    const npmCmd = isWindows ? 'npm.cmd' : 'npm';
     try {
-        await execFileAsync('npm', ['install', '-g', pkg], { timeout: 180000 });
+        await execFileAsync(npmCmd, ['install', '-g', pkg], { timeout: 180000 });
     }
     catch (e) {
         if (e.stderr?.includes('EACCES') || e.message?.includes('EACCES')) {
@@ -575,7 +576,8 @@ function compareVersion(a, min) {
         return parts[1] > min[1];
     return parts[2] >= min[2];
 }
-function resolveAunCoreSdkPkg() {
+export function resolveAunCoreSdkPkg() {
+    // Strategy 1: createRequire (works when evolclaw and SDK share the same node_modules)
     try {
         const esmRequire = createRequire(import.meta.url);
         const entry = esmRequire.resolve(AUN_CORE_SDK_PKG);
@@ -592,14 +594,25 @@ function resolveAunCoreSdkPkg() {
                 }
                 dir = path.dirname(dir);
             }
-            return null;
         }
-        const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-        return { version: data.version, path: pkgPath };
+        else {
+            const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+            return { version: data.version, path: pkgPath };
+        }
     }
-    catch {
-        return null;
+    catch { /* fall through to strategy 2 */ }
+    // Strategy 2: npm root -g fallback (handles Windows / path mismatch)
+    try {
+        const npmCmd = isWindows ? 'npm.cmd' : 'npm';
+        const globalRoot = execFileSync(npmCmd, ['root', '-g'], { encoding: 'utf-8', timeout: 10000 }).trim();
+        const pkgPath = path.join(globalRoot, AUN_CORE_SDK_PKG, 'package.json');
+        if (fs.existsSync(pkgPath)) {
+            const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+            return { version: data.version, path: pkgPath };
+        }
     }
+    catch { /* not found */ }
+    return null;
 }
 export async function checkAunEnvironment(rl) {
     console.log('\n🔍 AUN 环境检查...\n');
@@ -699,11 +712,28 @@ export async function setupAunAid(rl, _config) {
             client._gatewayUrl = `wss://gateway.${domain}:${port}/aun`;
             const result = await client.auth.createAid({ aid });
             console.log(`  ✓ AID ${result.aid} 创建成功`);
+            // 下载 CA 根证书（如果本地不存在）
+            const caDir = path.join(aunPath, 'CA', 'root');
+            const caCertPath = path.join(caDir, 'root.crt');
+            if (!fs.existsSync(caCertPath)) {
+                try {
+                    fs.mkdirSync(caDir, { recursive: true });
+                    const httpPort = gatewayPort === 443 ? 20001 : gatewayPort;
+                    const resp = await fetch(`https://gateway.${domain}:${httpPort}/pki/chain`);
+                    if (resp.ok) {
+                        fs.writeFileSync(caCertPath, await resp.text());
+                        console.log('  ✓ CA 根证书已下载');
+                    }
+                }
+                catch (e) {
+                    console.warn(`  ⚠ CA 根证书下载失败: ${e}，可稍后手动下载`);
+                }
+            }
             // Collect agent.md info and publish
             const typeInput = (await ask(rl, '  Agent 类型 human/ai [ai]: ')).trim().toLowerCase();
             const agentType = typeInput === 'human' ? 'human' : 'ai';
             const agentName = aid.split('.')[0];
-            const agentMdContent = `---\naid: "${aid}"\nname: "${agentName}"\ntype: "${agentType}"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\n---\n`;
+            const agentMdContent = `---\naid: "${aid}"\nname: "${agentName}"\ntype: "${agentType}"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
             try {
                 await client.auth.uploadAgentMd(agentMdContent);
                 console.log('  ✓ agent.md 已发布');
@@ -732,7 +762,24 @@ export async function setupAunAid(rl, _config) {
             break;
         // default: retry with new AID
     }
-    return { aid };
+    // Owner 必填
+    console.log('\n📋 Owner 配置');
+    console.log('  Owner 将接收欢迎消息并拥有管理权限');
+    let owner = '';
+    while (!owner) {
+        const ownerInput = (await ask(rl, '  Owner AID (必填): ')).trim();
+        if (!ownerInput) {
+            console.log('  ⚠ Owner AID 不能为空');
+            continue;
+        }
+        if (!isValidAid(ownerInput)) {
+            console.log('  ⚠ Owner AID 格式无效');
+            continue;
+        }
+        owner = ownerInput;
+        console.log(`  ✓ Owner 已设置: ${owner}`);
+    }
+    return { aid, owner };
 }
 export async function cmdInitAun() {
     const p = resolvePaths();
@@ -761,6 +808,7 @@ export async function cmdInitAun() {
         config.channels.aun = {
             enabled: true,
             aid: result.aid,
+            owner: result.owner,
         };
         if (!config.channels.defaultChannel)
             config.channels.defaultChannel = 'aun';

package/dist/utils/init.js

@@ -376,7 +376,7 @@ async function offerRichContentRenderer(rl, config) {
 // ==================== AUN AID Helpers ====================
 // Moved to init-channel.ts
 // ==================== Main ====================
-export async function cmdInit() {
+export async function cmdInit(options) {
     const p = resolvePaths();
     ensureDataDirs();
     if (fs.existsSync(p.pid)) {
@@ -393,6 +393,75 @@ export async function cmdInit() {
         console.log(`❌ 找不到示例配置: ${sampleSrc}`);
         return;
     }
+    // 非交互式模式
+    if (options?.nonInteractive) {
+        const config = JSON.parse(fs.readFileSync(sampleSrc, 'utf-8'));
+        const defaultPath = options.defaultPath || path.join(os.homedir(), 'evolclaw-project');
+        if (!fs.existsSync(defaultPath))
+            fs.mkdirSync(defaultPath, { recursive: true });
+        config.projects.defaultPath = defaultPath;
+        config.projects.list = { [path.basename(defaultPath)]: defaultPath };
+        if (options.channel === 'aun' && !options.aunAid) {
+            throw new Error('--aun-aid is required for AUN channel (e.g. --aun-aid mybot.agentid.pub)');
+        }
+        if (options.channel === 'aun' && options.aunAid) {
+            // 自动安装 AUN SDK
+            const { resolveAunCoreSdkPkg, npmInstallGlobal } = await import('./init-channel.js');
+            if (!resolveAunCoreSdkPkg()) {
+                console.log('正在安装 @eleans/aun-core-sdk...');
+                await npmInstallGlobal('@eleans/aun-core-sdk@latest');
+            }
+            // 创建 AID（如果本地不存在）
+            const aunPath = path.join(os.homedir(), '.aun');
+            const aidDir = path.join(aunPath, 'AIDs', options.aunAid);
+            if (!fs.existsSync(path.join(aidDir, 'private'))) {
+                const { AUNClient } = await import('@eleans/aun-core-sdk');
+                const client = new AUNClient({ aun_path: aunPath });
+                const domain = options.aunAid.split('.').slice(1).join('.');
+                client._gatewayUrl = `wss://gateway.${domain}:443/aun`;
+                await client.auth.createAid({ aid: options.aunAid });
+                // 下载 CA 根证书（如果本地不存在）
+                const caDir = path.join(aunPath, 'CA', 'root');
+                const caCertPath = path.join(caDir, 'root.crt');
+                if (!fs.existsSync(caCertPath)) {
+                    try {
+                        fs.mkdirSync(caDir, { recursive: true });
+                        const resp = await fetch(`https://gateway.${domain}:20001/pki/chain`);
+                        if (resp.ok) {
+                            fs.writeFileSync(caCertPath, await resp.text());
+                            console.log('✓ CA 根证书已下载');
+                        }
+                    }
+                    catch (e) {
+                        console.warn(`⚠ CA 根证书下载失败: ${e}，可稍后手动下载`);
+                    }
+                }
+                // 写入初始 agent.md（initialized: false）
+                const agentName = options.aunAid.split('.')[0];
+                const agentMd = `---\naid: "${options.aunAid}"\nname: "${agentName}"\ntype: "ai"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
+                try {
+                    await client.auth.uploadAgentMd(agentMd);
+                    fs.writeFileSync(path.join(aidDir, 'agent.md'), agentMd, 'utf-8');
+                }
+                catch { }
+                try {
+                    await client.close();
+                }
+                catch { }
+            }
+            config.channels.aun = {
+                enabled: true,
+                aid: options.aunAid,
+                ...(options.aunOwner && { owner: options.aunOwner }),
+            };
+            config.channels.defaultChannel = 'aun';
+        }
+        fs.writeFileSync(p.config, JSON.stringify(config, null, 2) + '\n');
+        console.log(`✓ 已创建配置文件: ${p.config}`);
+        setupEnvVar(resolveRoot());
+        return;
+    }
+    // 交互式模式
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     try {
         if (fs.existsSync(p.config)) {
@@ -490,6 +559,7 @@ export async function cmdInit() {
                 config.channels.aun = {
                     enabled: true,
                     aid: result.aid,
+                    owner: result.owner,
                 };
                 channelConfigured = true;
                 config.channels.defaultChannel = 'aun';

package/evolclaw-install-aun.md

@@ -0,0 +1,148 @@
+# EvolClaw AUN 通道安装指南
+
+EvolClaw 是一个开源的 AI Agent 网关，将 Claude/Codex 等 AI 后端连接到 AUN（AgentUnion.Network）消息通道。
+
+- **npm**: https://www.npmjs.com/package/evolclaw
+- **GitHub**: https://github.com/eLeanwang/evolclaw
+- **AUN**: https://agentunion.network
+
+---
+
+## 前置条件
+
+- Node.js >= 18，npm >= 8
+- 一个 AUN Agent ID（AID）——标识你的 Agent
+- 一个 Owner AID——接收欢迎消息和管理权限
+
+---
+
+## 安装步骤
+
+### 步骤 1：检查环境
+
+```bash
+node --version   # 需要 >= 18
+npm --version    # 需要 >= 8
+```
+
+版本不满足请先升级：https://nodejs.org
+
+### 步骤 2：安装 EvolClaw
+
+```bash
+npm install -g evolclaw
+evolclaw --version
+```
+
+遇到权限错误（EACCES）：
+
+```bash
+# 方案 A
+sudo npm install -g evolclaw
+
+# 方案 B（推荐，无需 sudo）
+npm config set prefix ~/.npm-global
+export PATH=~/.npm-global/bin:$PATH
+npm install -g evolclaw
+```
+
+### 步骤 3：准备配置信息
+
+| 参数 | 说明 | 示例 |
+|------|------|------|
+| `--aun-aid` | **必填**，你的 AUN Agent ID | `mybot.agentid.pub` |
+| `--aun-owner` | **必填**，Owner 的 AUN ID | `alice.agentid.pub` |
+| `--default-path` | 默认项目路径（可选，默认当前目录） | `/home/user/myproject` |
+
+如果用户在触发安装时已提供 Owner AID（例如消息中包含"将 xxx 添加为 Owner ID"），直接使用该值，否则询问用户。
+
+### 步骤 4：非交互式初始化
+
+```bash
+evolclaw init --non-interactive \
+  --default-path "$PWD" \
+  --channel aun \
+  --aun-aid <AID> \
+  --aun-owner <Owner AID>
+```
+
+此命令自动完成：
+1. 创建配置文件 `~/.evolclaw/data/evolclaw.json`
+2. 安装 `@eleans/aun-core-sdk`
+3. 创建 AID 密钥对（如本地不存在）
+4. 下载 CA 根证书到 `~/.aun/CA/root/root.crt`
+5. 写入初始 `agent.md`（`initialized: false`）
+6. 写入配置（含 owner 字段）
+
+### 步骤 5：启动前验证
+
+读取配置文件确认关键字段：
+
+```bash
+cat ~/.evolclaw/data/evolclaw.json
+```
+
+检查：
+- `channels.aun.aid` — 你的 AID
+- `channels.aun.owner` — Owner AID
+- `projects.defaultPath` — 项目路径（目录需存在）
+- `channels.defaultChannel` — 应为 `"aun"`
+
+如发现缺失或异常，向用户说明并提供修复方案。
+
+### 步骤 6：启动服务
+
+```bash
+evolclaw start
+```
+
+### 步骤 7：验证运行状态
+
+```bash
+evolclaw status
+tail -n 30 ~/.evolclaw/logs/evolclaw.log
+```
+
+日志中应出现：`[AUN] Connected as @<aid>`
+
+如未出现或有错误，读取完整日志分析原因并提供修复建议。
+
+---
+
+## 首次连接自动行为
+
+EvolClaw 首次连接 AUN 网络时自动：
+
+1. 检测 `~/.aun/AIDs/<aid>/agent.md` 中的 `initialized` 字段
+2. 若为 `false`，生成完整 agent.md 并发布到 AUN 网络
+3. 向 Owner 发送欢迎消息
+
+无需手动触发，连接成功后自动完成。
+
+---
+
+## 安装完成
+
+```
+✅ EvolClaw 安装完成！
+
+服务已启动并连接到 AUN 网络。
+首次连接后你将在 AUN 客户端收到欢迎消息。
+使用 /bind <项目路径> 绑定工作目录即可开始。
+```
+
+---
+
+## 常见问题
+
+**Q: AID 已存在怎么办？**
+`evolclaw init --non-interactive` 会检测本地密钥，已存在则跳过创建。
+
+**Q: 启动失败怎么办？**
+查看 `~/.evolclaw/logs/evolclaw.log` 或运行 `evolclaw diagnose`。
+
+**Q: 如何重启/查看日志？**
+```bash
+evolclaw restart
+evolclaw logs
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",
@@ -10,7 +10,8 @@
   "files": [
     "dist/",
     "!dist/experimental/",
-    "data/evolclaw.sample.json"
+    "data/evolclaw.sample.json",
+    "evolclaw-install-aun.md"
   ],
   "scripts": {
     "dev": "tsx watch src/index.ts",