evolclaw 2.5.4 → 2.5.5

package/README.md

@@ -260,7 +260,7 @@ evolclaw/
 
 ### Owner 专属命令
 
-- `/send <文件路径>` - 发送文件给用户
+- `/file <文件路径>` - 发送文件给用户
 - `/restart` - 重启服务（自愈机制）
 - `/repair` - 检查并修复会话
 - `/agentmd [put|set]` - 管理 AUN agent.md（仅 AUN 渠道）

package/aun/pyproject.toml

@@ -0,0 +1,20 @@
+[project]
+name = "aun-cli"
+version = "0.1.0"
+description = "AUN CLI - Interactive command-line client for AUN protocol"
+requires-python = ">=3.10"
+dependencies = [
+    "aunp>=0.2.12",
+    "prompt-toolkit>=3.0.0",
+    "rich>=13.0.0",
+]
+
+[project.scripts]
+aun = "aun_cli:cli_main"
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+py-modules = ["aun_cli"]

package/data/evolclaw.sample.json

@@ -1,7 +1,12 @@
 {
   "agents": {
     "anthropic": {
-      "model": "sonnet"
+      "apiKey": "",
+      "baseUrl": "",
+      "model": "sonnet",
+      "effort": "high",
+      "useSettingSources": true,
+      "agentProgressSummaries": true
     },
     "openai": {
       "apiKey": "your-openai-api-key",
@@ -10,7 +15,10 @@
       "effort": "medium"
     },
     "google": {
-      "model": "gemini-2.5-flash"
+      "apiKey": "",
+      "model": "gemini-2.5-flash",
+      "cliPath": "",
+      "mode": "cli"
     },
     "defaultAgent": "claude"
   },
@@ -19,17 +27,26 @@
     "feishu": {
       "enabled": true,
       "appId": "",
-      "appSecret": ""
+      "appSecret": "",
+      "owner": "",
+      "flushDelay": 10,
+      "debounce": 2,
+      "showActivities": "dm-only"
     },
     "wechat": {
       "enabled": false,
       "baseUrl": "https://ilinkai.weixin.qq.com",
-      "token": ""
+      "token": "",
+      "owner": "",
+      "flushDelay": 3,
+      "debounce": 2,
+      "showActivities": "all"
     },
     "aun": {
       "enabled": false,
       "aid": "your-agent.agentid.pub",
-      "gatewayPort": 443
+      "owner": "",
+      "showActivities": "owner-dm-only"
     }
   },
   "projects": {
@@ -37,11 +54,16 @@
     "autoCreate": true,
     "list": {}
   },
+  "flushDelay": 4,
+  "debounce": 2,
+  "showActivities": "all",
   "idleMonitor": {
     "enabled": true,
     "timeout": 120,
-    "safeModeThreshold": 3
+    "safeModeThreshold": 0
   },
-  "flushDelay": 4,
-  "showActivities": "all"
+  "debug": {
+    "flusherDiag": false,
+    "aunTrace": false
+  }
 }

package/dist/agents/claude-runner.js

