evolclaw 2.1.1 → 2.2.0

package/dist/core/session-manager.js

@@ -2,17 +2,32 @@ 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/platform.js';
+import { encodePath } from '../utils/cross-platform.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
 export class SessionManager {
     db;
-    constructor(dbPath = resolvePaths().db) {
+    eventBus;
+    ownerResolver;
+    fileAdapters = new Map();
+    constructor(dbPath = resolvePaths().db, eventBus, ownerResolver) {
         ensureDir(path.dirname(dbPath));
         this.db = new DatabaseSync(dbPath);
+        this.eventBus = eventBus;
+        this.ownerResolver = ownerResolver;
         this.initDatabase();
     }
+    setOwnerResolver(resolver) {
+        this.ownerResolver = resolver;
+    }
+    registerFileAdapter(adapter) {
+        this.fileAdapters.set(adapter.agentId, adapter);
+        logger.debug(`[SessionManager] Registered file adapter: ${adapter.agentId}`);
+    }
+    getFileAdapter(agentId) {
+        return this.fileAdapters.get(agentId);
+    }
     getDatabase() {
         return this.db;
     }
@@ -25,43 +40,76 @@ export class SessionManager {
         return path.join(homeDir, '.claude', 'projects', encodedPath, `${sessionId}.jsonl`);
     }
     rowToSession(row) {
+        const metadata = row.metadata ? JSON.parse(row.metadata) : undefined;
         return {
             id: row.id,
             channel: row.channel,
             channelId: row.channel_id,
             projectPath: row.project_path,
             threadId: row.thread_id || '',
-            agentType: row.agent_type || 'claude',
+            agentId: row.agent_id || 'claude',
+            chatType: row.chat_type || 'private',
+            sessionMode: row.session_mode || 'interactive',
             agentSessionId: row.agent_session_id,
-            metadata: row.metadata ? JSON.parse(row.metadata) : undefined,
+            metadata,
             name: row.name,
-            isActive: row.is_active === 1,
+            processingState: row.processing_state || undefined,
             createdAt: row.created_at,
-            updatedAt: row.updated_at
+            updatedAt: row.updated_at,
+            deletedAt: row.deleted_at ?? undefined,
         };
     }
-    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);
+    /** 根据 userId 计算身份 */
+    resolveIdentity(channel, userId) {
+        if (!userId)
+            return { role: 'anonymous', mode: 'interactive' };
+        const isOwner = this.ownerResolver?.(channel, userId) ?? false;
+        return { role: isOwner ? 'owner' : 'guest', mode: 'interactive' };
+    }
+    /** 更新 session 的 identity（owner 绑定后调用） */
+    async updateIdentity(sessionId, identity) {
+        // identity 不持久化到 DB，仅更新内存中的返回值
+        // 调用方应直接修改持有的 session 对象
+        logger.debug(`[SessionManager] updateIdentity: sessionId=${sessionId}, role=${identity.role}`);
+    }
+    /** 取消所有活跃会话（通过 metadata.isActive） */
+    deactivateAllMetadata(channel, channelId) {
+        const rows = this.db.prepare(`
+      SELECT id, metadata FROM sessions
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true
+    `).all(channel, channelId);
+        for (const row of rows) {
+            const metadata = row.metadata ? JSON.parse(row.metadata) : {};
+            metadata.isActive = false;
+            this.db.prepare(`
+        UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?
+      `).run(JSON.stringify(metadata), Date.now(), row.id);
+        }
     }
     validateSessionFile(row) {
         const agentSessionId = row.agent_session_id;
         if (!agentSessionId)
             return undefined;
-        const sessionFile = this.getSessionFilePath(row.project_path, agentSessionId);
-        if (fs.existsSync(sessionFile))
+        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;
+        }
+        else if (adapter.checkExists(row.project_path, agentSessionId)) {
             return agentSessionId;
-        logger.warn(`Session file not found: ${sessionFile}, clearing session ID`);
+        }
+        logger.warn(`Session file not found for ${agentId}: ${agentSessionId}, clearing session ID`);
         this.db.prepare(`UPDATE sessions SET agent_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, 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 || 'claude', session.agentSessionId ?? null, session.name ?? null, session.isActive ? 1 : 0, session.createdAt, session.updatedAt, session.metadata ? JSON.stringify(session.metadata) : null);
+      INSERT OR IGNORE INTO sessions (id, channel, channel_id, project_path, thread_id, agent_id, chat_type, session_mode, agent_session_id, name, created_at, updated_at, metadata)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(session.id, session.channel, session.channelId, session.projectPath, session.threadId || '', session.agentId || 'claude', session.chatType || 'private', session.sessionMode || 'interactive', session.agentSessionId ?? null, session.name ?? null, session.createdAt, session.updatedAt, session.metadata ? JSON.stringify(session.metadata) : null);
     }
     extractUserMessageText(messageContent) {
         if (typeof messageContent === 'string') {
@@ -83,42 +131,165 @@ export class SessionManager {
         const hasName = tableInfo.some((col) => col.name === 'name');
         const hasThreadId = tableInfo.some((col) => col.name === 'thread_id');
         const hasAgentType = tableInfo.some((col) => col.name === 'agent_type');
+        const hasAgentId = tableInfo.some((col) => col.name === 'agent_id');
         const hasAgentSessionId = tableInfo.some((col) => col.name === 'agent_session_id');
         const hasMetadata = tableInfo.some((col) => col.name === 'metadata');
-        // 检查是否有唯一约束
-        const indexes = this.db.prepare('PRAGMA index_list(sessions)').all();
-        const hasUniqueConstraint = indexes.some((idx) => idx.origin === 'u');
-        // 迁移到新表结构（添加 thread_id, agent_type, agent_session_id, metadata）
-        if (!hasThreadId && tableInfo.length > 0) {
-            logger.info('Migrating database schema (adding thread support)...');
+        const hasIsGroup = tableInfo.some((col) => col.name === 'is_group');
+        const hasChatType = tableInfo.some((col) => col.name === 'chat_type');
+        const hasSessionMode = tableInfo.some((col) => col.name === 'session_mode');
+        const hasDeletedAt = tableInfo.some((col) => col.name === 'deleted_at');
+        // 检测是否需要 schema 重构迁移（旧字段存在，新字段不存在）
+        const needsSchemaRefactor = tableInfo.length > 0 && (hasIsGroup || hasIsActive || hasAgentType) && (!hasChatType || !hasAgentId || !hasSessionMode);
+        // Schema 重构迁移：is_group → chat_type, agent_type → agent_id, 移除 is_active
+        if (needsSchemaRefactor) {
+            logger.info('Migrating database schema (session model refactor)...');
             this.db.exec(`DROP TABLE IF EXISTS sessions_new`);
             this.db.exec(`
         CREATE TABLE sessions_new (
           id TEXT PRIMARY KEY,
           channel TEXT NOT NULL,
           channel_id TEXT NOT NULL,
-          project_path TEXT NOT NULL,
+          agent_id TEXT NOT NULL DEFAULT 'claude',
           thread_id TEXT NOT NULL DEFAULT '',
-          agent_type TEXT NOT NULL DEFAULT 'claude',
+          chat_type TEXT NOT NULL DEFAULT 'private',
+          session_mode TEXT NOT NULL DEFAULT 'interactive',
+          project_path TEXT NOT NULL,
           agent_session_id TEXT,
           name TEXT,
-          is_active INTEGER NOT NULL DEFAULT 0,
           created_at INTEGER NOT NULL,
           updated_at INTEGER NOT NULL,
-          metadata TEXT
-        );
-        INSERT INTO sessions_new (id, channel, channel_id, project_path, thread_id, agent_type, agent_session_id, name, is_active, created_at, updated_at, metadata)
-          SELECT id, channel, channel_id, project_path, '', 'claude', claude_session_id, name, is_active, created_at, updated_at, NULL FROM sessions;
-        DROP TABLE sessions;
-        ALTER TABLE sessions_new RENAME TO sessions;
+          metadata TEXT,
+          deleted_at INTEGER
+        )
       `);
-            // 话题会话唯一约束（thread_id 非空时才生效）
+            // 迁移数据：is_group → chat_type, agent_type → agent_id
             this.db.exec(`
-        CREATE UNIQUE INDEX IF NOT EXISTS idx_sessions_thread
-          ON sessions(channel, channel_id, project_path, thread_id)
-          WHERE thread_id != ''
+        INSERT INTO sessions_new (id, channel, channel_id, agent_id, thread_id, chat_type, session_mode, project_path, agent_session_id, name, created_at, updated_at, metadata, deleted_at)
+        SELECT
+          id,
+          channel,
+          channel_id,
+          COALESCE(agent_type, 'claude'),
+          COALESCE(thread_id, ''),
+          CASE WHEN is_group = 1 THEN 'group' ELSE 'private' END,
+          'interactive',
+          project_path,
+          agent_session_id,
+          name,
+          created_at,
+          updated_at,
+          metadata,
+          deleted_at
+        FROM sessions
       `);
-            logger.info('✓ Database migration completed (thread support added)');
+            this.db.exec(`DROP TABLE sessions`);
+            this.db.exec(`ALTER TABLE sessions_new RENAME TO sessions`);
+            // 创建新索引
+            this.db.exec(`
+        CREATE INDEX IF NOT EXISTS idx_session_space
+          ON sessions(channel, channel_id, agent_id, thread_id)
+          WHERE deleted_at IS NULL
+      `);
+            this.db.exec(`
+        CREATE INDEX IF NOT EXISTS idx_session_active
+          ON sessions(channel, channel_id)
+          WHERE deleted_at IS NULL
+      `);
+            logger.info('✓ Database migration completed (session model refactored)');
+        }
+        // ── 旧 schema 迁移（仅当旧字段存在、新字段还未迁移时运行）──
+        // 这些迁移按顺序将最旧的 schema 逐步升级到包含 is_group 的中间格式，
+        // 然后由上面的 needsSchemaRefactor 迁移一步到位转为新 schema。
+        if (!needsSchemaRefactor && tableInfo.length > 0 && hasAgentType) {
+            // 检查是否有唯一约束
+            const indexes = this.db.prepare('PRAGMA index_list(sessions)').all();
+            const hasUniqueConstraint = indexes.some((idx) => idx.origin === 'u');
+            // 迁移到新表结构（添加 thread_id, agent_type, agent_session_id, metadata）
+            if (!hasThreadId) {
+                logger.info('Migrating database schema (adding thread support)...');
+                this.db.exec(`DROP TABLE IF EXISTS sessions_new`);
+                this.db.exec(`
+          CREATE TABLE sessions_new (
+            id TEXT PRIMARY KEY,
+            channel TEXT NOT NULL,
+            channel_id TEXT NOT NULL,
+            project_path TEXT NOT NULL,
+            thread_id TEXT NOT NULL DEFAULT '',
+            agent_type TEXT NOT NULL DEFAULT 'claude',
+            agent_session_id TEXT,
+            name TEXT,
+            is_active INTEGER NOT NULL DEFAULT 0,
+            created_at INTEGER NOT NULL,
+            updated_at INTEGER NOT NULL,
+            metadata TEXT
+          );
+          INSERT INTO sessions_new (id, channel, channel_id, project_path, thread_id, agent_type, agent_session_id, name, is_active, created_at, updated_at, metadata)
+            SELECT id, channel, channel_id, project_path, '', 'claude', claude_session_id, name, is_active, created_at, updated_at, NULL FROM sessions;
+          DROP TABLE sessions;
+          ALTER TABLE sessions_new RENAME TO sessions;
+        `);
+                // 话题会话唯一约束（thread_id 非空时才生效）
+                this.db.exec(`
+          CREATE UNIQUE INDEX IF NOT EXISTS idx_sessions_thread
+            ON sessions(channel, channel_id, project_path, thread_id)
+            WHERE thread_id != ''
+        `);
+                logger.info('✓ Database migration completed (thread support added)');
+            }
+            // Migration: add is_group column
+            if (!hasIsGroup) {
+                logger.info('Migrating database schema (adding is_group)...');
+                const addIsGroupCol = 'ALTER TABLE sessions ADD COLUMN is_group INTEGER NOT NULL DEFAULT 0';
+                this.db.exec(addIsGroupCol);
+                logger.info('✓ Database migration completed (is_group added)');
+            }
+            // Reset incorrect is_group values (oc_ prefix doesn't reliably indicate group chat)
+            if (hasIsGroup) {
+                this.db.exec("UPDATE sessions SET is_group = 0 WHERE channel = 'feishu'");
+            }
+            // Migration: add deleted_at column
+            if (!hasDeletedAt) {
+                logger.info('Migrating database schema (adding deleted_at)...');
+                this.db.exec(`ALTER TABLE sessions ADD COLUMN deleted_at INTEGER`);
+                logger.info('✓ Database migration completed (deleted_at added)');
+            }
+        }
+        // Migration: add processing_state column (独立于 schema 重构)
+        if (tableInfo.length > 0) {
+            const hasProcessingState = tableInfo.some((col) => col.name === 'processing_state');
+            if (!hasProcessingState) {
+                logger.info('Migrating database schema (adding processing_state)...');
+                this.db.exec(`ALTER TABLE sessions ADD COLUMN processing_state TEXT`);
+                logger.info('✓ Database migration completed (processing_state added)');
+            }
+        }
+        // Migration: normalize legacy metadata rootId → replyContext
+        if (hasMetadata && tableInfo.length > 0) {
+            const rows = this.db.prepare(`SELECT id, 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);
+                    const rootId = meta.feishu?.rootId ?? meta.threadRootId ?? meta.replyOpts?.rootId;
+                    if (!rootId && !meta.feishu && !meta.threadRootId && !meta.replyOpts)
+                        continue;
+                    // Generate replyContext from rootId if missing
+                    if (rootId && !meta.replyContext) {
+                        meta.replyContext = { replyToMessageId: rootId, replyInThread: true };
+                    }
+                    // Clean up all legacy fields
+                    delete meta.feishu;
+                    delete meta.threadRootId;
+                    delete meta.replyOpts;
+                    this.db.prepare('UPDATE sessions SET metadata = ? WHERE id = ?')
+                        .run(JSON.stringify(meta), row.id);
+                    migrated++;
+                }
+                catch { /* skip malformed JSON */ }
+            }
+            if (migrated > 0) {
+                logger.info(`✓ Migrated ${migrated} session(s): rootId normalized to replyContext`);
+            }
         }
         // 创建新表（首次初始化）
         this.db.exec(`
@@ -126,22 +297,30 @@ export class SessionManager {
         id TEXT PRIMARY KEY,
         channel TEXT NOT NULL,
         channel_id TEXT NOT NULL,
-        project_path TEXT NOT NULL,
+        agent_id TEXT NOT NULL DEFAULT 'claude',
         thread_id TEXT NOT NULL DEFAULT '',
-        agent_type TEXT NOT NULL DEFAULT 'claude',
+        chat_type TEXT NOT NULL DEFAULT 'private',
+        session_mode TEXT NOT NULL DEFAULT 'interactive',
+        project_path TEXT NOT NULL,
         agent_session_id TEXT,
         name TEXT,
-        is_active INTEGER NOT NULL DEFAULT 0,
+        processing_state TEXT,
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL,
-        metadata TEXT
+        metadata TEXT,
+        deleted_at INTEGER
       )
     `);
