evolclaw 2.2.0 → 2.4.0

package/dist/core/session/adapters/gemini-session-file-adapter.js

@@ -0,0 +1,177 @@
+/**
+ * Gemini SessionFileAdapter
+ *
+ * Reads Gemini CLI session files from ~/.gemini/tmp/{project}/chats/.
+ * Gemini stores sessions as JSON files with naming convention:
+ *   session-{YYYY-MM-DDTHH-mm}-{uuid-prefix}.json
+ *
+ * Each file contains:
+ *   { sessionId, projectHash, startTime, lastUpdated, messages, kind }
+ *
+ * Messages have type: 'user' | 'gemini' (not 'role').
+ */
+import { logger } from '../../../utils/logger.js';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
+export class GeminiSessionFileAdapter {
+    agentId = 'gemini';
+    getGeminiHome() {
+        return path.join(os.homedir(), '.gemini');
+    }
+    /**
+     * Resolve Gemini project key for a project path.
+     * Priority:
+     * 1. ~/.gemini/projects.json explicit mapping
+     * 2. .project_root file content match under ~/.gemini/tmp/<project-key>/
+     * 3. basename(projectPath) fallback
+     */
+    resolveProjectKey(projectPath) {
+        const geminiHome = this.getGeminiHome();
+        const projectsPath = path.join(geminiHome, 'projects.json');
+        try {
+            if (fs.existsSync(projectsPath)) {
+                const data = JSON.parse(fs.readFileSync(projectsPath, 'utf-8'));
+                const mapped = data?.projects?.[projectPath];
+                if (typeof mapped === 'string' && mapped.trim())
+                    return mapped;
+            }
+        }
+        catch (error) {
+            logger.debug('[GeminiAdapter] Failed to read projects.json:', error);
+        }
+        const tmpDir = path.join(geminiHome, 'tmp');
+        if (fs.existsSync(tmpDir)) {
+            try {
+                for (const entry of fs.readdirSync(tmpDir, { withFileTypes: true })) {
+                    if (!entry.isDirectory())
+                        continue;
+                    const rootFile = path.join(tmpDir, entry.name, '.project_root');
+                    if (!fs.existsSync(rootFile))
+                        continue;
+                    try {
+                        const content = fs.readFileSync(rootFile, 'utf-8').trim();
+                        if (content === projectPath)
+                            return entry.name;
+                    }
+                    catch {
+                        // ignore broken .project_root
+                    }
+                }
+            }
+            catch (error) {
+                logger.debug('[GeminiAdapter] Failed to scan tmp project roots:', error);
+            }
+        }
+        return path.basename(projectPath);
+    }
+    /**
+     * Resolve the Gemini chats directory for a given project path.
+     */
+    resolveChatsDir(projectPath) {
+        const geminiHome = this.getGeminiHome();
+        const projectKey = this.resolveProjectKey(projectPath);
+        return path.join(geminiHome, 'tmp', projectKey, 'chats');
+    }
+    /**
+     * Find the session file matching a given session UUID.
+     * Gemini files are named session-{date}-{uuid-prefix}.json where
+     * uuid-prefix is the first 8 chars of the session UUID.
+     */
+    findSessionFile(projectPath, agentSessionId) {
+        const chatsDir = this.resolveChatsDir(projectPath);
+        if (!fs.existsSync(chatsDir))
+            return null;
+        const uuidPrefix = agentSessionId.substring(0, 8);
+        try {
+            const files = fs.readdirSync(chatsDir);
+            const match = files.find(f => f.includes(uuidPrefix) && f.endsWith('.json'));
+            return match ? path.join(chatsDir, match) : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    readSessionData(projectPath, agentSessionId) {
+        const filePath = this.findSessionFile(projectPath, agentSessionId);
+        if (!filePath)
+            return null;
+        try {
+            return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        }
+        catch (error) {
+            logger.warn(`[GeminiAdapter] Failed to read session file: ${filePath}`, error);
+            return null;
+        }
+    }
+    checkExists(projectPath, agentSessionId) {
+        return this.findSessionFile(projectPath, agentSessionId) !== null;
+    }
+    getFileInfo(projectPath, agentSessionId) {
+        const data = this.readSessionData(projectPath, agentSessionId);
+        if (!data)
+            return { turns: 0 };
+        const msgs = data.messages || [];
+        const userTurns = msgs.filter((m) => m.type === 'user').length;
+        // Extract title from first user message
+        let title;
+        const firstUser = msgs.find((m) => m.type === 'user');
+        if (firstUser) {
+            const text = Array.isArray(firstUser.content)
+                ? firstUser.content[0]?.text || ''
+                : String(firstUser.content || '');
+            title = text.substring(0, 50).trim() || undefined;
+        }
+        return { turns: userTurns, title };
+    }
+    readFirstMessage(projectPath, agentSessionId) {
+        return this.readUserMessage(projectPath, agentSessionId, 'first');
+    }
+    readLastUserMessage(projectPath, agentSessionId) {
+        return this.readUserMessage(projectPath, agentSessionId, 'last');
+    }
+    scanCliSessions(projectPath) {
+        const chatsDir = this.resolveChatsDir(projectPath);
+        if (!fs.existsSync(chatsDir))
+            return [];
+        try {
+            const files = fs.readdirSync(chatsDir)
+                .filter(f => f.startsWith('session-') && f.endsWith('.json'))
+                .map(f => {
+                const filePath = path.join(chatsDir, f);
+                const stat = fs.statSync(filePath);
+                // Extract UUID from filename: session-{date}-{uuid-prefix}.json
+                // Read the file to get full UUID
+                try {
+                    const data = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+                    return { uuid: data.sessionId, mtime: stat.mtimeMs };
+                }
+                catch {
+                    return null;
+                }
+            })
+                .filter((e) => e !== null)
+                .sort((a, b) => b.mtime - a.mtime)
+                .slice(0, 10);
+            return files;
+        }
+        catch (error) {
+            logger.warn('[GeminiAdapter] scanCliSessions failed:', error);
+            return [];
+        }
+    }
+    readUserMessage(projectPath, agentSessionId, which) {
+        const data = this.readSessionData(projectPath, agentSessionId);
+        if (!data)
+            return null;
+        const msgs = (data.messages || []).filter((m) => m.type === 'user');
+        if (msgs.length === 0)
+            return null;
+        const msg = which === 'first' ? msgs[0] : msgs[msgs.length - 1];
+        const text = Array.isArray(msg.content)
+            ? msg.content[0]?.text || ''
+            : String(msg.content || '');
+        const trimmed = text.trim().replace(/\s+/g, ' ');
+        return trimmed.substring(0, 50) + (trimmed.length > 50 ? '...' : '');
+    }
+}

package/dist/{utils → core/session}/session-file-health.js

@@ -1,5 +1,5 @@
 import fsPromises from 'fs/promises';
-import { logger } from './logger.js';
+import { logger } from '../../utils/logger.js';
 /**
  * 检查会话文件健康度（接收完整文件路径）
  */

package/dist/core/{session-manager.js → session/session-manager.js}

@@ -1,10 +1,9 @@
 import { DatabaseSync } from 'node:sqlite';
-import { ensureDir } from '../config.js';
-import { resolvePaths } from '../paths.js';
-import { logger } from '../utils/logger.js';
-import { encodePath } from '../utils/cross-platform.js';
+import { ensureDir } from '../../config.js';
+import { resolvePaths } from '../../paths.js';
+import { logger } from '../../utils/logger.js';
+import { encodePath } from '../../utils/cross-platform.js';
 import path from 'path';
-import fs from 'fs';
 import os from 'os';
 export class SessionManager {
     db;
@@ -93,12 +92,10 @@ export class SessionManager {
         const agentId = row.agent_id || 'claude';
         const adapter = this.getFileAdapter(agentId);
         if (!adapter) {
-            // 无适配器时回退到 Claude 路径检查
-            const sessionFile = this.getSessionFilePath(row.project_path, agentSessionId);
-            if (fs.existsSync(sessionFile))
-                return agentSessionId;
+            // 无适配器：无法验证文件，信任 DB 记录
+            return agentSessionId;
         }
-        else if (adapter.checkExists(row.project_path, agentSessionId)) {
+        if (adapter.checkExists(row.project_path, agentSessionId)) {
             return agentSessionId;
         }
         logger.warn(`Session file not found for ${agentId}: ${agentSessionId}, clearing session ID`);
@@ -348,6 +345,29 @@ export class SessionManager {
       CREATE INDEX IF NOT EXISTS idx_session_health_safe_mode ON session_health(safe_mode);
     `);
     }
+    /**
+     * 启动时迁移：将 sessions.channel 从 channelType 回填为实例名（channelName）。
+     * 读取每行 metadata.channelName，若与 channel 列不同则更新。
+     */
+    migrateChannelToInstanceName() {
+        const rows = this.db.prepare(`SELECT id, channel, metadata FROM sessions WHERE metadata IS NOT NULL AND metadata != ''`).all();
+        let migrated = 0;
+        for (const row of rows) {
+            try {
+                const meta = JSON.parse(row.metadata);
+                if (meta.channelName && meta.channelName !== row.channel) {
+                    this.db.prepare(`UPDATE sessions SET channel = ?, updated_at = ? WHERE id = ?`)
+                        .run(meta.channelName, Date.now(), row.id);
+                    migrated++;
+                    logger.info(`[Migration] Restored channel '${row.channel}' -> '${meta.channelName}' (session ${row.id})`);
+                }
+            }
+            catch { /* skip invalid metadata */ }
+        }
+        if (migrated > 0) {
+            logger.info(`Channel instance name migration completed (${migrated} sessions updated)`);
+        }
+    }
     /**
      * 获取指定渠道所有已知的 thread_id（用于重启后预填充 seenThreads）
      */
@@ -402,6 +422,12 @@ export class SessionManager {
         if (threadId) {
             const session = this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId);
             session.identity = this.resolveIdentity(channel, userId);
+            // 新话题会话补写默认权限模式
+            if (session.metadata && !session.metadata.permissionMode) {
+                session.metadata.permissionMode = session.identity?.role === 'owner' ? 'bypass' : 'readonly';
+                this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+                    .run(JSON.stringify(session.metadata), Date.now(), session.id);
+            }
             return session;
         }
         // 主会话：查找活跃会话
@@ -413,7 +439,7 @@ export class SessionManager {
             const validSessionId = this.validateSessionFile(active);
             const session = { ...this.rowToSession(active), agentSessionId: validSessionId };
             session.identity = this.resolveIdentity(channel, userId);
-            // 补写 peerId/peerName（私聊 session 可能在此字段引入前创建）
+            // 补写 peerId/peerName/channelName（旧 session 可能在这些字段引入前创建）
             if (chatType === 'private' && userId) {
                 const activeMeta = active.metadata ? JSON.parse(active.metadata) : {};
                 let updated = false;
@@ -425,12 +451,26 @@ export class SessionManager {
                     activeMeta.peerName = metadata.peerName;
                     updated = true;
                 }
+                if (metadata?.channelName && activeMeta.channelName !== metadata.channelName) {
+                    activeMeta.channelName = metadata.channelName;
+                    updated = true;
+                }
                 if (updated) {
                     this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
                         .run(JSON.stringify(activeMeta), Date.now(), active.id);
                     session.metadata = activeMeta;
                 }
             }
+            // 补写 channelName（非私聊时也需要）
+            if (metadata?.channelName && chatType !== 'private') {
+                const activeMeta = active.metadata ? JSON.parse(active.metadata) : {};
+                if (activeMeta.channelName !== metadata.channelName) {
+                    activeMeta.channelName = metadata.channelName;
+                    this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+                        .run(JSON.stringify(activeMeta), Date.now(), active.id);
+                    session.metadata = activeMeta;
+                }
+            }
             return session;
         }
         // 查找默认项目的主会话
@@ -474,6 +514,10 @@ export class SessionManager {
             updatedAt: Date.now()
         };
         session.identity = this.resolveIdentity(channel, userId);
+        // 写入默认权限模式（基于角色，只在首次创建时设置）
+        if (!sessionMetadata.permissionMode) {
+            sessionMetadata.permissionMode = session.identity?.role === 'owner' ? 'bypass' : 'readonly';
+        }
         this.insertSession(session);
         this.eventBus.publish({
             type: 'session:created',
@@ -754,6 +798,10 @@ export class SessionManager {
             .run(JSON.stringify(metadata), Date.now(), targetSessionId);
         return { ...this.rowToSession(target), metadata, updatedAt: Date.now() };
     }
+    updateMetadata(sessionId, metadata) {
+        this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+            .run(JSON.stringify(metadata), Date.now(), sessionId);
+    }
     async renameSession(sessionId, newName) {
         const result = this.db.prepare(`
       UPDATE sessions SET name = ?, updated_at = ? WHERE id = ?
@@ -966,6 +1014,8 @@ export class SessionManager {
       VALUES (?, 0, 0, ?, ?, ?)
       ON CONFLICT(session_id) DO UPDATE SET
         consecutive_errors = 0,
+        last_error = NULL,
+        last_error_type = NULL,
         last_success_time = ?,
         updated_at = ?
     `).run(sessionId, now, now, now, now, now);