evolclaw 2.1.0 → 2.1.2

package/dist/core/message-processor.js

@@ -19,10 +19,12 @@ export class MessageProcessor {
     currentFlusher;
     currentIsGroup = false;
     shouldSuppressActivities = false;
-    /** 话题 session 永远不是后台任务；主 session 与当前活跃 session 比对 */
+    /** 判断是否为后台会话（仅主会话参与判断，话题会话独立） */
     async isBackgroundSession(session, channel, channelId) {
+        // 话题会话独立运行，不是后台任务
         if (session.threadId)
             return false;
+        // 主会话：与当前活跃会话比对
         const active = await this.sessionManager.getActiveSession(channel, channelId);
         return active ? session.id !== active.id : false;
     }
@@ -61,7 +63,7 @@ export class MessageProcessor {
         const isOwnerUser = isOwner(this.config, message.channel, message.userId || '');
         // 非主人（群聊或单聊）：空闲监控静默/简短
         const quietMode = isGroup || !isOwnerUser;
-        // 计算是否抑制活动输出
+        // 计算是否抑制中间输出（工具活动 + 流式文本）
         const shouldSuppress = () => {
             const mode = this.config.showActivities ?? 'all';
             if (mode === 'all')
@@ -70,6 +72,8 @@ export class MessageProcessor {
                 return isGroup;
             if (mode === 'owner-dm-only')
                 return isGroup || !isOwnerUser;
+            if (mode === 'none')
+                return true;
             return false;
         };
         this.shouldSuppressActivities = shouldSuppress();
@@ -265,7 +269,7 @@ ${suggestions}`, sendOpts);
                     await adapter.sendText(message.channelId, text, Object.keys(opts).length ? opts : undefined);
                 }
                 // 后台任务：静默，不发送输出
-            }, this.config.flushDelay ? this.config.flushDelay * 1000 : 4000, options?.fileMarkerPattern);
+            }, (this.config.flushDelay || 4) * 1000, options?.fileMarkerPattern, this.config.debug?.flusherDiag);
             // 保存当前 flusher，用于 compact 事件
             this.currentFlusher = flusher;
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
@@ -311,7 +315,7 @@ ${suggestions}`, sendOpts);
                     // 文件存在性检查：真实路径但文件不存在，告知用户
                     if (!fs.existsSync(resolvedPath)) {
                         logger.warn(`[${adapter.name}] File not found: ${resolvedPath}`);
-                        await adapter.sendText(message.channelId, `⚠️ 文件未找到: ${filePath}`);
+                        await adapter.sendText(message.channelId, `⚠️ 文件未找到: ${filePath}`, this.getThreadSendOpts(session));
                         continue;
                     }
                     logger.info(`[${adapter.name}] Sending file: ${resolvedPath}`);
@@ -320,7 +324,7 @@ ${suggestions}`, sendOpts);
                     }
                     catch (error) {
                         logger.error(`[${adapter.name}] Failed to send file: ${resolvedPath}`, error);
-                        await adapter.sendText(message.channelId, `❌ 文件发送失败: ${filePath}`);
+                        await adapter.sendText(message.channelId, `❌ 文件发送失败: ${filePath}`, this.getThreadSendOpts(session));
                     }
                 }
             }
@@ -380,7 +384,14 @@ ${suggestions}`, sendOpts);
             }
             else {
                 const userMessage = getErrorMessage(error);
-                await adapter.sendText(message.channelId, userMessage);
+                // 获取 session 用于话题回复（如果 resolveSession 已执行）
+                let sendOpts;
+                try {
+                    const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.config.projects?.defaultPath || process.cwd(), message.threadId);
+                    sendOpts = this.getThreadSendOpts(session);
+                }
+                catch { }
+                await adapter.sendText(message.channelId, userMessage, sendOpts);
             }
         }
     }