-        // 话题会话唯一约束（thread_id 非空时才生效）
+        // 会话空间索引（查询优化，无唯一约束）
+        this.db.exec(`
+      CREATE INDEX IF NOT EXISTS idx_session_space
+        ON sessions(channel, channel_id, agent_id, thread_id)
+        WHERE deleted_at IS NULL
+    `);
         this.db.exec(`
-      CREATE UNIQUE INDEX IF NOT EXISTS idx_sessions_thread
-        ON sessions(channel, channel_id, project_path, thread_id)
-        WHERE thread_id != ''
+      CREATE INDEX IF NOT EXISTS idx_session_active
+        ON sessions(channel, channel_id)
+        WHERE deleted_at IS NULL
     `);
         // 创建消息去重表
         this.db.exec(`
@@ -169,67 +348,172 @@ export class SessionManager {
       CREATE INDEX IF NOT EXISTS idx_session_health_safe_mode ON session_health(safe_mode);
     `);
     }
-    async getOrCreateSession(channel, channelId, defaultProjectPath, threadId, metadata, name) {
-        // 话题会话：独立查找/创建，不参与 isActive 竞争
+    /**
+     * 获取指定渠道所有已知的 thread_id（用于重启后预填充 seenThreads）
+     */
+    getKnownThreadIds(channel) {
+        const rows = this.db.prepare(`
+      SELECT DISTINCT thread_id FROM sessions
+      WHERE channel = ? AND thread_id != '' AND deleted_at IS NULL
+    `).all(channel);
+        return rows.map(r => r.thread_id);
+    }
+    /**
+     * 标记会话为处理中（实时写 DB，crash 也能恢复）
+     */
+    markProcessing(sessionId) {
+        const now = Date.now();
+        this.db.prepare(`UPDATE sessions SET processing_state = ?, updated_at = ? WHERE id = ?`)
+            .run(String(now), now, sessionId);
+    }
+    /**
+     * 清除会话处理中状态
+     */
+    clearProcessing(sessionId) {
+        this.db.prepare(`UPDATE sessions SET processing_state = NULL, updated_at = ? WHERE id = ?`)
+            .run(Date.now(), sessionId);
+    }
+    /**
+     * 获取所有处于 processing 状态的会话（用于重启后恢复）
+     * @param maxAgeMs 最大存活时间（超过则视为超时，清除状态）默认 1 小时
+     */
+    getPendingProcessingSessions(maxAgeMs = 60 * 60 * 1000) {
+        const rows = this.db.prepare(`
+      SELECT * FROM sessions
+      WHERE processing_state IS NOT NULL AND deleted_at IS NULL
+    `).all();
+        const now = Date.now();
+        const result = [];
+        for (const row of rows) {
+            const ts = parseInt(row.processing_state, 10);
+            if (!isNaN(ts) && (now - ts) < maxAgeMs) {
+                result.push(this.rowToSession(row));
+            }
+            else {
+                // 超时：清除过期状态
+                this.db.prepare(`UPDATE sessions SET processing_state = NULL WHERE id = ?`)
+                    .run(row.id);
+            }
+        }
+        return result;
+    }
+    async getOrCreateSession(channel, channelId, defaultProjectPath, threadId, metadata, name, userId, chatType, agentId) {
+        // 话题会话：独立查找/创建
         if (threadId) {
-            return this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name);
+            const session = this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId);
+            session.identity = this.resolveIdentity(channel, userId);
+            return session;
         }
         // 主会话：查找活跃会话
         const active = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND is_active = 1 AND thread_id = ''
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true AND thread_id = '' AND deleted_at IS NULL
     `).get(channel, channelId);
         if (active) {
             const validSessionId = this.validateSessionFile(active);
-            return { ...this.rowToSession(active), agentSessionId: validSessionId };
+            const session = { ...this.rowToSession(active), agentSessionId: validSessionId };
+            session.identity = this.resolveIdentity(channel, userId);
+            // 补写 peerId/peerName（私聊 session 可能在此字段引入前创建）
+            if (chatType === 'private' && userId) {
+                const activeMeta = active.metadata ? JSON.parse(active.metadata) : {};
+                let updated = false;
+                if (!activeMeta.peerId) {
+                    activeMeta.peerId = userId;
+                    updated = true;
+                }
+                if (!activeMeta.peerName && metadata?.peerName) {
+                    activeMeta.peerName = metadata.peerName;
+                    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;
+                }
+            }
+            return session;
         }
         // 查找默认项目的主会话
         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 = '' AND deleted_at IS NULL
       ORDER BY updated_at DESC LIMIT 1
     `).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);
