evolclaw 2.0.7 → 2.1.1

package/dist/core/session-manager.js

@@ -30,7 +30,10 @@ export class SessionManager {
             channel: row.channel,
             channelId: row.channel_id,
             projectPath: row.project_path,
-            claudeSessionId: row.claude_session_id,
+            threadId: row.thread_id || '',
+            agentType: row.agent_type || 'claude',
+            agentSessionId: row.agent_session_id,
+            metadata: row.metadata ? JSON.parse(row.metadata) : undefined,
             name: row.name,
             isActive: row.is_active === 1,
             createdAt: row.created_at,
@@ -44,21 +47,21 @@ export class SessionManager {
     `).run(Date.now(), channel, channelId);
     }
     validateSessionFile(row) {
-        const claudeSessionId = row.claude_session_id;
-        if (!claudeSessionId)
+        const agentSessionId = row.agent_session_id;
+        if (!agentSessionId)
             return undefined;
-        const sessionFile = this.getSessionFilePath(row.project_path, claudeSessionId);
+        const sessionFile = this.getSessionFilePath(row.project_path, agentSessionId);
         if (fs.existsSync(sessionFile))
-            return claudeSessionId;
+            return agentSessionId;
         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);
+        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, 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);
+      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);
     }
     extractUserMessageText(messageContent) {
         if (typeof messageContent === 'string') {
@@ -78,55 +81,16 @@ export class SessionManager {
         const tableInfo = this.db.prepare('PRAGMA table_info(sessions)').all();
         const hasIsActive = tableInfo.some((col) => col.name === 'is_active');
         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 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');
-        if (!hasIsActive && tableInfo.length > 0) {
-            logger.info('Migrating database schema (removing unique constraint)...');
-            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,
-          claude_session_id TEXT,
-          name TEXT,
-          is_active INTEGER NOT NULL DEFAULT 0,
-          created_at INTEGER NOT NULL,
-          updated_at INTEGER NOT NULL
-        );
-        INSERT INTO sessions_new SELECT id, channel, channel_id, project_path, claude_session_id, NULL, 1, created_at, updated_at FROM sessions;
-        DROP TABLE sessions;
-        ALTER TABLE sessions_new RENAME TO sessions;
-      `);
-            logger.info('✓ Database migration completed');
-        }
-        else if (!hasName && tableInfo.length > 0) {
-            logger.info('Adding name column...');
-            this.db.exec(`ALTER TABLE sessions ADD COLUMN name TEXT`);
-            if (hasUniqueConstraint) {
-                logger.info('Removing unique constraint...');
-                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,
-            claude_session_id TEXT,
-            name TEXT,
-            is_active INTEGER NOT NULL DEFAULT 0,
-            created_at INTEGER NOT NULL,
-            updated_at INTEGER NOT NULL
-          );
-          INSERT INTO sessions_new SELECT * FROM sessions;
-          DROP TABLE sessions;
-          ALTER TABLE sessions_new RENAME TO sessions;
-        `);
-            }
-            logger.info('✓ Schema updated');
-        }
-        else if (hasUniqueConstraint) {
-            logger.info('Removing stale unique constraint...');
+        // 迁移到新表结构（添加 thread_id, agent_type, agent_session_id, metadata）
+        if (!hasThreadId && tableInfo.length > 0) {
+            logger.info('Migrating database schema (adding thread support)...');
             this.db.exec(`DROP TABLE IF EXISTS sessions_new`);
             this.db.exec(`
         CREATE TABLE sessions_new (
@@ -134,34 +98,51 @@ export class SessionManager {
           channel TEXT NOT NULL,
           channel_id TEXT NOT NULL,
           project_path TEXT NOT NULL,
-          claude_session_id TEXT,
+          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
+          updated_at INTEGER NOT NULL,
+          metadata TEXT
         );
-        INSERT INTO sessions_new (id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at)
-          SELECT id, channel, channel_id, project_path, claude_session_id, name, is_active, created_at, updated_at FROM sessions;
+        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;
       `);
-            logger.info('✓ Unique constraint removed');
-        }
-        else {
+            // 话题会话唯一约束（thread_id 非空时才生效）
             this.db.exec(`
-        CREATE TABLE IF NOT EXISTS sessions (
-          id TEXT PRIMARY KEY,
-          channel TEXT NOT NULL,
-          channel_id TEXT NOT NULL,
-          project_path TEXT NOT NULL,
-          claude_session_id TEXT,
-          name TEXT,
-          is_active INTEGER NOT NULL DEFAULT 0,
-          created_at INTEGER NOT NULL,
-          updated_at INTEGER NOT NULL
-        )
+        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)');
         }