@@ -388,7 +399,11 @@ ${suggestions}`, sendOpts);
      * 解析会话和项目路径
      */
     async resolveSession(message) {
-        const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.config.projects?.defaultPath || process.cwd(), message.threadId);
+        // 话题会话：传入 rootId metadata（首条消息的 messageId 作为 rootId）
+        const metadata = message.threadId && message.messageId
+            ? { feishu: { rootId: message.messageId } }
+            : undefined;
+        const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.config.projects?.defaultPath || process.cwd(), message.threadId, metadata);
         const absoluteProjectPath = path.isAbsolute(session.projectPath)
             ? session.projectPath
             : path.resolve(process.cwd(), session.projectPath);
@@ -419,11 +434,13 @@ ${suggestions}`, sendOpts);
                 const isCurrentlyBackground = await this.isBackgroundSession(session, session.channel, session.channelId);
                 // === 前台任务：正常处理所有事件 ===
                 if (!isCurrentlyBackground) {
-                    // 流式文本事件
+                    // 流式文本事件（抑制时跳过，只累积到 allText）
                     if (event.type === 'text_delta' && event.text) {
                         hasTextDelta = true;
                         hasReceivedText = true;
-                        flusher.addText(event.text);
+                        if (!shouldSuppress()) {
+                            flusher.addText(event.text);
+                        }
                     }
                     // 系统事件：compact_boundary（群聊时静默）
                     if (event.type === 'system' && event.subtype === 'compact_boundary') {
@@ -457,7 +474,9 @@ ${suggestions}`, sendOpts);
                             else if (content.type === 'text' && content.text && !hasTextDelta) {
                                 // 仅在没有 text_delta 事件时从 assistant 事件提取文本，避免重复
                                 hasReceivedText = true;
-                                flusher.addTextBlock(content.text);
+                                if (!shouldSuppress()) {
+                                    flusher.addTextBlock(content.text);
+                                }
                             }
                         }
                     }
@@ -470,14 +489,19 @@ ${suggestions}`, sendOpts);
                             flusher.addActivity(`⚠️ ${toolName}: ${errorMsg}`);
                         }
                     }
-                    // Result 事件：仅在没有流式文本时使用 result 作为最终输出
+                    // Result 事件：最终输出
                     if (event.type === 'result' && event.result) {
-                        logger.debug(`[MessageProcessor] result event: hasReceivedText=${hasReceivedText}, result="${event.result}"`);
-                        if (!hasReceivedText) {
-                            // 没有通过 text_delta 或 assistant 收到文本，使用 result 作为兜底
+                        logger.debug(`[MessageProcessor] result event: hasReceivedText=${hasReceivedText}, shouldSuppress=${shouldSuppress()}, result="${event.result}"`);
+                        if (shouldSuppress()) {
+                            // 抑制模式：直接发送 result（跳过中间输出）
+                            flusher.addText(event.result);
+                        }
+                        else if (!hasReceivedText) {
+                            // 非抑制模式 + 无流式文本：使用 result 作为兜底
                             flusher.addText(event.result);
                         }
-                        await flusher.flush();
+                        // 非抑制模式 + 有流式文本：已通过 text_delta 累积，无需再添加
+                        await flusher.flush(true); // isFinal=true 标记最终输出
                     }
                     continue;
                 }

package/dist/core/session-manager.js