-            return { ...this.rowToSession(existing), agentSessionId: validSessionId, isActive: true };
+            // 激活此会话
+            const existingMeta = existing.metadata ? JSON.parse(existing.metadata) : {};
+            existingMeta.isActive = true;
+            // 补写 peerId/peerName
+            if (chatType === 'private' && userId && !existingMeta.peerId) {
+                existingMeta.peerId = userId;
+            }
+            if (chatType === 'private' && metadata?.peerName && !existingMeta.peerName) {
+                existingMeta.peerName = metadata.peerName;
+            }
+            this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+                .run(JSON.stringify(existingMeta), Date.now(), existing.id);
+            const session = { ...this.rowToSession(existing), agentSessionId: validSessionId, metadata: existingMeta };
+            session.identity = this.resolveIdentity(channel, userId);
+            return session;
         }
         // 创建新主会话
+        const sessionMetadata = { ...metadata, isActive: true };
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
             channelId,
             projectPath: defaultProjectPath,
             threadId: '',
-            agentType: 'claude',
-            metadata,
+            agentId: agentId || 'claude',
+            chatType: chatType || 'private',
+            sessionMode: 'interactive',
+            metadata: sessionMetadata,
             name: name || '默认会话',
-            isActive: true,
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
+        session.identity = this.resolveIdentity(channel, userId);
         this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel,