+        // 创建新表（首次初始化）
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS sessions (
+        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
+      )
+    `);
+        // 话题会话唯一约束（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 != ''
+    `);
         // 创建消息去重表
         this.db.exec(`
       CREATE TABLE IF NOT EXISTS processed_messages (
@@ -188,58 +169,46 @@ export class SessionManager {
       CREATE INDEX IF NOT EXISTS idx_session_health_safe_mode ON session_health(safe_mode);
     `);
     }
-    async getOrCreateSession(channel, channelId, defaultProjectPath, name) {
-        // 1. 查找该聊天的活跃会话
+    async getOrCreateSession(channel, channelId, defaultProjectPath, threadId, metadata, name) {
+        // 话题会话：独立查找/创建，不参与 isActive 竞争
+        if (threadId) {
+            return this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name);
+        }
+        // 主会话：查找活跃会话
         const active = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND is_active = 1
+      WHERE channel = ? AND channel_id = ? AND is_active = 1 AND thread_id = ''
     `).get(channel, channelId);
         if (active) {
             const validSessionId = this.validateSessionFile(active);
-            return { ...this.rowToSession(active), claudeSessionId: validSessionId };
+            return { ...this.rowToSession(active), agentSessionId: validSessionId };
         }
-        // 2. 没有活跃会话，查找该聊天在默认项目的会话
+        // 查找默认项目的主会话
         const existing = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND project_path = ?
+      WHERE channel = ? AND channel_id = ? AND project_path = ? AND thread_id = ''
       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), claudeSessionId: validSessionId, isActive: true };
+            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: '',
+            agentType: 'claude',
+            metadata,
             name: name || '默认会话',
             isActive: true,
             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, 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);
-        // 如果插入被忽略（已存在），重新查询
-        if (result.changes === 0) {
-            const recheck = this.db.prepare(`
-        SELECT * FROM sessions
-        WHERE channel = ? AND channel_id = ? AND project_path = ?
-      `).get(channel, channelId, defaultProjectPath);
-            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) {
@@ -250,10 +219,53 @@ export class SessionManager {
                 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);
     }
+    getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name) {
+        // 查找已有话题会话
+        const existing = this.db.prepare(`
+      SELECT * FROM sessions
+      WHERE channel = ? AND channel_id = ? AND thread_id = ?
+    `).get(channel, channelId, threadId);
+        if (existing) {
+            const validSessionId = this.validateSessionFile(existing);
+            // 合并 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);
+                return { ...this.rowToSession(existing), agentSessionId: validSessionId, metadata: merged };
+            }
+            return { ...this.rowToSession(existing), agentSessionId: validSessionId };
+        }
+        // 继承当前活跃主会话的项目路径
+        const activeMain = this.db.prepare(`
+      SELECT project_path FROM sessions
+      WHERE channel = ? AND channel_id = ? AND is_active = 1 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',
+            metadata,
+            name: name || '话题会话',
+            isActive: false,
+            createdAt: Date.now(),
+            updatedAt: Date.now()
+        };
+        this.insertSession(session);
+        return session;
+    }
     async switchProject(channel, channelId, newProjectPath) {
         // 1. 取消当前活跃会话
         this.deactivateAll(channel, channelId);
@@ -270,7 +282,7 @@ export class SessionManager {
         UPDATE sessions SET is_active = 1, updated_at = ?
         WHERE id = ?
       `).run(Date.now(), target.id);
-            return { ...this.rowToSession(target), claudeSessionId: validSessionId, isActive: true };
+            return { ...this.rowToSession(target), agentSessionId: validSessionId, isActive: true };
         }
         // 3. 创建新会话
         const session = {
@@ -278,6 +290,8 @@ export class SessionManager {
             channel,
             channelId,
             projectPath: newProjectPath,
+            threadId: '',
+            agentType: 'claude',
             name: '默认会话',
             isActive: true,
             createdAt: Date.now(),
@@ -286,28 +300,28 @@ export class SessionManager {
         this.insertSession(session);
         return session;
     }
-    async updateClaudeSessionId(channel, channelId, claudeSessionId) {
-        // 只更新当前活跃会话的 Claude Session ID
+    async updateAgentSessionId(channel, channelId, agentSessionId) {
+        // 只更新当前活跃会话的 Agent Session ID
         this.db.prepare(`
       UPDATE sessions
-      SET claude_session_id = ?, updated_at = ?
+      SET agent_session_id = ?, updated_at = ?
       WHERE channel = ? AND channel_id = ? AND is_active = 1
-    `).run(claudeSessionId, Date.now(), channel, channelId);
+    `).run(agentSessionId, Date.now(), channel, channelId);
     }