@@ -170,13 +170,11 @@ export class SessionManager {
     `);
     }
     async getOrCreateSession(channel, channelId, defaultProjectPath, threadId, metadata, name) {
-        const normalizedThreadId = threadId || '';
-        // 话题会话：直接按 thread_id 查找/创建
-        if (normalizedThreadId) {
-            return this.getOrCreateThreadSession(channel, channelId, normalizedThreadId, defaultProjectPath, metadata, name);
+        // 话题会话：独立查找/创建，不参与 isActive 竞争
+        if (threadId) {
+            return this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name);
         }
-        // 主会话：原有逻辑
-        // 1. 查找该聊天的活跃会话
+        // 主会话：查找活跃会话
         const active = this.db.prepare(`
       SELECT * FROM sessions
       WHERE channel = ? AND channel_id = ? AND is_active = 1 AND thread_id = ''
@@ -185,28 +183,24 @@ export class SessionManager {
             const validSessionId = this.validateSessionFile(active);
             return { ...this.rowToSession(active), agentSessionId: validSessionId };
         }
-        // 2. 没有活跃会话，查找该聊天在默认项目的会话（匹配 thread_id）
+        // 查找默认项目的主会话
         const existing = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND project_path = ? AND thread_id = ?
+      WHERE channel = ? AND channel_id = ? AND project_path = ? AND thread_id = ''
       ORDER BY updated_at DESC LIMIT 1
-    `).get(channel, channelId, defaultProjectPath, normalizedThreadId);
+    `).get(channel, channelId, defaultProjectPath);
         if (existing) {
             const validSessionId = this.validateSessionFile(existing);
-            // 激活该会话
-            this.db.prepare(`
-        UPDATE sessions SET is_active = 1, updated_at = ?
-        WHERE id = ?
-      `).run(Date.now(), existing.id);
+            this.db.prepare(`UPDATE sessions SET is_active = 1, updated_at = ? WHERE id = ?`).run(Date.now(), existing.id);
             return { ...this.rowToSession(existing), agentSessionId: validSessionId, isActive: true };
         }
-        // 3. 创建新会话（默认为活跃）
+        // 创建新主会话
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
             channelId,
             projectPath: defaultProjectPath,
-            threadId: normalizedThreadId,
+            threadId: '',
             agentType: 'claude',
             metadata,
             name: name || '默认会话',