+            channelId,
+            projectPath: defaultProjectPath,
+            name: session.name,
+            chatType: session.chatType,
+            timestamp: Date.now()
+        });
         return session;
     }
     async updateSession(sessionId, updates) {
-        const fields = Object.keys(updates).filter(k => k !== 'id').map(k => `${k} = ?`).join(', ');
-        const values = Object.keys(updates).filter(k => k !== 'id').map(k => {
-            const v = updates[k];
-            if (v === undefined)
-                return null;
-            if (typeof v === 'boolean')
-                return v ? 1 : 0;
-            if (typeof v === 'object' && v !== null)
-                return JSON.stringify(v);
-            return v;
-        });
-        this.db.prepare(`UPDATE sessions SET ${fields}, updated_at = ? WHERE id = ?`).run(...values, Date.now(), sessionId);
+        const sets = [];
+        const values = [];
+        if (updates.chatType !== undefined) {
+            sets.push('chat_type = ?');
+            values.push(updates.chatType);
+        }
+        if (updates.name !== undefined) {
+            sets.push('name = ?');
+            values.push(updates.name);
+        }
+        if (updates.metadata !== undefined) {
+            sets.push('metadata = ?');
+            values.push(updates.metadata ? JSON.stringify(updates.metadata) : null);
+        }
+        if (sets.length === 0)
+            return;
+        sets.push('updated_at = ?');
+        values.push(Date.now());
+        values.push(sessionId);
+        this.db.prepare(`UPDATE sessions SET ${sets.join(', ')} WHERE id = ?`).run(...values);
     }