@@ -84,6 +84,7 @@ export class AgentRunner {
     sendPromptFn;
     permissionContexts = new Map();
     currentEvolclawSessionId;
+    claudeExecutablePath;
     constructor(apiKey, model, onSessionIdUpdate, baseUrl, config) {
         this.apiKey = apiKey;
         this.model = model || 'sonnet';
@@ -91,6 +92,10 @@ export class AgentRunner {
         this.baseUrl = baseUrl;
         this.config = config;
         this.onSessionIdUpdate = onSessionIdUpdate;
+        if (config) {
+            const anthropic = resolveAnthropicConfig(config);
+            this.claudeExecutablePath = anthropic.pathToClaudeCodeExecutable;
+        }
     }
     getAgentEnv() {
         return {
@@ -626,11 +631,18 @@ export class AgentRunner {
         const excludeDynamic = this.config?.agents?.anthropic?.excludeDynamicSections === true;
         // 公共 options（新旧模式共用）
         const sdkPermissionMode = this.toSdkPermissionMode();
-        logger.info(`[AgentRunner] runQuery model=${this.model} effort=${this.effort ?? 'auto'} permMode=${this.permissionMode} sdkMode=${sdkPermissionMode} systemPromptAppend=${systemPromptAppend ? systemPromptAppend.substring(0, 100) + '...' : 'none'}`);
+        logger.info(`[AgentRunner] runQuery model=${this.model} effort=${this.effort ?? 'auto'} permMode=${this.permissionMode} sdkMode=${sdkPermissionMode}`);
+        if (systemPromptAppend) {
+            logger.info(`[AgentRunner] systemPromptAppend (full):\n${systemPromptAppend}`);
+        }
+        else {
+            logger.info(`[AgentRunner] systemPromptAppend: none`);
+        }
         const commonOptions = {
             cwd: projectPath,
             model: this.model,
             ...(this.effort ? { effort: this.effort } : {}),
+            ...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
             autoCompactWindow: 200000,
             advisorModel: 'haiku',
             canUseTool: canUseToolCallback,

package/dist/channels/aun.js

@@ -1,4 +1,4 @@
-import { AUNClient, GatewayDiscovery } from '@eleans/aun-core-sdk';
+import { AUNClient, GatewayDiscovery } from '@agentunion/aun-node';
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
@@ -1072,6 +1072,7 @@ export class AUNChannelPlugin {
             const options = {
                 flushDelay: inst.flushDelay ?? 3,
                 fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
+                sessionMode: inst.sessionMode,
             };
             result.push({
                 channelType: 'aun',

package/dist/cli.js

@@ -1241,33 +1241,6 @@ async function cmdDiagnose() {
         console.log('\n[diagnose] ✓ 所有检查通过');
     }
 }
-async function cmdTui() {
-    const config = loadConfig();
-    // Find the first AUN instance (TUI connects to one AUN instance)
-    const aunResolved = resolveInstanceConfig(config, 'aun');
-    const aun = aunResolved?.type === 'aun' ? aunResolved.config : null;
-    if (!aun?.owner || !aun?.aid) {
-        console.error('[tui] AUN 未配置，请先运行: evolclaw init aun');
-        process.exit(1);
-    }
-    // TUI requires Python + aun_core (independent of init aun which is now pure TS)
-    const pythonCheck = aun.pythonBin || process.env.AUN_PYTHON || 'python3';
-    if (!platform.commandExists(pythonCheck)) {
-        console.error(`[tui] Python 未找到 (${pythonCheck})`);
-        console.error('  → TUI 依赖 Python 和 aun-core (>=0.2.9): pip3 install -U aun-core');
-        process.exit(1);
-    }
-    const pythonBin = aun.pythonBin || process.env.AUN_PYTHON || 'python3';
-    const cliScript = path.join(getPackageRoot(), 'aun', 'aun_cli.py');
-    if (!fs.existsSync(cliScript)) {
-        console.error(`[tui] aun_cli.py 不存在: ${cliScript}`);
-        console.error('  → TUI 需要 AUN CLI 工具，请确认源码目录包含 aun/aun_cli.py');
-        console.error('  → 安装: pip3 install -U aun-core && 从源码仓库获取 aun_cli.py');
-        process.exit(1);
-    }
-    const child = spawn(pythonBin, [cliScript, '-a', aun.owner, '-t', aun.aid], { stdio: 'inherit' });
-    child.on('exit', (code) => process.exit(code ?? 0));
-}
 // ==================== Ctl ====================
 async function cmdCtl(args) {
     if (args.length === 0) {
@@ -1275,6 +1248,8 @@ async function cmdCtl(args) {
         console.error('示例: evolclaw ctl model sonnet');
         console.error('      evolclaw ctl status');
         console.error('      evolclaw ctl effort high');
+        console.error('      evolclaw ctl send "<消息内容>"   # proactive 模式主动发消息');
+        console.error('      evolclaw ctl chatmode proactive  # 切换会话模式');
         process.exit(1);
     }
     const sessionId = process.env.EVOLCLAW_SESSION_ID;
@@ -1332,6 +1307,12 @@ export async function main(args) {
             else if (args[1] === 'wecom') {
                 await cmdInitWecom();
             }
+            else if (args[1]) {
+                const supported = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
+                console.error(`❌ 不支持的渠道: ${args[1]}`);
+                console.error(`   支持的渠道: ${supported.join(', ')}`);
+                process.exit(1);
+            }
             else {
                 const nonInteractive = args.includes('--non-interactive');
                 if (nonInteractive) {
@@ -1372,14 +1353,11 @@ export async function main(args) {
         case 'diagnose':
             await cmdDiagnose();
             break;
-        case 'tui':
-            await cmdTui();
-            break;
         case 'ctl':
             await cmdCtl(args.slice(1));
             break;
         default:
-            console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|tui|ctl|diagnose|mv}
+            console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|ctl|diagnose|mv}
 
 Commands:
   init          创建配置文件 (${resolvePaths().config})
@@ -1397,7 +1375,6 @@ Commands:
                   --level error|warn   只显示指定级别及以上
                   --module <name>      只显示指定模块（如 feishu、AgentRunner）
                   --raw                原始输出，不着色
-  tui           启动 AUN TUI 客户端
   diagnose      诊断启动环境（配置、数据库、进程）
   mv <old> <new>  迁移项目目录（保留 Claude/Codex/EvolClaw 会话）
 

package/dist/config.js

@@ -73,7 +73,10 @@ export function resolveAnthropicConfig(config) {
     const effort = config.agents?.anthropic?.effort
         || settings.effortLevel
         || undefined;
-    return { apiKey, baseUrl, model, effort };
+    const configExecPath = config.agents?.anthropic?.pathToClaudeCodeExecutable;
+    const isPlaceholderExec = !configExecPath || configExecPath.includes('your-') || configExecPath.includes('placeholder');
+    const pathToClaudeCodeExecutable = isPlaceholderExec ? undefined : configExecPath;
+    return { apiKey, baseUrl, model, effort, pathToClaudeCodeExecutable };
 }
 export function resolveOpenaiConfig(config) {
     const codexSettings = loadCodexSettings();
@@ -305,6 +308,28 @@ export function setChannelShowActivities(config, instanceName, mode) {
         }
     }
 }
+/**
+ * 读取通道实例的 sessionMode 锁定配置
+ * 返回 undefined 表示未配置（由 session-manager 按 chatType 默认决定）
+ */
+export function getChannelSessionMode(config, instanceName) {
+    for (const type of channelTypes) {
+        const raw = config.channels?.[type];
+        if (raw === undefined)
+            continue;
+        if (Array.isArray(raw)) {
+            const inst = raw.find((item) => item.name === instanceName);
+            if (inst)
+                return inst.sessionMode;
+        }
+        else {
+            const effectiveName = raw.name ?? type;
+            if (effectiveName === instanceName)
+                return raw.sessionMode;
+        }
+    }
+    return undefined;
+}
 export function isOwner(config, channelOrType, userId) {
     // 按实例名精确匹配
     if (getOwner(config, channelOrType) === userId)

package/dist/core/command-handler.js

@@ -1,5 +1,5 @@
 import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
-import { saveConfig, resolvePaths, getPackageRoot, getOwner, getChannelShowActivities, setChannelShowActivities } from '../config.js';
+import { saveConfig, resolvePaths, getPackageRoot, getOwner, getChannelShowActivities, setChannelShowActivities, getChannelSessionMode } from '../config.js';
 import { logger } from '../utils/logger.js';
 import crypto from 'crypto';
 import path from 'path';
@@ -103,7 +103,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', '/send', '/check', '/rewind', '/activity', '/agentmd'];
+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', '/agentmd', '/chatmode'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -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', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode'];
 export class CommandHandler {
     sessionManager;
     config;
@@ -406,7 +406,7 @@ export class CommandHandler {
                         { cmd: '/restart', label: '重启/重连', desc: '重启服务或重连指定渠道', next: { type: 'select', dynamic: true } },
                     ] : []),
                     ...(isOwner ? [
-                        { cmd: '/send', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
+                        { cmd: '/file', 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' } },
@@ -529,7 +529,7 @@ export class CommandHandler {
             }
         }
         // 空闲检查：某些命令需要等待当前会话空闲
-        const requiresIdle = ['/new', '/session', '/clear', '/compact', '/safe', '/repair', '/fork', '/bind', '/project', '/agent', '/rewind'];
+        const requiresIdle = ['/new', '/session', '/clear', '/compact', '/safe', '/repair', '/fork', '/bind', '/project', '/agent', '/rewind', '/chatmode'];
         if (requiresIdle.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' '))) {
             if (threadId) {
                 // 话题中：检查话题 session 是否在处理（不创建）
@@ -633,7 +633,7 @@ export class CommandHandler {
                 ] : []),
                 ...(isOwner ? [
                     '  /restart - 重启服务',
-                    '  /send [channel] <path> - 发送项目内文件',
+                    '  /file [channel] <path> - 发送项目内文件',
                     '  /agentmd [put|set <内容>] - 管理 agent.md',
                 ] : []),
                 '',
@@ -1207,6 +1207,10 @@ export class CommandHandler {
         if (normalizedContent === '/activity' || normalizedContent.startsWith('/activity ')) {
             if (!isAdmin)
                 return '❌ 无权限：此命令仅限管理员使用';
+            // proactive 模式下流式输出全部静默，activity 配置无意义
+            if (activeSession?.sessionMode === 'proactive') {
+                return '❌ 当前会话为 proactive 模式，不支持 activity 配置（流式输出已全部静默）';
+            }
             const activityArg = normalizedContent.slice(9).trim();
             const modeMap = {
                 all: 'all',
@@ -1284,6 +1288,31 @@ export class CommandHandler {
             setChannelShowActivities(this.config, channel, newMode);
             return `✅ 中间输出模式: ${activityArg}（${label}）`;
         }
+        // /chatmode 命令：查看/切换 session 会话模式（interactive | proactive）
+        if (normalizedContent === '/chatmode' || normalizedContent.startsWith('/chatmode ')) {
+            if (!isAdmin)
+                return '❌ 无权限：此命令仅限管理员使用';
+            if (!activeSession)
+                return '❌ 当前无活跃会话';
+            const lockedMode = getChannelSessionMode(this.config, channel);
+            const arg = normalizedContent.slice(9).trim();
+            const currentMode = activeSession.sessionMode || 'interactive';
+            if (!arg) {
+                const lockHint = lockedMode ? `（由通道配置锁定为 ${lockedMode}）` : '';
+                return `📋 当前会话模式: ${currentMode}${lockHint}\n可选: interactive / proactive\n用法: /chatmode <模式>`;
+            }
+            if (arg !== 'interactive' && arg !== 'proactive') {
+                return `❌ 无效模式: ${arg}\n可选: interactive / proactive`;
+            }
+            if (lockedMode) {
+                return `❌ 会话模式由通道配置锁定为 ${lockedMode}，无法切换`;
+            }
+            if (arg === currentMode) {
+                return `📋 当前会话模式已是 ${arg}`;
+            }
+            await this.sessionManager.updateSession(activeSession.id, { sessionMode: arg });
+            return `✅ 会话模式已切换: ${arg}`;
+        }
         // /stop 命令：中断当前任务
         if (normalizedContent === '/stop') {
             const stopResult = await this.ensureSession(channel, channelId, threadId);
@@ -1633,15 +1662,15 @@ export class CommandHandler {
             }
             return `当前项目: ${session.projectPath}`;
         }
-        // /send 命令：发送项目内文件，支持 /send path 和 /send channel path（owner only）
-        if (normalizedContent.startsWith('/send')) {
+        // /file 命令：发送项目内文件，支持 /file path 和 /file channel path（owner only）
+        if (normalizedContent.startsWith('/file')) {
             if (!isOwner)
                 return '❌ 无权限：此命令仅限 owner 使用';
             // 飞书会将 .md 等后缀自动转为 Markdown 链接: foo.md → [foo.md](http://foo.md/)
             // 还原: 将 [text](url) 替换为 text
             const rawArg = normalizedContent.slice(5).trim().replace(/\[([^\]]+)\]\([^)]+\)/g, '$1');
             if (!rawArg) {
-                return '用法: /send <相对路径> 或 /send <渠道> <相对路径>\n示例: /send src/index.ts\n示例: /send feishu report.md';
+                return '用法: /file <相对路径> 或 /file <渠道> <相对路径>\n示例: /file src/index.ts\n示例: /file feishu report.md';
             }
             // 解析目标通道：第一个 token 按实例名匹配，再按 channelType 匹配
             const tokens = rawArg.split(/\s+/);
@@ -1733,7 +1762,7 @@ export class CommandHandler {
                     : `✅ 已发送: ${filePath} (${sizeStr})`;
             }
             catch (error) {
-                logger.error('[CommandHandler] /send failed:', error);
+                logger.error('[CommandHandler] /file failed:', error);
                 return `❌ 文件发送失败: ${error.message || error}`;
             }
         }
@@ -2572,8 +2601,24 @@ export class CommandHandler {
     static CTL_COMMANDS = [
         '/help', '/status', '/check',
         '/model', '/effort', '/perm',
-        '/compact', '/activity', '/send', '/restart', '/agentmd',
+        '/compact', '/activity', '/file', '/send', '/chatmode', '/restart', '/agentmd',
     ];
+    /**
+     * 从 session 恢复 ReplyContext，用于 ctl send 主动发送文本时的路由
+     * - 群聊话题：metadata.replyContext.{threadId,peerId}
+     * - 私聊：metadata.peerId
+     */
+    buildCtlReplyContext(session) {
+        const ctx = {};
+        const meta = session.metadata;
+        if (meta?.replyContext?.threadId)
+            ctx.threadId = meta.replyContext.threadId;
+        if (meta?.replyContext?.peerId)
+            ctx.peerId = meta.replyContext.peerId;
+        if (!ctx.peerId && meta?.peerId)
+            ctx.peerId = meta.peerId;
+        return Object.keys(ctx).length > 0 ? ctx : undefined;
+    }
     /**
      * Agent ctl 入口：通过 IPC 接收 Agent 自主管理指令
      * 复用现有 slash cmd 逻辑，权限继承 session 用户角色
@@ -2591,8 +2636,25 @@ export class CommandHandler {
         }
         // 3. 从 session.metadata.peerId 获取 userId（用于权限判断）
         const userId = session.metadata?.peerId;
-        // 4. send 路径限制：只允许 projectPath 下的文件
-        if (cmd.startsWith('/send')) {
+        // 4. /send 文本消息：直接通过 adapter 主动发送，不走 handle()
+        if (cmd.startsWith('/send ') || cmd === '/send') {
+            const text = cmd.startsWith('/send ') ? cmd.slice(6).trim() : '';
+            if (!text)
+                return { ok: false, error: '消息内容不能为空' };
+            const adapter = this.adapters.get(session.channel);
+            if (!adapter)
+                return { ok: false, error: `adapter 未找到: ${session.channel}` };
+            try {
+                const replyContext = this.buildCtlReplyContext(session);
+                await adapter.sendText(session.channelId, text, replyContext);
+                return { ok: true, result: '已发送' };
+            }
+            catch (err) {
+                return { ok: false, error: err.message || String(err) };
+            }
+        }
+        // 5. file 路径限制：只允许 projectPath 下的文件
+        if (cmd.startsWith('/file')) {
             const sendArgs = cmd.slice(5).trim();
             const parts = sendArgs.split(/\s+/);
             const filePath = parts[parts.length - 1];
@@ -2603,7 +2665,7 @@ export class CommandHandler {
                 }
             }
         }
-        // 5. 调用现有 handle()，不传 sendMessage 回调（结果直接返回）
+        // 6. 调用现有 handle()，不传 sendMessage 回调（结果直接返回）
         try {
             const result = await this.handle(cmd, session.channel, session.channelId, undefined, // 不发送消息
             userId);