@@ -214,22 +208,7 @@ export class SessionManager {
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
-        // 使用 INSERT OR IGNORE 避免并发时的 UNIQUE 约束冲突
-        const result = this.db.prepare(`
-      INSERT OR IGNORE INTO sessions (id, channel, channel_id, project_path, thread_id, agent_type, agent_session_id, name, is_active, created_at, updated_at, metadata)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(session.id, session.channel, session.channelId, session.projectPath, session.threadId, session.agentType, session.agentSessionId ?? null, session.name ?? null, 1, session.createdAt, session.updatedAt, session.metadata ? JSON.stringify(session.metadata) : null);
-        // 如果插入被忽略（已存在），重新查询
-        if (result.changes === 0) {
-            const recheck = this.db.prepare(`
-        SELECT * FROM sessions
-        WHERE channel = ? AND channel_id = ? AND project_path = ? AND thread_id = ?
-      `).get(channel, channelId, defaultProjectPath, normalizedThreadId);
-            if (recheck) {
-                this.db.prepare(`UPDATE sessions SET is_active = 1, updated_at = ? WHERE id = ?`).run(Date.now(), recheck.id);
-                return { ...this.rowToSession(recheck), isActive: true, updatedAt: Date.now() };
-            }
-        }
+        this.insertSession(session);
         return session;
     }
     async updateSession(sessionId, updates) {
@@ -247,15 +226,16 @@ export class SessionManager {
         this.db.prepare(`UPDATE sessions SET ${fields}, updated_at = ? WHERE id = ?`).run(...values, Date.now(), sessionId);
     }
     getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name) {
+        // 查找已有话题会话
         const existing = this.db.prepare(`
       SELECT * FROM sessions
       WHERE channel = ? AND channel_id = ? AND thread_id = ?
-      LIMIT 1
     `).get(channel, channelId, threadId);
         if (existing) {
             const validSessionId = this.validateSessionFile(existing);
-            const existingMeta = this.rowToSession(existing).metadata;
+            // 合并 metadata（如果提供）
             if (metadata) {
+                const existingMeta = this.rowToSession(existing).metadata;
                 const merged = existingMeta ? { ...existingMeta, ...metadata } : metadata;
                 this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
                     .run(JSON.stringify(merged), Date.now(), existing.id);
@@ -263,12 +243,13 @@ export class SessionManager {
             }
             return { ...this.rowToSession(existing), agentSessionId: validSessionId };
         }
-        const activeSession = this.db.prepare(`
+        // 继承当前活跃主会话的项目路径
+        const activeMain = this.db.prepare(`
       SELECT project_path FROM sessions
       WHERE channel = ? AND channel_id = ? AND is_active = 1 AND thread_id = ''
-      LIMIT 1
     `).get(channel, channelId);
-        const projectPath = activeSession?.project_path || defaultProjectPath;
+        const projectPath = activeMain?.project_path || defaultProjectPath;
+        // 创建新话题会话（isActive 固定为 false）
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
@@ -283,15 +264,6 @@ export class SessionManager {
             updatedAt: Date.now()
         };
         this.insertSession(session);
-        // Race condition 保护
-        const recheck = this.db.prepare(`
-      SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND thread_id = ?
-      LIMIT 1
-    `).get(channel, channelId, threadId);
-        if (recheck && recheck.id !== session.id) {
-            return this.rowToSession(recheck);
-        }
         return session;
     }
     async switchProject(channel, channelId, newProjectPath) {
@@ -411,6 +383,12 @@ export class SessionManager {
     `).run(newName, Date.now(), sessionId);
         return result.changes > 0;
     }
+    async unbindSession(sessionId) {
+        const result = this.db.prepare(`
+      DELETE FROM sessions WHERE id = ?
+    `).run(sessionId);
+        return result.changes > 0;
+    }
     async createNewSession(channel, channelId, projectPath, name) {
         // 取消当前活跃会话
         this.deactivateAll(channel, channelId);
@@ -567,26 +545,12 @@ export class SessionManager {
         return this.rowToSession(rows[0]);
     }
     async importCliSession(channel, channelId, projectPath, agentSessionId) {
-        // 检查是否已存在相同项目路径的会话
-        const existingByPath = this.db.prepare(`
-      SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND project_path = ?
-    `).get(channel, channelId, projectPath);
-        if (existingByPath) {
-            // 更新 agent_session_id 并激活
-            this.db.prepare(`
-        UPDATE sessions SET is_active = 0, updated_at = ?
-        WHERE channel = ? AND channel_id = ? AND is_active = 1 AND id != ?
-      `).run(Date.now(), channel, channelId, existingByPath.id);
-            this.db.prepare(`
-        UPDATE sessions SET agent_session_id = ?, is_active = 1, updated_at = ?
-        WHERE id = ?
-      `).run(agentSessionId, Date.now(), existingByPath.id);
-            return { ...this.rowToSession(existingByPath), agentSessionId, isActive: true, updatedAt: Date.now() };
-        }
         // 取消当前活跃会话
         this.deactivateAll(channel, channelId);
-        // 创建会话记录
+        // 从 CLI 会话文件读取标题
+        const fileInfo = this.getSessionFileInfo(projectPath, agentSessionId);
+        const name = fileInfo.title || `CLI会话-${new Date().toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })}`;
+        // 创建新会话记录
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
@@ -595,7 +559,7 @@ export class SessionManager {
             threadId: '',
             agentType: 'claude',
             agentSessionId,
-            name: `CLI会话-${new Date().toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })}`,
+            name,
             isActive: true,
             createdAt: Date.now(),
             updatedAt: Date.now()

package/dist/index.js

@@ -46,6 +46,9 @@ async function main() {
     const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, async (sessionId, agentSessionId) => {
         await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
     }, anthropic.baseUrl, config);
+    if (anthropic.effort) {
+        agentRunner.setEffort(anthropic.effort);
+    }
     logger.info('✓ Agent runner ready');
     // 创建消息缓存
     const messageCache = new MessageCache();
@@ -79,7 +82,7 @@ async function main() {
     const cmdHandler = new CommandHandler(sessionManager, agentRunner, config, messageCache);
     // 创建消息处理器
     const processor = new MessageProcessor(agentRunner, sessionManager, config, messageCache, (content, channel, channelId, userId, threadId) => {
-        const sendFn = async (id, text) => {
+        const sendFn = async (id, text, opts) => {
             const adapter = cmdHandler.getAdapter(channel);
             if (!adapter)
                 return;
@@ -105,7 +108,7 @@ async function main() {
                 text = text.replace(fileMarkerPattern, '').trim();
             }
             if (text) {
-                await adapter.sendText(id, text);
+                await adapter.sendText(id, text, opts);
             }
         };
         return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);