-    getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name) {
+    getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, agentId) {
         // 查找已有话题会话
         const existing = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND thread_id = ?
+      WHERE channel = ? AND channel_id = ? AND thread_id = ? AND deleted_at IS NULL
     `).get(channel, channelId, threadId);
         if (existing) {
             const validSessionId = this.validateSessionFile(existing);
@@ -246,43 +530,54 @@ export class SessionManager {
         // 继承当前活跃主会话的项目路径
         const activeMain = this.db.prepare(`
       SELECT project_path FROM sessions
-      WHERE channel = ? AND channel_id = ? AND is_active = 1 AND thread_id = ''
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true AND thread_id = ''
     `).get(channel, channelId);
         const projectPath = activeMain?.project_path || defaultProjectPath;
-        // 创建新话题会话（isActive 固定为 false）
+        // 创建新话题会话
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
             channel,
             channelId,
             projectPath,
             threadId,
-            agentType: 'claude',
+            agentId: agentId || 'claude',
+            chatType: 'private',
+            sessionMode: 'interactive',
             metadata,
             name: name || '话题会话',
-            isActive: false,
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
         this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel,
+            channelId,
+            projectPath,
+            name: session.name,
+            timestamp: Date.now()
+        });
         return session;
     }
-    async switchProject(channel, channelId, newProjectPath) {
+    async switchProject(channel, channelId, newProjectPath, currentAgentId) {
+        const agentId = currentAgentId || 'claude';
         // 1. 取消当前活跃会话
-        this.deactivateAll(channel, channelId);
-        // 2. 查找目标项目的会话
+        this.deactivateAllMetadata(channel, channelId);
+        // 2. 查找目标项目 + 当前 agent 的会话
         const target = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND project_path = ?
+      WHERE channel = ? AND channel_id = ? AND project_path = ? AND agent_id = ? AND thread_id = '' AND deleted_at IS NULL
       ORDER BY updated_at DESC LIMIT 1
-    `).get(channel, channelId, newProjectPath);
+    `).get(channel, channelId, newProjectPath, agentId);
         if (target) {
             const validSessionId = this.validateSessionFile(target);
-            // 激活已有会话
-            this.db.prepare(`
-        UPDATE sessions SET is_active = 1, updated_at = ?
-        WHERE id = ?
-      `).run(Date.now(), target.id);
-            return { ...this.rowToSession(target), agentSessionId: validSessionId, isActive: true };
+            // 激活目标会话
+            const metadata = target.metadata ? JSON.parse(target.metadata) : {};
+            metadata.isActive = true;
+            this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+                .run(JSON.stringify(metadata), Date.now(), target.id);
+            return { ...this.rowToSession(target), agentSessionId: validSessionId, metadata };
         }
         // 3. 创建新会话
         const session = {
@@ -291,13 +586,24 @@ export class SessionManager {
             channelId,
             projectPath: newProjectPath,
             threadId: '',
-            agentType: 'claude',
+            agentId,
+            chatType: 'private',
+            sessionMode: 'interactive',
+            metadata: { isActive: true },
             name: '默认会话',
-            isActive: true,
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
         this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel,
+            channelId,
+            projectPath: newProjectPath,
+            name: session.name,
+            timestamp: Date.now()
+        });
         return session;
     }
     async updateAgentSessionId(channel, channelId, agentSessionId) {
@@ -305,7 +611,7 @@ export class SessionManager {
         this.db.prepare(`
       UPDATE sessions
       SET agent_session_id = ?, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true
     `).run(agentSessionId, Date.now(), channel, channelId);
     }
     async updateAgentSessionIdBySessionId(sessionId, agentSessionId) {
@@ -317,28 +623,97 @@ export class SessionManager {
       WHERE id = ?
     `).run(agentSessionId, Date.now(), sessionId);
     }
