evolclaw 2.0.1 → 2.0.2

package/dist/core/command-handler.js

@@ -70,6 +70,26 @@ export class CommandHandler {
         this.config = config;
         this.messageCache = messageCache;
     }
+    /** 项目列表快捷访问 */
+    get projects() {
+        return this.config.projects?.list || {};
+    }
+    /** 根据项目路径查找配置中的项目名称 */
+    getConfiguredProjectName(projectPath) {
+        return Object.entries(this.projects).find(([_, p]) => p === projectPath)?.[0];
+    }
+    /** 根据项目路径查找项目名称（未配置时回退到目录名） */
+    getProjectName(projectPath) {
+        return this.getConfiguredProjectName(projectPath) || path.basename(projectPath);
+    }
+    /** 获取活跃会话，无会话时返回统一错误提示 */
+    async ensureSession(channel, channelId) {
+        const session = await this.sessionManager.getActiveSession(channel, channelId);
+        if (!session) {
+            return { error: '❌ 当前没有活跃会话\n使用 /new 创建新会话' };
+        }
+        return { session };
+    }
     setProcessor(processor) {
         this.processor = processor;
     }
@@ -79,6 +99,9 @@ export class CommandHandler {
     registerAdapter(adapter) {
         this.adapters.set(adapter.name, adapter);
     }
+    getAdapter(channelName) {
+        return this.adapters.get(channelName);
+    }
     /**
      * 快速判断是否为命令（不进队列的命令）
      */
@@ -97,11 +120,14 @@ export class CommandHandler {
                 break;
             }
         }
