evolclaw 2.0.1 → 2.0.2

package/dist/core/session-manager.js

@@ -23,6 +23,56 @@ export class SessionManager {
         const encodedPath = this.getProjectDirName(projectPath);
         return path.join(homeDir, '.claude', 'projects', encodedPath, `${sessionId}.jsonl`);
     }
+    rowToSession(row) {
+        return {
+            id: row.id,
+            channel: row.channel,
+            channelId: row.channel_id,
+            projectPath: row.project_path,
+            claudeSessionId: row.claude_session_id,
+            name: row.name,
+            isActive: row.is_active === 1,
+            createdAt: row.created_at,
+            updatedAt: row.updated_at
+        };
+    }
+    deactivateAll(channel, channelId) {
+        this.db.prepare(`
+      UPDATE sessions SET is_active = 0, updated_at = ?
+      WHERE channel = ? AND channel_id = ? AND is_active = 1
+    `).run(Date.now(), channel, channelId);
+    }
+    validateSessionFile(row) {
+        const claudeSessionId = row.claude_session_id;
+        if (!claudeSessionId)
+            return undefined;
+        const sessionFile = this.getSessionFilePath(row.project_path, claudeSessionId);
+        if (fs.existsSync(sessionFile))
+            return claudeSessionId;
+        logger.warn(`Session file not found: ${sessionFile}, clearing session ID`);
+        this.db.prepare(`UPDATE sessions SET claude_session_id = NULL WHERE id = ?`).run(row.id);
+        return undefined;
+    }
+    insertSession(session) {
+        this.db.prepare(`
+      INSERT OR IGNORE INTO sessions (id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(session.id, session.channel, session.channelId, session.projectPath, session.claudeSessionId ?? null, session.name ?? null, session.isActive ? 1 : 0, session.createdAt, session.updatedAt);
+    }
+    extractUserMessageText(messageContent) {
+        if (typeof messageContent === 'string') {
+            const text = messageContent.trim();
+            return text.substring(0, 50) + (text.length > 50 ? '...' : '');
+        }
+        else if (Array.isArray(messageContent)) {
+            const textContent = messageContent.find((c) => c.type === 'text');
+            if (textContent?.text) {
+                const text = textContent.text.trim();
+                return text.substring(0, 50) + (text.length > 50 ? '...' : '');
+            }
+        }
+        return null;
+    }
     initDatabase() {
         const tableInfo = this.db.prepare('PRAGMA table_info(sessions)').all();
         const hasIsActive = tableInfo.some((col) => col.name === 'is_active');
@@ -144,26 +194,8 @@ export class SessionManager {
       WHERE channel = ? AND channel_id = ? AND is_active = 1
     `).get(channel, channelId);
         if (active) {
-            // 验证会话文件是否存在
-            let validSessionId = active.claude_session_id;
-            if (validSessionId) {
-                const sessionFile = this.getSessionFilePath(active.project_path, validSessionId);
-                if (!fs.existsSync(sessionFile)) {
-                    logger.warn(`Session file not found: ${sessionFile}`);
-                    validSessionId = null;
-                }
-            }
-            return {
-                id: active.id,
-                channel: active.channel,
-                channelId: active.channel_id,
-                projectPath: active.project_path,
-                claudeSessionId: validSessionId,
-                name: active.name,
-                isActive: active.is_active === 1,
-                createdAt: active.created_at,
-                updatedAt: active.updated_at
-            };
+            const validSessionId = this.validateSessionFile(active);
+            return { ...this.rowToSession(active), claudeSessionId: validSessionId };
         }
         // 2. 没有活跃会话，查找该聊天在默认项目的会话
         const existing = this.db.prepare(`
@@ -172,32 +204,13 @@ export class SessionManager {
       ORDER BY updated_at DESC LIMIT 1
     `).get(channel, channelId, defaultProjectPath);
         if (existing) {
-            // 验证会话文件是否存在
-            let validSessionId = existing.claude_session_id;
-            if (validSessionId) {
-                const sessionFile = this.getSessionFilePath(existing.project_path, validSessionId);
-                if (!fs.existsSync(sessionFile)) {
-                    logger.warn(`Session file not found: ${sessionFile}, clearing session ID`);
-                    validSessionId = null;
-                    this.db.prepare(`UPDATE sessions SET claude_session_id = NULL WHERE id = ?`).run(existing.id);
-                }
-            }
+            const validSessionId = this.validateSessionFile(existing);
             // 激活该会话
             this.db.prepare(`
         UPDATE sessions SET is_active = 1, updated_at = ?
         WHERE id = ?
       `).run(Date.now(), existing.id);
-            return {
-                id: existing.id,
-                channel: existing.channel,
-                channelId: existing.channel_id,
-                projectPath: existing.project_path,
-                claudeSessionId: validSessionId,
-                name: existing.name,
-                isActive: true,
-                createdAt: existing.created_at,
-                updatedAt: existing.updated_at
-            };
+            return { ...this.rowToSession(existing), claudeSessionId: validSessionId, isActive: true };
         }
         // 3. 创建新会话（默认为活跃）
         const session = {
@@ -217,23 +230,13 @@ export class SessionManager {
     `).run(session.id, session.channel, session.channelId, session.projectPath, session.claudeSessionId ?? null, session.name ?? null, 1, session.createdAt, session.updatedAt);
         // 如果插入被忽略（已存在），重新查询
         if (result.changes === 0) {
-            const existing = this.db.prepare(`
+            const recheck = this.db.prepare(`
         SELECT * FROM sessions
         WHERE channel = ? AND channel_id = ? AND project_path = ?
       `).get(channel, channelId, defaultProjectPath);
-            if (existing) {
-                this.db.prepare(`UPDATE sessions SET is_active = 1, updated_at = ? WHERE id = ?`).run(Date.now(), existing.id);
-                return {
-                    id: existing.id,
-                    channel: existing.channel,
-                    channelId: existing.channel_id,
-                    projectPath: existing.project_path,
-                    claudeSessionId: existing.claude_session_id,
-                    name: existing.name,
-                    isActive: true,
-                    createdAt: existing.created_at,
-                    updatedAt: Date.now()
-                };
+            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() };
             }
         }
         return session;
@@ -252,10 +255,7 @@ export class SessionManager {
     }
     async switchProject(channel, channelId, newProjectPath) {
         // 1. 取消当前活跃会话
-        this.db.prepare(`
-      UPDATE sessions SET is_active = 0, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
-    `).run(Date.now(), channel, channelId);
+        this.deactivateAll(channel, channelId);
         // 2. 查找目标项目的会话
         const target = this.db.prepare(`
       SELECT * FROM sessions
@@ -263,32 +263,13 @@ export class SessionManager {
       ORDER BY updated_at DESC LIMIT 1
     `).get(channel, channelId, newProjectPath);
         if (target) {
-            // 验证会话文件是否存在
-            let validSessionId = target.claude_session_id;
-            if (validSessionId) {
-                const sessionFile = this.getSessionFilePath(newProjectPath, validSessionId);
-                if (!fs.existsSync(sessionFile)) {
-                    logger.warn(`Session file not found: ${sessionFile}, clearing session ID`);
-                    validSessionId = null;
-                    this.db.prepare(`UPDATE sessions SET claude_session_id = NULL WHERE id = ?`).run(target.id);
-                }
-            }
+            const validSessionId = this.validateSessionFile(target);
             // 激活已有会话
             this.db.prepare(`
         UPDATE sessions SET is_active = 1, updated_at = ?
         WHERE id = ?
       `).run(Date.now(), target.id);
-            return {
-                id: target.id,
-                channel: target.channel,
-                channelId: target.channel_id,
-                projectPath: target.project_path,
-                claudeSessionId: validSessionId,
-                name: target.name,
-                isActive: true,
-                createdAt: target.created_at,
-                updatedAt: target.updated_at
-            };
+            return { ...this.rowToSession(target), claudeSessionId: validSessionId, isActive: true };
         }
         // 3. 创建新会话
         const session = {
@@ -301,16 +282,9 @@ export class SessionManager {
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
-        this.db.prepare(`
-      INSERT OR IGNORE INTO sessions (id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(session.id, session.channel, session.channelId, session.projectPath, null, session.name ?? null, 1, session.createdAt, session.updatedAt);
+        this.insertSession(session);
         return session;
     }
-    async updateProjectPath(channel, channelId, projectPath) {
-        this.db.prepare('UPDATE sessions SET project_path = ?, updated_at = ? WHERE channel = ? AND channel_id = ?')
-            .run(projectPath, Date.now(), channel, channelId);
-    }
     async updateClaudeSessionId(channel, channelId, claudeSessionId) {
         // 只更新当前活跃会话的 Claude Session ID
         this.db.prepare(`
@@ -336,35 +310,14 @@ export class SessionManager {
       WHERE channel = ? AND channel_id = ? AND is_active = 1
     `).run(Date.now(), channel, channelId);
     }
-    async clearClaudeSessionId(channel, channelId) {
-        // 向后兼容的别名
-        await this.clearActiveSession(channel, channelId);
-    }
-    async getSession(channel, channelId) {
-        // 获取活跃会话
+    async getActiveSession(channel, channelId) {
         const row = this.db.prepare(`
       SELECT * FROM sessions
       WHERE channel = ? AND channel_id = ? AND is_active = 1
     `).get(channel, channelId);
         if (!row)
             return undefined;
-        return {
-            id: row.id,
-            channel: row.channel,
-            channelId: row.channel_id,
-            projectPath: row.project_path,
-            claudeSessionId: row.claude_session_id,
-            name: row.name,
-            isActive: row.is_active === 1,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        };
-    }
-    /**
-     * 获取活跃会话（getSession 的别名，语义更清晰）
-     */
-    async getActiveSession(channel, channelId) {
-        return this.getSession(channel, channelId);
+        return this.rowToSession(row);
     }
     async listSessions(channel, channelId) {
         // 列出该聊天的所有会话
@@ -373,17 +326,7 @@ export class SessionManager {
       WHERE channel = ? AND channel_id = ?
       ORDER BY updated_at DESC
     `).all(channel, channelId);
-        return rows.map(row => ({
-            id: row.id,
-            channel: row.channel,
-            channelId: row.channel_id,
-            projectPath: row.project_path,
-            claudeSessionId: row.claude_session_id,
-            name: row.name,
-            isActive: row.is_active === 1,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        }));
+        return rows.map(row => this.rowToSession(row));
     }
     async getSessionByProjectPath(channel, channelId, projectPath) {
         const row = this.db.prepare(`
@@ -392,17 +335,7 @@ export class SessionManager {
     `).get(channel, channelId, projectPath);
         if (!row)
             return undefined;
-        return {
-            id: row.id,
-            channel: row.channel,
-            channelId: row.channel_id,
-            projectPath: row.project_path,
-            claudeSessionId: row.claude_session_id,
-            name: row.name,
-            isActive: row.is_active === 1,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        };
+        return this.rowToSession(row);
     }
     async getSessionByName(channel, channelId, name) {
         const row = this.db.prepare(`
@@ -411,17 +344,7 @@ export class SessionManager {
     `).get(channel, channelId, name);
         if (!row)
             return undefined;
-        return {
-            id: row.id,
-            channel: row.channel,
-            channelId: row.channel_id,
-            projectPath: row.project_path,
-            claudeSessionId: row.claude_session_id,
-            name: row.name,
-            isActive: row.is_active === 1,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        };
+        return this.rowToSession(row);
     }
     async switchToSession(channel, channelId, targetSessionId) {
         // 验证目标会话存在
@@ -431,26 +354,13 @@ export class SessionManager {
         if (!target)
             return null;
         // 取消当前活跃会话
-        this.db.prepare(`
-      UPDATE sessions SET is_active = 0, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
-    `).run(Date.now(), channel, channelId);
+        this.deactivateAll(channel, channelId);
         // 激活目标会话
         this.db.prepare(`
       UPDATE sessions SET is_active = 1, updated_at = ?
       WHERE id = ?
     `).run(Date.now(), targetSessionId);
-        return {
-            id: target.id,
-            channel: target.channel,
-            channelId: target.channel_id,
-            projectPath: target.project_path,
-            claudeSessionId: target.claude_session_id,
-            name: target.name,
-            isActive: true,
-            createdAt: target.created_at,
-            updatedAt: Date.now()
-        };
+        return { ...this.rowToSession(target), isActive: true, updatedAt: Date.now() };
     }
     async renameSession(sessionId, newName) {
         const result = this.db.prepare(`
@@ -460,10 +370,7 @@ export class SessionManager {
     }
     async createNewSession(channel, channelId, projectPath, name) {
         // 取消当前活跃会话
-        this.db.prepare(`
-      UPDATE sessions SET is_active = 0, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
-    `).run(Date.now(), channel, channelId);
+        this.deactivateAll(channel, channelId);
         // 创建新会话
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
@@ -475,10 +382,7 @@ export class SessionManager {
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
-        this.db.prepare(`
-      INSERT INTO sessions (id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(session.id, session.channel, session.channelId, session.projectPath, null, session.name ?? null, 1, session.createdAt, session.updatedAt);
+        this.insertSession(session);
         return session;
     }
     /**
@@ -486,10 +390,7 @@ export class SessionManager {
      */
     async createForkedSession(sourceSession, forkedClaudeSessionId, name) {
         // 取消当前活跃会话
-        this.db.prepare(`
-      UPDATE sessions SET is_active = 0, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
-    `).run(Date.now(), sourceSession.channel, sourceSession.channelId);
+        this.deactivateAll(sourceSession.channel, sourceSession.channelId);
         const session = {
             id: `${sourceSession.channel}-${sourceSession.channelId}-${Date.now()}`,
             channel: sourceSession.channel,
@@ -501,10 +402,7 @@ export class SessionManager {
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
-        this.db.prepare(`
-      INSERT INTO sessions (id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(session.id, session.channel, session.channelId, session.projectPath, session.claudeSessionId ?? null, session.name ?? null, 1, session.createdAt, session.updatedAt);
+        this.insertSession(session);
         return session;
     }
     async scanCliSessions(projectPath) {
@@ -539,21 +437,10 @@ export class SessionManager {
             const lines = content.split('\n').filter(l => l.trim());
             for (const line of lines) {
                 const event = JSON.parse(line);
-                // 格式: {type: "user", message: {role: "user", content: ...}}
                 if (event.type === 'user' && event.message?.role === 'user') {
-                    const messageContent = event.message.content;
-                    // content 可能是字符串或数组
-                    if (typeof messageContent === 'string') {
-                        const text = messageContent.trim();
-                        return text.substring(0, 50) + (text.length > 50 ? '...' : '');
-                    }
-                    else if (Array.isArray(messageContent)) {
-                        const textContent = messageContent.find((c) => c.type === 'text');
-                        if (textContent?.text) {
-                            const text = textContent.text.trim();
-                            return text.substring(0, 50) + (text.length > 50 ? '...' : '');
-                        }
-                    }
+                    const text = this.extractUserMessageText(event.message.content);
+                    if (text)
+                        return text;
                 }
             }
         }
@@ -573,18 +460,7 @@ export class SessionManager {
             for (const line of lines) {
                 const event = JSON.parse(line);
                 if (event.type === 'user' && event.message?.role === 'user') {
-                    const messageContent = event.message.content;
-                    if (typeof messageContent === 'string') {
-                        const text = messageContent.trim();
-                        lastMessage = text.substring(0, 50) + (text.length > 50 ? '...' : '');
-                    }
-                    else if (Array.isArray(messageContent)) {
-                        const textContent = messageContent.find((c) => c.type === 'text');
-                        if (textContent?.text) {
-                            const text = textContent.text.trim();
-                            lastMessage = text.substring(0, 50) + (text.length > 50 ? '...' : '');
-                        }
-                    }
+                    lastMessage = this.extractUserMessageText(event.message.content) ?? lastMessage;
                 }
             }
             return lastMessage;
@@ -626,12 +502,6 @@ export class SessionManager {
             return { turns: 0 };
         }
     }
-    /**
-     * 统计会话回合数（用户消息数）— 兼容旧调用
-     */
-    countSessionTurns(projectPath, claudeSessionId) {
-        return this.getSessionFileInfo(projectPath, claudeSessionId).turns;
-    }
     async getSessionByUuidPrefix(channel, channelId, uuidPrefix) {
         const rows = this.db.prepare(`
       SELECT * FROM sessions
@@ -642,18 +512,7 @@ export class SessionManager {
         if (rows.length > 1) {
             logger.warn(`Multiple sessions found with UUID prefix: ${uuidPrefix}`);
         }
-        const row = rows[0];
-        return {
-            id: row.id,
-            channel: row.channel,
-            channelId: row.channel_id,
-            projectPath: row.project_path,
-            claudeSessionId: row.claude_session_id,
-            name: row.name,
-            isActive: row.is_active === 1,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at
-        };
+        return this.rowToSession(rows[0]);
     }
     async importCliSession(channel, channelId, projectPath, claudeSessionId) {
         // 检查是否已存在相同项目路径的会话
@@ -671,23 +530,10 @@ export class SessionManager {
         UPDATE sessions SET claude_session_id = ?, is_active = 1, updated_at = ?
         WHERE id = ?
       `).run(claudeSessionId, Date.now(), existingByPath.id);
-            return {
-                id: existingByPath.id,
-                channel: existingByPath.channel,
-                channelId: existingByPath.channel_id,
-                projectPath: existingByPath.project_path,
-                claudeSessionId,
-                name: existingByPath.name,
-                isActive: true,
-                createdAt: existingByPath.created_at,
-                updatedAt: Date.now()
-            };
+            return { ...this.rowToSession(existingByPath), claudeSessionId, isActive: true, updatedAt: Date.now() };
         }
         // 取消当前活跃会话
-        this.db.prepare(`
-      UPDATE sessions SET is_active = 0, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
-    `).run(Date.now(), channel, channelId);
+        this.deactivateAll(channel, channelId);
         // 创建会话记录
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
@@ -700,10 +546,7 @@ export class SessionManager {
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
-        this.db.prepare(`
-      INSERT OR IGNORE INTO sessions (id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(session.id, session.channel, session.channelId, session.projectPath, session.claudeSessionId ?? null, session.name ?? null, 1, session.createdAt, session.updatedAt);
+        this.insertSession(session);
         return session;
     }
     // ==================== 健康状态管理 ====================