+    async switchAgent(channel, channelId, projectPath, newAgentId) {
+        // 1. 取消当前活跃会话
+        this.deactivateAllMetadata(channel, channelId);
+        // 2. 查找目标 agent 在当前项目下的会话
+        const target = this.db.prepare(`
+      SELECT * FROM sessions
+      WHERE channel = ? AND channel_id = ? AND project_path = ? AND agent_id = ? AND thread_id = '' AND deleted_at IS NULL
+      ORDER BY updated_at DESC LIMIT 1
+    `).get(channel, channelId, projectPath, newAgentId);
+        if (target) {
+            const validSessionId = this.validateSessionFile(target);
+            // 激活目标会话
+            const metadata = target.metadata ? JSON.parse(target.metadata) : {};
+            metadata.isActive = true;
+            this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+                .run(JSON.stringify(metadata), Date.now(), target.id);
+            return { ...this.rowToSession(target), agentSessionId: validSessionId, metadata };
+        }
+        // 3. 创建新会话（与 switchProject 保持一致）
+        const session = {
+            id: `${channel}-${channelId}-${Date.now()}`,
+            channel,
+            channelId,
+            projectPath,
+            threadId: '',
+            agentId: newAgentId,
+            chatType: 'private',
+            sessionMode: 'interactive',
+            metadata: { isActive: true },
+            name: '默认会话',
+            createdAt: Date.now(),
+            updatedAt: Date.now()
+        };
+        this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel,
+            channelId,
+            projectPath,
+            name: session.name,
+            timestamp: Date.now()
+        });
+        return session;
+    }
     async clearActiveSession(channel, channelId) {
         // 清除当前活跃会话的 Agent Session ID
         this.db.prepare(`
       UPDATE sessions
       SET agent_session_id = NULL, updated_at = ?
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true
     `).run(Date.now(), channel, channelId);
     }
+    /** 查找 owner 在目标通道的私聊 channelId（用于跨通道文件投递） */
+    getOwnerChatId(targetChannel, ownerPeerId) {
+        const row = this.db.prepare(`
+      SELECT channel_id FROM sessions
+      WHERE channel = ? AND chat_type = 'private'
+        AND json_extract(metadata, '$.peerId') = ?
+        AND deleted_at IS NULL
+      ORDER BY updated_at DESC LIMIT 1
+    `).get(targetChannel, ownerPeerId);
+        return row?.channel_id;
+    }
     async getActiveSession(channel, channelId) {
         const row = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
+      WHERE channel = ? AND channel_id = ? AND json_extract(metadata, '$.isActive') = true AND deleted_at IS NULL
     `).get(channel, channelId);
         if (!row)
             return undefined;
         return this.rowToSession(row);
     }
+    /**
+     * 查询话题会话（不创建）
+     */
+    async getThreadSession(channel, channelId, threadId) {
+        const row = this.db.prepare(`
+      SELECT * FROM sessions
+      WHERE channel = ? AND channel_id = ? AND thread_id = ? AND deleted_at IS NULL
+    `).get(channel, channelId, threadId);
+        if (!row)
+            return undefined;
+        const validSessionId = this.validateSessionFile(row);
+        return { ...this.rowToSession(row), agentSessionId: validSessionId };
+    }
     async listSessions(channel, channelId) {
         // 列出该聊天的所有会话
         const rows = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ?
+      WHERE channel = ? AND channel_id = ? AND deleted_at IS NULL
       ORDER BY updated_at DESC
     `).all(channel, channelId);
         return rows.map(row => this.rowToSession(row));