-        // 权限检查：只有主人可以执行斜杠命令
+        // 权限检查：区分用户级命令和管理级命令
+        const { isOwner: checkOwner } = await import('../config.js');
+        const isAdmin = !userId || checkOwner(this.config, channel, userId);
         if (normalizedContent.startsWith('/')) {
-            const { isOwner } = await import('../config.js');
-            if (userId && !isOwner(this.config, channel, userId)) {
-                return '❌ 无权限：只有主人可以执行命令';
+            const userCommands = ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/s '];
+            const isUserCommand = userCommands.some(cmd => normalizedContent === cmd.trimEnd() || normalizedContent.startsWith(cmd));
+            if (!isUserCommand && !isAdmin) {
+                return '❌ 无权限：此命令仅限管理员使用';
             }
         }
         // 检查是否以 / 开头（可能是命令）
@@ -126,6 +152,18 @@ export class CommandHandler {
             return null;
         // /help 命令不需要会话
         if (normalizedContent === '/help') {
+            if (!isAdmin) {
+                return `可用命令：
+🔄 会话管理：
+  /new [名称] - 创建新会话（可选命名）
+  /slist - 列出当前项目的所有会话
+  /s, /session <名称> - 切换到指定会话
+  /name, /rename <新名称> - 重命名当前会话
+  /status - 显示会话状态
+
+❓ 帮助：
+  /help - 显示此帮助信息`;
+            }
             return `可用命令：
 📁 项目管理：
   /pwd - 显示当前项目路径
@@ -167,9 +205,11 @@ export class CommandHandler {
                 const modelList = availableModels.map(m => `- ${m}`).join('\n');
                 return `❌ 无效的模型ID: ${args}\n\n可用模型：\n${modelList}`;
             }
-            if (!this.config.anthropic)
-                this.config.anthropic = {};
-            this.config.anthropic.model = args;
+            if (!this.config.agents)
+                this.config.agents = {};
+            if (!this.config.agents.anthropic)
+                this.config.agents.anthropic = {};
+            this.config.agents.anthropic.model = args;
             saveConfig(this.config);
             this.agentRunner.setModel(args);
             return `✓ 已切换到模型: ${args}`;
@@ -186,10 +226,10 @@ export class CommandHandler {
         }
         // /clear 命令：通过 SDK /clear 清空会话历史
         if (normalizedContent === '/clear') {
-            const session = await this.sessionManager.getSession(channel, channelId);
-            if (!session) {
-                return '❌ 当前没有活跃会话\n使用 /new 创建新会话';
-            }
+            const result = await this.ensureSession(channel, channelId);
+            if ('error' in result)
+                return result.error;
+            const { session } = result;
             if (!session.claudeSessionId) {
                 return '❌ 当前会话没有历史记录，无需清空';
             }
@@ -208,10 +248,10 @@ export class CommandHandler {
         }
         // /compact 命令：手动压缩会话上下文
         if (normalizedContent === '/compact') {
-            const session = await this.sessionManager.getSession(channel, channelId);
-            if (!session) {
-                return '❌ 当前没有活跃会话\n使用 /new 创建新会话';
-            }
+            const result = await this.ensureSession(channel, channelId);
+            if ('error' in result)
+                return result.error;
+            const { session } = result;
             if (!session.claudeSessionId) {
                 return '❌ 当前会话没有历史记录，无需压缩';
             }
@@ -258,9 +298,7 @@ export class CommandHandler {
                     activeStatus += ' [处理中]';
                 }
             }
-            const projects = this.config.projects?.list || {};
-            const projectName = Object.entries(projects)
-                .find(([_, p]) => p === session.projectPath)?.[0] || path.basename(session.projectPath);
+            const projectName = this.getProjectName(session.projectPath);
             const health = await this.sessionManager.getHealthStatus(session.id);
             const timeSinceSuccess = Date.now() - health.lastSuccessTime;
             const timeStr = timeSinceSuccess < 60000 ? '刚刚' :
@@ -276,20 +314,13 @@ export class CommandHandler {
                     session.name = fileInfo.title;
                 }
             }
-            const lines = [
-                '📊 会话状态：',
-                `渠道: ${channel} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`,
-                `会话ID: ${session.id}`,
-                `项目路径: ${session.projectPath}`,
-                `活跃状态: ${activeStatus}`,
-                `会话轮数: ${sessionTurns}`,
-                `异常计数: ${health.consecutiveErrors}`,
-                `安全模式: ${health.safeMode ? '是 ⚠️' : '否 ✓'}`,
-                `最后成功: ${timeStr}`,
-                `Claude会话: ${session.claudeSessionId || '(未初始化)'}`,
-                `创建时间: ${new Date(session.createdAt).toLocaleString('zh-CN')}`,
-                `更新时间: ${new Date(session.updatedAt).toLocaleString('zh-CN')}`
-            ];
+            const lines = [];
+            if (isAdmin) {
+                lines.push('📊 会话状态：', `渠道: ${channel} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `活跃状态: ${activeStatus}`, `会话轮数: ${sessionTurns}`, `异常计数: ${health.consecutiveErrors}`, `安全模式: ${health.safeMode ? '是 ⚠️' : '否 ✓'}`, `最后成功: ${timeStr}`, `Claude会话: ${session.claudeSessionId || '(未初始化)'}`, `创建时间: ${new Date(session.createdAt).toLocaleString('zh-CN')}`, `更新时间: ${new Date(session.updatedAt).toLocaleString('zh-CN')}`);
+            }
+            else {
+                lines.push('📊 会话状态：', `会话: ${session.name || '(未命名)'}`, `状态: ${activeStatus}`, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
+            }
             if (health.safeMode) {
                 lines.push('');
                 lines.push('⚠️ 当前处于安全模式（历史上下文已禁用）');
@@ -374,24 +405,14 @@ export class CommandHandler {
 
 提示：发送任意消息或使用 /new 命令创建会话`;
             }
-            const projects = this.config.projects?.list || {};
-            let projectName = '';
-            for (const [name, projectPath] of Object.entries(projects)) {
-                if (projectPath === session.projectPath) {
-                    projectName = name;
-                    break;
-                }
-            }
-            if (projectName) {
-                return `当前项目: ${projectName}\n路径: ${session.projectPath}`;
-            }
-            else {
-                return `当前项目: ${session.projectPath}`;
+            const configName = this.getConfiguredProjectName(session.projectPath);
+            if (configName) {
+                return `当前项目: ${configName}\n路径: ${session.projectPath}`;
             }
+            return `当前项目: ${session.projectPath}`;
         }
         // /plist 命令：列出所有项目
         if (normalizedContent === '/plist') {
-            const projects = this.config.projects?.list || {};
             const isGroup = await this.isGroupChat(channel, channelId);
             if (isGroup) {
                 if (!session) {
@@ -399,8 +420,7 @@ export class CommandHandler {
 
 请使用 /bind <项目路径> 绑定项目`;
                 }
-                const projectName = Object.entries(projects)
-                    .find(([_, p]) => p === session.projectPath)?.[0] || path.basename(session.projectPath);
+                const projectName = this.getProjectName(session.projectPath);
                 const sessionKey = `${channel}-${channelId}`;
                 const queueLength = this.messageQueue.getQueueLength(sessionKey);
                 const status = queueLength > 0 ? '[处理中]' : '[空闲]';
@@ -414,7 +434,7 @@ export class CommandHandler {
             const processingProject = this.messageQueue.getProcessingProject(sessionKey);
             const queueLength = this.messageQueue.getQueueLength(sessionKey);
             const normalizePath = (p) => p.replace(/\/+$/, '');
-            for (const [name, projectPath] of Object.entries(projects)) {
+            for (const [name, projectPath] of Object.entries(this.projects)) {
                 const isCurrent = session?.projectPath === projectPath;
                 const prefix = isCurrent ? '  ✓' : '   ';
                 const projectSession = await this.sessionManager.getSessionByProjectPath(channel, channelId, projectPath);
@@ -473,8 +493,7 @@ export class CommandHandler {
                 projectName = path.basename(arg);
             }
             else {
-                const projects = this.config.projects?.list || {};
-                projectPath = projects[arg];
+                projectPath = this.projects[arg];
                 if (!projectPath) {
                     return `❌ 项目 "${arg}" 不存在\n提示: 使用 /plist 查看可用项目`;
                 }
@@ -637,8 +656,7 @@ export class CommandHandler {
             }
             const isGroup = await this.isGroupChat(channel, channelId);
             if (!targetSession && sessionName.length === 8 && !isGroup) {
-                const projects = this.config.projects?.list || {};
-                const projectPaths = Object.values(projects);
+                const projectPaths = Object.values(this.projects);
                 if (session) {
                     projectPaths.unshift(session.projectPath);
                 }
@@ -647,7 +665,7 @@ export class CommandHandler {
                     const cliSession = cliSessions.find(c => c.uuid.startsWith(sessionName));
                     if (cliSession) {
                         const imported = await this.sessionManager.importCliSession(channel, channelId, projectPath, cliSession.uuid);
-                        const projectName = Object.entries(projects).find(([_, p]) => p === projectPath)?.[0] || path.basename(projectPath);
+                        const projectName = this.getProjectName(projectPath);
                         return `✓ 已导入 CLI 会话: ${imported.name}\n  项目: ${projectName}\n  将继续之前的对话历史`;
                     }
                 }

package/dist/core/message-processor.js

@@ -45,7 +45,7 @@ export class MessageProcessor {
     async processMessage(message) {
         const isGroup = message.isGroup ?? false;
         this.currentIsGroup = isGroup;
-        const idleMs = this.config.timeout?.idle ?? 120000;
+        const idleMs = this.config.idleMonitor?.timeout ?? 120000;
         const streamKey = `${message.channel}-${message.channelId}`;
         const channelInfo = this.channels.get(message.channel);
         const monitorEnabled = this.config.idleMonitor?.enabled !== false;
@@ -242,7 +242,7 @@ export class MessageProcessor {
                 await this.processEventStream(stream, session, message.channelId, adapter, options, flusher, isBackground, resetTimer);
             }
             catch (error) {
-                if (this.isContextTooLongError(error) && session.claudeSessionId) {
+                if (classifyError(error) === ErrorType.CONTEXT_TOO_LONG && session.claudeSessionId) {
                     // 尝试 compact 压缩会话
                     flusher.addActivity('⚠️ 上下文过长，正在压缩会话...');
                     await flusher.flush();
@@ -268,7 +268,18 @@ export class MessageProcessor {
                 const fileMatches = [...fullText.matchAll(options.fileMarkerPattern)];
                 for (const match of fileMatches) {
                     const filePath = match[1].trim();
+                    // 占位符/示例检测：静默跳过，不打扰用户
+                    if (this.isPlaceholderPath(filePath)) {
+                        logger.info(`[${adapter.name}] Skipped placeholder file marker: [SEND_FILE:${filePath}]`);
+                        continue;
+                    }
                     const resolvedPath = this.resolveFilePath(filePath, absoluteProjectPath);
+                    // 文件存在性检查：真实路径但文件不存在，告知用户
+                    if (!fs.existsSync(resolvedPath)) {
+                        logger.warn(`[${adapter.name}] File not found: ${resolvedPath}`);
+                        await adapter.sendText(message.channelId, `⚠️ 文件未找到: ${filePath}`);
+                        continue;
+                    }
                     logger.info(`[${adapter.name}] Sending file: ${resolvedPath}`);
                     try {
                         await adapter.sendFile(message.channelId, resolvedPath);
@@ -471,14 +482,6 @@ export class MessageProcessor {
             throw error; // 重新抛出，让外层处理
         }
     }
-    /**
-     * 判断是否为上下文过长错误
-     */
-    isContextTooLongError(error) {
-        const msg = (error?.message || String(error)).toLowerCase();
-        return msg.includes('上下文过长') || msg.includes('context too long')
-            || msg.includes('context_length_exceeded');
-    }
     /**
      * 格式化工具描述（通用）
      */
@@ -513,4 +516,27 @@ export class MessageProcessor {
         // 都找不到，返回项目根目录路径
         return rootPath;
     }
+    /**
+     * 判断文件路径是否为占位符/示例文本
+     * 用于过滤大模型在说明文字中误写的 [SEND_FILE:...] 标记
+     */
+    isPlaceholderPath(filePath) {
+        if (!filePath)
+            return true;
+        // 精确占位符
+        const exactPlaceholders = ['...', '…', 'path', 'file', 'file_path', 'filepath',
+            '路径', '文件路径', '文件', 'filename', 'xxx'];
+        if (exactPlaceholders.includes(filePath.toLowerCase()))
+            return true;
+        // 示例路径前缀
+        if (/^(\/path\/to\/|\.\/path\/to\/|example\/|示例|\/example)/i.test(filePath))
+            return true;
+        // 含模板变量
+        if (/\$\{.+\}|\{\{.+\}\}|<.+>/.test(filePath))
+            return true;
+        // 纯标点/特殊字符（非路径字符）
+        if (/^[.\s…]+$/.test(filePath))
+            return true;
+        return false;
+    }
 }

package/dist/core/message-queue.js

@@ -13,6 +13,12 @@ export class MessageQueue {
     setInterruptCallback(callback) {
         this.interruptCallback = callback;
     }
+    /**
+     * 检查队列 key 是否属于指定 sessionKey
+     */
+    matchesSession(key, sessionKey) {
+        return key.startsWith(sessionKey + '-');
+    }
     /**
      * 生成项目级别的队列 key
      */
@@ -72,7 +78,7 @@ export class MessageQueue {
         // 计算该 sessionKey 下所有项目队列的总长度
         let total = 0;
         for (const [key, queue] of this.queues.entries()) {
-            if (key.startsWith(sessionKey + '-')) {
+            if (this.matchesSession(key, sessionKey)) {
                 total += queue.length;
             }
         }
@@ -81,7 +87,7 @@ export class MessageQueue {
     isProcessing(sessionKey) {
         // 检查该 sessionKey 下是否有任何项目队列在处理
         for (const key of this.processing.keys()) {
-            if (key.startsWith(sessionKey + '-')) {
+            if (this.matchesSession(key, sessionKey)) {
                 return true;
             }
         }
@@ -93,7 +99,7 @@ export class MessageQueue {
     getProcessingProject(sessionKey) {
         // 查找该 sessionKey 下正在处理的项目
         for (const key of this.processing.keys()) {
-            if (key.startsWith(sessionKey + '-')) {
+            if (this.matchesSession(key, sessionKey)) {
                 // 从 processing 中找到对应的队列，获取 projectPath
                 const queue = this.queues.get(key);
                 if (queue && queue.length > 0) {