-    async updateClaudeSessionIdBySessionId(sessionId, claudeSessionId) {
+    async updateAgentSessionIdBySessionId(sessionId, agentSessionId) {
         // 根据 sessionId 直接更新
-        logger.info(`[SessionManager] Updating claude_session_id: sessionId=${sessionId}, claudeSessionId=${claudeSessionId}`);
+        logger.info(`[SessionManager] Updating agent_session_id: sessionId=${sessionId}, agentSessionId=${agentSessionId}`);
         this.db.prepare(`
       UPDATE sessions
-      SET claude_session_id = ?, updated_at = ?
+      SET agent_session_id = ?, updated_at = ?
       WHERE id = ?
-    `).run(claudeSessionId, Date.now(), sessionId);
+    `).run(agentSessionId, Date.now(), sessionId);
     }
     async clearActiveSession(channel, channelId) {
-        // 清除当前活跃会话的 Claude Session ID
+        // 清除当前活跃会话的 Agent Session ID
         this.db.prepare(`
       UPDATE sessions
-      SET claude_session_id = NULL, updated_at = ?
+      SET agent_session_id = NULL, updated_at = ?
       WHERE channel = ? AND channel_id = ? AND is_active = 1
     `).run(Date.now(), channel, channelId);
     }
@@ -369,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);
@@ -378,6 +398,8 @@ export class SessionManager {
             channel,
             channelId,
             projectPath,
+            threadId: '',
+            agentType: 'claude',
             name: name || '默认会话',
             isActive: true,
             createdAt: Date.now(),
@@ -389,7 +411,7 @@ export class SessionManager {
     /**
      * 基于现有会话创建分支会话
      */
-    async createForkedSession(sourceSession, forkedClaudeSessionId, name) {
+    async createForkedSession(sourceSession, forkedAgentSessionId, name) {
         // 取消当前活跃会话
         this.deactivateAll(sourceSession.channel, sourceSession.channelId);
         const session = {
@@ -397,7 +419,9 @@ export class SessionManager {
             channel: sourceSession.channel,
             channelId: sourceSession.channelId,
             projectPath: sourceSession.projectPath,
-            claudeSessionId: forkedClaudeSessionId,
+            threadId: sourceSession.threadId || '',
+            agentType: sourceSession.agentType || 'claude',
+            agentSessionId: forkedAgentSessionId,
             name: name || `${sourceSession.name || '会话'}-分支`,
             isActive: true,
             createdAt: Date.now(),
@@ -425,12 +449,12 @@ export class SessionManager {
             .slice(0, 10);
         return files.map(f => ({ uuid: f.uuid, mtime: f.mtime }));
     }
-    checkSessionFileExists(projectPath, claudeSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, claudeSessionId);
+    checkSessionFileExists(projectPath, agentSessionId) {
+        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
         return fs.existsSync(sessionFile);
     }
-    readSessionFirstMessage(projectPath, claudeSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, claudeSessionId);
+    readSessionFirstMessage(projectPath, agentSessionId) {
+        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
         if (!fs.existsSync(sessionFile))
             return null;
         try {
@@ -450,8 +474,8 @@ export class SessionManager {
         }
         return null;
     }
-    readSessionLastUserMessage(projectPath, claudeSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, claudeSessionId);
+    readSessionLastUserMessage(projectPath, agentSessionId) {
+        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
         if (!fs.existsSync(sessionFile))
             return null;
         try {
@@ -474,8 +498,8 @@ export class SessionManager {
     /**
      * 获取会话文件信息（回合数 + 标题）
      */
-    getSessionFileInfo(projectPath, claudeSessionId) {
-        const sessionFile = this.getSessionFilePath(projectPath, claudeSessionId);
+    getSessionFileInfo(projectPath, agentSessionId) {
+        const sessionFile = this.getSessionFilePath(projectPath, agentSessionId);
         if (!fs.existsSync(sessionFile))
             return { turns: 0 };
         try {
@@ -511,7 +535,7 @@ export class SessionManager {
     async getSessionByUuidPrefix(channel, channelId, uuidPrefix) {
         const rows = this.db.prepare(`
       SELECT * FROM sessions
-      WHERE channel = ? AND channel_id = ? AND claude_session_id LIKE ?
+      WHERE channel = ? AND channel_id = ? AND agent_session_id LIKE ?
     `).all(channel, channelId, `${uuidPrefix}%`);
         if (rows.length === 0)
             return undefined;
@@ -520,23 +544,23 @@ export class SessionManager {
         }
         return this.rowToSession(rows[0]);
     }
-    async importCliSession(channel, channelId, projectPath, claudeSessionId) {
+    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) {
-            // 更新 claude_session_id 并激活
+            // 更新 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 claude_session_id = ?, is_active = 1, updated_at = ?
+        UPDATE sessions SET agent_session_id = ?, is_active = 1, updated_at = ?
         WHERE id = ?
-      `).run(claudeSessionId, Date.now(), existingByPath.id);
-            return { ...this.rowToSession(existingByPath), claudeSessionId, isActive: true, updatedAt: Date.now() };
+      `).run(agentSessionId, Date.now(), existingByPath.id);
+            return { ...this.rowToSession(existingByPath), agentSessionId, isActive: true, updatedAt: Date.now() };
         }
         // 取消当前活跃会话
         this.deactivateAll(channel, channelId);
@@ -546,7 +570,9 @@ export class SessionManager {
             channel,
             channelId,
             projectPath,
-            claudeSessionId,
+            threadId: '',
+            agentType: 'claude',
+            agentSessionId,
             name: `CLI会话-${new Date().toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })}`,
             isActive: true,
             createdAt: Date.now(),

package/dist/index.js

@@ -43,9 +43,12 @@ async function main() {
     const sessionManager = new SessionManager();
     logger.info('✓ Database initialized');
     // 初始化 Agent Runner（带持久化回调）
-    const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, async (sessionId, claudeSessionId) => {
-        await sessionManager.updateClaudeSessionIdBySessionId(sessionId, claudeSessionId);
+    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();
@@ -78,8 +81,8 @@ async function main() {
     // 创建命令处理器
     const cmdHandler = new CommandHandler(sessionManager, agentRunner, config, messageCache);
     // 创建消息处理器
-    const processor = new MessageProcessor(agentRunner, sessionManager, config, messageCache, (content, channel, channelId, userId) => {
-        const sendFn = async (id, text) => {
+    const processor = new MessageProcessor(agentRunner, sessionManager, config, messageCache, (content, channel, channelId, userId, threadId) => {
+        const sendFn = async (id, text, opts) => {
             const adapter = cmdHandler.getAdapter(channel);
             if (!adapter)
                 return;
@@ -105,10 +108,10 @@ 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);
+        return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
     });
     // 回填 processor 和 messageQueue 的引用
     cmdHandler.setProcessor(processor);
@@ -223,8 +226,8 @@ async function main() {
     }
     // Feishu 消息处理
     if (feishu) {
-        feishu.onMessage(async (chatId, content, images, userId, userName, messageId, mentions) => {
-            content = content.trim();
+        feishu.onMessage(async ({ channelId: chatId, content: rawContent, images, userId, userName, messageId, mentions, threadId, rootId }) => {
+            let content = rawContent.trim();
             // 首次交互自动绑定主人
             if (userId && !config.channels?.feishu?.owner) {
                 const { setOwner } = await import('./config.js');
@@ -233,11 +236,11 @@ async function main() {
             }
             // 命令立即处理，不进入队列
             if (cmdHandler.isCommand(content)) {
-                const cmdResult = await cmdHandler.handle(content, 'feishu', chatId, undefined, userId);
+                const cmdResult = await cmdHandler.handle(content, 'feishu', chatId, undefined, userId, threadId);
                 if (cmdResult !== null) {
                     if (cmdResult) {
                         try {
-                            await feishu.sendMessage(chatId, cmdResult, { forceText: true });
+                            await feishu.sendMessage(chatId, cmdResult, { forceText: true, replyToMessageId: rootId, replyInThread: true });
                         }
                         catch (error) {
                             logger.error('[Feishu] Failed to send command response:', error);
@@ -246,15 +249,16 @@ async function main() {
                     return;
                 }
             }
-            // 获取当前项目路径
-            const session = await sessionManager.getOrCreateSession('feishu', chatId, config.projects?.defaultPath || process.cwd());
+            // 获取当前项目路径（话题会话自动创建，携带 metadata）
+            const metadata = rootId ? { feishu: { rootId } } : undefined;
+            const session = await sessionManager.getOrCreateSession('feishu', chatId, config.projects?.defaultPath || process.cwd(), threadId, metadata);
             // 群聊消息添加用户名前缀
             const chatMode = await feishu.getChatMode(chatId);
             if (chatMode === 'group' && userName) {
                 content = `[${userName}] ${content}`;
             }
-            // 普通消息进入队列
-            await messageQueue.enqueue(`feishu-${chatId}`, { channel: 'feishu', channelId: chatId, content, images, timestamp: Date.now(), userId, userName, messageId, isGroup: chatMode === 'group', mentions }, session.projectPath);
+            // 普通消息进入队列（使用 session.id 作为 key，话题间可并行）
+            await messageQueue.enqueue(session.id, { channel: 'feishu', channelId: chatId, content, images, timestamp: Date.now(), userId, userName, messageId, isGroup: chatMode === 'group', mentions, threadId }, session.projectPath);
         });
     }
     // AUN 消息处理