@@ -346,7 +721,9 @@ export class SessionManager {
     async getSessionByProjectPath(channel, channelId, projectPath) {
         const row = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND project_path = ?
+      WHERE channel = ? AND channel_id = ? AND project_path = ? AND deleted_at IS NULL
+      ORDER BY processing_state IS NOT NULL DESC, updated_at DESC
+      LIMIT 1
     `).get(channel, channelId, projectPath);
         if (!row)
             return undefined;
@@ -355,7 +732,7 @@ export class SessionManager {
     async getSessionByName(channel, channelId, name) {
         const row = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND name = ?
+      WHERE channel = ? AND channel_id = ? AND name = ? AND deleted_at IS NULL
     `).get(channel, channelId, name);
         if (!row)
             return undefined;
@@ -364,18 +741,18 @@ export class SessionManager {
     async switchToSession(channel, channelId, targetSessionId) {
         // 验证目标会话存在
         const target = this.db.prepare(`
-      SELECT * FROM sessions WHERE id = ? AND channel = ? AND channel_id = ?
+      SELECT * FROM sessions WHERE id = ? AND channel = ? AND channel_id = ? AND deleted_at IS NULL
     `).get(targetSessionId, channel, channelId);
         if (!target)
             return null;
         // 取消当前活跃会话
-        this.deactivateAll(channel, channelId);
+        this.deactivateAllMetadata(channel, channelId);
         // 激活目标会话
-        this.db.prepare(`
-      UPDATE sessions SET is_active = 1, updated_at = ?
-      WHERE id = ?
-    `).run(Date.now(), targetSessionId);
-        return { ...this.rowToSession(target), isActive: true, updatedAt: Date.now() };
+        const metadata = target.metadata ? JSON.parse(target.metadata) : {};
+        metadata.isActive = true;
+        this.db.prepare(`UPDATE sessions SET metadata = ?, updated_at = ? WHERE id = ?`)
+            .run(JSON.stringify(metadata), Date.now(), targetSessionId);
+        return { ...this.rowToSession(target), metadata, updatedAt: Date.now() };
     }
     async renameSession(sessionId, newName) {
         const result = this.db.prepare(`
@@ -389,9 +766,14 @@ export class SessionManager {
     `).run(sessionId);
         return result.changes > 0;
     }
-    async createNewSession(channel, channelId, projectPath, name) {
+    async softDeleteSession(channelId) {
+        this.db.prepare(`
+      UPDATE sessions SET deleted_at = ?, updated_at = ? WHERE channel_id = ? AND deleted_at IS NULL
+    `).run(Date.now(), Date.now(), channelId);
+    }
+    async createNewSession(channel, channelId, projectPath, name, agentId) {
         // 取消当前活跃会话
-        this.deactivateAll(channel, channelId);
+        this.deactivateAllMetadata(channel, channelId);
         // 创建新会话
         const session = {
             id: `${channel}-${channelId}-${Date.now()}`,
@@ -399,13 +781,24 @@ export class SessionManager {
             channelId,
             projectPath,
             threadId: '',
-            agentType: 'claude',
+            agentId: agentId || 'claude',
+            chatType: 'private',
+            sessionMode: 'interactive',
+            metadata: { isActive: true },
             name: name || '默认会话',
-            isActive: true,
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
         this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel,
+            channelId,
+            projectPath,
+            name: session.name,
+            timestamp: Date.now()
+        });
         return session;
     }
     /**
@@ -413,129 +806,80 @@ export class SessionManager {
      */
     async createForkedSession(sourceSession, forkedAgentSessionId, name) {
         // 取消当前活跃会话
-        this.deactivateAll(sourceSession.channel, sourceSession.channelId);
+        this.deactivateAllMetadata(sourceSession.channel, sourceSession.channelId);
         const session = {
             id: `${sourceSession.channel}-${sourceSession.channelId}-${Date.now()}`,
             channel: sourceSession.channel,
             channelId: sourceSession.channelId,
             projectPath: sourceSession.projectPath,
             threadId: sourceSession.threadId || '',
-            agentType: sourceSession.agentType || 'claude',
+            agentId: sourceSession.agentId || 'claude',
+            chatType: sourceSession.chatType || 'private',
+            sessionMode: sourceSession.sessionMode || 'interactive',
             agentSessionId: forkedAgentSessionId,
+            metadata: { isActive: true },
             name: name || `${sourceSession.name || '会话'}-分支`,
-            isActive: true,
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
         this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel: sourceSession.channel,
+            channelId: sourceSession.channelId,
+            projectPath: sourceSession.projectPath,
+            name: session.name,
+            timestamp: Date.now()
+        });
         return session;
     }
-    async scanCliSessions(projectPath) {
-        const homeDir = os.homedir();
-        const encodedPath = this.getProjectDirName(projectPath);
-        const sessionDir = path.join(homeDir, '.claude', 'projects', encodedPath);
-        if (!fs.existsSync(sessionDir))
+    async scanCliSessions(projectPath, agentId) {
+        const adapter = this.getFileAdapter(agentId);
+        if (!adapter)
             return [];
-        const files = fs.readdirSync(sessionDir)
-            .filter(f => f.endsWith('.jsonl'))
-            .filter(f => !f.startsWith('agent-')) // 过滤子代理会话
-            .map(f => {
-            const filePath = path.join(sessionDir, f);
-            const stat = fs.statSync(filePath);
-            return { uuid: f.replace('.jsonl', ''), mtime: stat.mtimeMs, size: stat.size };
-        })
-            .filter(f => f.size > 0) // 过滤空文件
-            .sort((a, b) => b.mtime - a.mtime)
-            .slice(0, 10);
-        return files.map(f => ({ uuid: f.uuid, mtime: f.mtime }));
-    }
-    checkSessionFileExists(projectPath, agentSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
-        return fs.existsSync(sessionFile);
-    }
-    readSessionFirstMessage(projectPath, agentSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
-        if (!fs.existsSync(sessionFile))
+        return adapter.scanCliSessions(projectPath);
+    }
+    checkSessionFileExists(projectPath, agentSessionId, agentId) {
+        const adapter = this.getFileAdapter(agentId);
+        if (!adapter)
+            return false;
+        return adapter.checkExists(projectPath, agentSessionId);
+    }
+    readSessionFirstMessage(projectPath, agentSessionId, agentId) {
+        const adapter = this.getFileAdapter(agentId);
+        if (!adapter)
             return null;
-        try {
-            const content = fs.readFileSync(sessionFile, 'utf-8');
-            const lines = content.split('\n').filter(l => l.trim());
-            for (const line of lines) {
-                const event = JSON.parse(line);
-                if (event.type === 'user' && event.message?.role === 'user') {
-                    const text = this.extractUserMessageText(event.message.content);
-                    if (text)
-                        return text;
-                }
-            }
-        }
-        catch (error) {
-            logger.warn(`Failed to read session file: ${sessionFile}`, error);
-        }
-        return null;
+        return adapter.readFirstMessage(projectPath, agentSessionId);
     }
-    readSessionLastUserMessage(projectPath, agentSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
-        if (!fs.existsSync(sessionFile))
+    readSessionLastUserMessage(projectPath, agentSessionId, agentId) {
+        const adapter = this.getFileAdapter(agentId);
+        if (!adapter)
             return null;
-        try {
-            const content = fs.readFileSync(sessionFile, 'utf-8');
-            const lines = content.split('\n').filter(l => l.trim());
-            let lastMessage = null;
-            for (const line of lines) {
-                const event = JSON.parse(line);
-                if (event.type === 'user' && event.message?.role === 'user') {
-                    lastMessage = this.extractUserMessageText(event.message.content) ?? lastMessage;
-                }
-            }
-            return lastMessage;
-        }
-        catch (error) {
-            logger.warn(`Failed to read last message from session file: ${sessionFile}`, error);
-        }
-        return null;
+        return adapter.readLastUserMessage(projectPath, agentSessionId);
     }
     /**
      * 获取会话文件信息（回合数 + 标题）
      */
-    getSessionFileInfo(projectPath, agentSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
-        if (!fs.existsSync(sessionFile))
-            return { turns: 0 };
-        try {
-            const content = fs.readFileSync(sessionFile, 'utf-8');
-            const lines = content.split('\n').filter(l => l.trim());
-            let turns = 0;
-            let title;
-            for (const line of lines) {
-                const event = JSON.parse(line);
-                if (event.type === 'user' && event.message?.role === 'user') {
-                    // Only count real user input, skip auto-generated tool_result messages
-                    const content = event.message.content;
-                    const isToolResult = Array.isArray(content) && content.every((c) => c.type === 'tool_result');
-                    if (!isToolResult) {
-                        turns++;
-                    }
-                }
-                // 提取会话标题（从 session 元数据中）
-                if (event.title && !title) {
-                    title = event.title;
-                }
-                if (event.sessionTitle && !title) {
-                    title = event.sessionTitle;
-                }
-            }
-            return { turns, title };
-        }
-        catch (error) {
-            logger.warn(`Failed to read session file info: ${sessionFile}`, error);
+    getSessionFileInfo(projectPath, agentSessionId, agentId) {
+        const adapter = this.getFileAdapter(agentId);
+        if (!adapter)
             return { turns: 0 };
-        }
+        return adapter.getFileInfo(projectPath, agentSessionId);
+    }
+    /**
+     * 列出 SDK 侧的会话列表（用于名称同步）
+     */
+    async listSdkSessions(projectPath, agentId) {
+        const adapter = this.getFileAdapter(agentId);
+        if (!adapter?.listSdkSessions)
+            return [];
+        return adapter.listSdkSessions(projectPath);
     }
     async getSessionByUuidPrefix(channel, channelId, uuidPrefix) {
         const rows = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND agent_session_id LIKE ?
+      WHERE channel = ? AND channel_id = ? AND agent_session_id LIKE ? AND deleted_at IS NULL
     `).all(channel, channelId, `${uuidPrefix}%`);
         if (rows.length === 0)
             return undefined;
@@ -544,41 +888,38 @@ 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() };
-        }
+    async importCliSession(channel, channelId, projectPath, agentSessionId, agentId = 'claude') {
         // 取消当前活跃会话
-        this.deactivateAll(channel, channelId);
-        // 创建会话记录
+        this.deactivateAllMetadata(channel, channelId);
+        // 从 CLI 会话文件读取标题
+        const fileInfo = this.getSessionFileInfo(projectPath, agentSessionId, agentId);
+        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,
             channelId,
             projectPath,
             threadId: '',
-            agentType: 'claude',
+            agentId,
+            chatType: 'private',
+            sessionMode: 'interactive',
             agentSessionId,
-            name: `CLI会话-${new Date().toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })}`,
-            isActive: true,
+            metadata: { isActive: true },
+            name,
             createdAt: Date.now(),
             updatedAt: Date.now()
         };
         this.insertSession(session);
+        this.eventBus.publish({
+            type: 'session:created',
+            sessionId: session.id,
+            channel,
+            channelId,
+            projectPath,
+            name,
+            timestamp: Date.now()
+        });
         return session;
     }
     // ==================== 健康状态管理 ====================
@@ -610,6 +951,11 @@ export class SessionManager {
             lastSuccessTime: row.last_success_time
         };
     }
+    /** 当前处于安全模式的会话数 */
+    getSafeModeSessionCount() {
+        const row = this.db.prepare(`SELECT COUNT(*) as count FROM session_health WHERE safe_mode = 1`).get();
+        return row?.count ?? 0;
+    }
     /**
      * 记录成功响应（重置错误计数）
      */
@@ -673,6 +1019,8 @@ export class SessionManager {
     `).run(sessionId, now, now, now, now);
     }
     close() {
+        for (const adapter of this.fileAdapters.values())
+            adapter.close?.();
         this.db.close();
     }
 }