evolclaw 2.0.7 → 2.1.0

package/data/evolclaw.sample.json

@@ -28,8 +28,9 @@
   },
   "idleMonitor": {
     "enabled": true,
-    "timeout": 120000,
+    "timeout": 120,
     "safeModeThreshold": 3
   },
-  "flushDelay": 4000
+  "flushDelay": 4,
+  "showActivities": "all"
 }

package/dist/channels/feishu.js

@@ -46,10 +46,6 @@ export class FeishuChannel {
                     const msg = data.message;
                     logger.debug('[Feishu] Received message, message_id:', msg.message_id, 'type:', msg.message_type);
                     logger.debug('[Feishu] Full data object:', JSON.stringify(data, null, 2));
-                    // 诊断：话题消息检测
-                    if (msg.thread_id) {
-                        logger.info('[Feishu] Thread message detected, thread_id:', msg.thread_id, 'parent_id:', msg.parent_id, 'root_id:', msg.root_id);
-                    }
                     if (!msg.message_id || this.isDuplicate(msg.message_id)) {
                         logger.debug('[Feishu] Duplicate message ignored:', msg.message_id);
                         return;
@@ -58,6 +54,10 @@ export class FeishuChannel {
                     this.addAckReaction(msg.message_id);
                     if (!this.messageHandler)
                         return;
+                    // 话题消息检测日志（去重后）
+                    if (msg.thread_id) {
+                        logger.info('[Feishu] Thread message, thread_id:', msg.thread_id, 'root_id:', msg.root_id);
+                    }
                     // 提取 @ 提及列表（排除机器人自身）
                     const mentions = (msg.mentions || []).map((m) => ({
                         userId: m.id?.open_id || '',
@@ -74,10 +74,15 @@ export class FeishuChannel {
                         userName = undefined;
                     }
                     try {
-                        // 处理引用消息
+                        // 提取话题信息
+                        const threadId = msg.thread_id || undefined;
+                        const rootId = msg.root_id || undefined;
+                        // 处理引用消息（话题内消息跳过，避免每条都拼接引用前缀）
                         let quotedText = '';
                         let quotedImages = [];
-                        if (msg.parent_id && this.client) {
+                        // 话题创建消息检测：DB 中无对应 thread session 时为首条消息
+                        const isThreadCreating = threadId && !this.hasThreadSession(threadId);
+                        if (msg.parent_id && (!msg.thread_id || isThreadCreating) && this.client) {
                             try {
                                 const res = await this.client.im.message.get({
                                     path: { message_id: msg.parent_id }
@@ -151,7 +156,7 @@ export class FeishuChannel {
                             // 优先使用 text_without_at_bot（去除机器人 @），否则使用 text
                             const content = parsed.text_without_at_bot || parsed.text;
                             const finalContent = quotedText + content;
-                            await this.messageHandler(msg.chat_id, finalContent, quotedImages.length > 0 ? quotedImages : undefined, userId, userName, msg.message_id, mentions.length > 0 ? mentions : undefined);
+                            await this.messageHandler({ channelId: msg.chat_id, content: finalContent, images: quotedImages.length > 0 ? quotedImages : undefined, userId, userName, messageId: msg.message_id, mentions: mentions.length > 0 ? mentions : undefined, threadId, rootId });
                         }
                         // 处理图片消息
                         else if (msg.message_type === 'image') {
@@ -165,11 +170,11 @@ export class FeishuChannel {
                             if (imageData) {
                                 const allImages = [...quotedImages, imageData];
                                 const prompt = quotedText + '用户发送了一张图片，请分析这张图片的内容。';
-                                await this.messageHandler(msg.chat_id, prompt, allImages, userId, userName, msg.message_id);
+                                await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: allImages, userId, userName, messageId: msg.message_id, threadId, rootId });
                             }
                             else {
                                 const prompt = quotedText + '[图片下载失败] 应用可能缺少 im:message 或 im:message:readonly 权限';
-                                await this.messageHandler(msg.chat_id, prompt, quotedImages.length > 0 ? quotedImages : undefined, userId, userName, msg.message_id);
+                                await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: quotedImages.length > 0 ? quotedImages : undefined, userId, userName, messageId: msg.message_id, threadId, rootId });
                             }
                         }
                         // 处理文件消息
@@ -184,11 +189,11 @@ export class FeishuChannel {
                             const filePath = await this.downloadFile(fileKey, fileName, msg.message_id, projectPath);
                             if (filePath) {
                                 const prompt = quotedText + `用户发送了文件：${fileName}\n文件已保存到：${filePath}\n请使用 Read 工具读取并分析文件内容。`;
-                                await this.messageHandler(msg.chat_id, prompt, quotedImages.length > 0 ? quotedImages : undefined, userId, userName, msg.message_id);
+                                await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: quotedImages.length > 0 ? quotedImages : undefined, userId, userName, messageId: msg.message_id, threadId, rootId });
                             }
                             else {
                                 const prompt = quotedText + '[文件下载失败] 应用可能缺少 im:resource 权限';
-                                await this.messageHandler(msg.chat_id, prompt, quotedImages.length > 0 ? quotedImages : undefined, userId, userName, msg.message_id);
+                                await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: quotedImages.length > 0 ? quotedImages : undefined, userId, userName, messageId: msg.message_id, threadId, rootId });
                             }
                         }
                         // 处理富文本消息
@@ -210,13 +215,13 @@ export class FeishuChannel {
                             if (title)
                                 finalContent = `${title}\n${finalContent}`;
                             finalContent = quotedText + finalContent;
-                            await this.messageHandler(msg.chat_id, finalContent, quotedImages.length > 0 ? quotedImages : undefined, userId, userName, msg.message_id);
+                            await this.messageHandler({ channelId: msg.chat_id, content: finalContent, images: quotedImages.length > 0 ? quotedImages : undefined, userId, userName, messageId: msg.message_id, threadId, rootId });
                         }
                         // 处理其他类型消息
                         else {
                             logger.debug('[Feishu] Unsupported message type:', msg.message_type);
                             const prompt = quotedText + `[不支持的消息类型: ${msg.message_type}]`;
-                            await this.messageHandler(msg.chat_id, prompt, quotedImages.length > 0 ? quotedImages : undefined, userId, userName, msg.message_id);
+                            await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: quotedImages.length > 0 ? quotedImages : undefined, userId, userName, messageId: msg.message_id, threadId, rootId });
                         }
                     }
                     catch (error) {
@@ -313,9 +318,13 @@ export class FeishuChannel {
                     : JSON.stringify({ text: content });
             }
             if (options?.replyToMessageId) {
+                const replyData = { msg_type: msgType, content: msgContent };
+                if (options.replyInThread) {
+                    replyData.reply_in_thread = true;
+                }
                 await this.client.im.message.reply({
                     path: { message_id: options.replyToMessageId },
-                    data: { msg_type: msgType, content: msgContent }
+                    data: replyData
                 });
             }
             else {
@@ -366,6 +375,15 @@ export class FeishuChannel {
             throw error;
         }
     }
+    hasThreadSession(threadId) {
+        try {
+            const row = this.db.prepare('SELECT 1 FROM sessions WHERE thread_id = ? LIMIT 1').get(threadId);
+            return !!row;
+        }
+        catch {
+            return false;
+        }
+    }
     async disconnect() {
         if (this.cleanupInterval) {
             clearInterval(this.cleanupInterval);

package/dist/cli.js

@@ -713,14 +713,26 @@ async function notifyChannel(p, pendingInfo, message, log) {
                 appId: config.channels.feishu.appId,
                 appSecret: config.channels.feishu.appSecret,
             });
-            await client.im.message.create({
-                params: { receive_id_type: 'chat_id' },
-                data: {
-                    receive_id: pendingInfo.channelId,
-                    msg_type: 'text',
-                    content: JSON.stringify({ text: message }),
-                },
-            });
+            if (pendingInfo.rootId) {
+                await client.im.message.reply({
+                    path: { message_id: pendingInfo.rootId },
+                    data: {
+                        msg_type: 'text',
+                        content: JSON.stringify({ text: message }),
+                        reply_in_thread: true,
+                    },
+                });
+            }
+            else {
+                await client.im.message.create({
+                    params: { receive_id_type: 'chat_id' },
+                    data: {
+                        receive_id: pendingInfo.channelId,
+                        msg_type: 'text',
+                        content: JSON.stringify({ text: message }),
+                    },
+                });
+            }
             log(`Feishu notification sent: ${message.slice(0, 50)}`);
         }
         catch (error) {

package/dist/core/agent-runner.js

@@ -44,24 +44,24 @@ export class AgentRunner {
     async runQuery(sessionId, prompt, projectPath, initialClaudeSessionId, images, systemPromptAppend, sessionManager) {
         ensureDir(projectPath);
         ensureDir(path.join(projectPath, '.claude'));
-        // 优先使用传入的 claudeSessionId（从数据库恢复），否则使用内存中的
-        let claudeSessionId = initialClaudeSessionId || this.activeSessions.get(sessionId);
+        // 优先使用传入的 agentSessionId（从数据库恢复），否则使用内存中的
+        let agentSessionId = initialClaudeSessionId || this.activeSessions.get(sessionId);
         // 检查是否在安全模式
         let skipResume = false;
         if (sessionManager) {
             const health = await sessionManager.getHealthStatus(sessionId);
             if (health.safeMode) {
                 // 安全模式：不使用 resume，每次都是新对话
-                claudeSessionId = undefined;
+                agentSessionId = undefined;
                 skipResume = true;
                 logger.warn(`[AgentRunner] Safe mode enabled for ${sessionId}, not resuming session`);
             }
         }
-        // 验证会话文件是否存在且有效（仅在非安全模式且有 claudeSessionId 时）
-        if (claudeSessionId && !skipResume) {
+        // 验证会话文件是否存在且有效（仅在非安全模式且有 agentSessionId 时）
+        if (agentSessionId && !skipResume) {
             const homeDir = os.homedir();
             const encodedProjectPath = encodePath(projectPath);
-            const sessionFile = path.join(homeDir, '.claude', 'projects', encodedProjectPath, `${claudeSessionId}.jsonl`);
+            const sessionFile = path.join(homeDir, '.claude', 'projects', encodedProjectPath, `${agentSessionId}.jsonl`);
             let isValid = false;
             if (fs.existsSync(sessionFile)) {
                 try {
@@ -88,7 +88,7 @@ export class AgentRunner {
             }
             if (!isValid) {
                 logger.warn(`[AgentRunner] Invalid session file, starting new session`);
-                claudeSessionId = undefined;
+                agentSessionId = undefined;
                 this.activeSessions.delete(sessionId);
                 if (this.onSessionIdUpdate) {
                     this.onSessionIdUpdate(sessionId, '');
@@ -220,8 +220,8 @@ export class AgentRunner {
                     queryStream = createQuery(stream);
                 }
                 else {
-                    logger.debug('[AgentRunner] Creating query with text only, claudeSessionId:', initialClaudeSessionId);
-                    queryStream = createQuery(prompt, claudeSessionId);
+                    logger.debug('[AgentRunner] Creating query with text only, agentSessionId:', initialClaudeSessionId);
+                    queryStream = createQuery(prompt, agentSessionId);
                 }
                 this.activeStreams.set(sessionId, queryStream);
                 return queryStream;
@@ -243,26 +243,29 @@ export class AgentRunner {
             logger.info(`[AgentRunner] Interrupted session: ${sessionId}`);
         }
     }
+    hasActiveStream(sessionId) {
+        return this.activeStreams.has(sessionId);
+    }
     registerStream(key, stream) {
         this.activeStreams.set(key, stream);
     }
     cleanupStream(sessionId) {
         this.activeStreams.delete(sessionId);
     }
-    updateSessionId(sessionId, claudeSessionId) {
-        logger.info(`[AgentRunner] updateSessionId called: sessionId=${sessionId}, claudeSessionId=${claudeSessionId}`);
-        this.activeSessions.set(sessionId, claudeSessionId);
+    updateSessionId(sessionId, agentSessionId) {
+        logger.info(`[AgentRunner] updateSessionId called: sessionId=${sessionId}, agentSessionId=${agentSessionId}`);
+        this.activeSessions.set(sessionId, agentSessionId);
         if (this.onSessionIdUpdate) {
-            this.onSessionIdUpdate(sessionId, claudeSessionId);
+            this.onSessionIdUpdate(sessionId, agentSessionId);
         }
     }
-    runSessionCommand(prompt, claudeSessionId, projectPath) {
+    runSessionCommand(prompt, agentSessionId, projectPath) {
         return query({
             prompt,
             options: {
                 cwd: projectPath,
                 model: this.model,
-                resume: claudeSessionId,
+                resume: agentSessionId,
                 maxTurns: 1,
                 permissionMode: 'default',
                 env: this.getAgentEnv()
@@ -272,10 +275,10 @@ export class AgentRunner {
     /**
      * 主动压缩会话上下文
      */
-    async compactSession(sessionId, claudeSessionId, projectPath) {
+    async compactSession(sessionId, agentSessionId, projectPath) {
         try {
-            logger.info(`[AgentRunner] Compacting session: ${claudeSessionId}`);
-            const stream = this.runSessionCommand('/compact', claudeSessionId, projectPath);
+            logger.info(`[AgentRunner] Compacting session: ${agentSessionId}`);
+            const stream = this.runSessionCommand('/compact', agentSessionId, projectPath);
             for await (const event of stream) {
                 if (event.type === 'system' && event.subtype === 'compact_boundary') {
                     logger.info(`[AgentRunner] Compact completed, pre_tokens: ${event.compact_metadata?.pre_tokens}`);
@@ -292,10 +295,10 @@ export class AgentRunner {
     /**
      * 通过 SDK /clear 命令清空会话历史
      */
-    async clearSession(claudeSessionId, projectPath) {
+    async clearSession(agentSessionId, projectPath) {
         try {
-            logger.info(`[AgentRunner] Clearing session via SDK: ${claudeSessionId}`);
-            const stream = this.runSessionCommand('/clear', claudeSessionId, projectPath);
+            logger.info(`[AgentRunner] Clearing session via SDK: ${agentSessionId}`);
+            const stream = this.runSessionCommand('/clear', agentSessionId, projectPath);
             for await (const event of stream) {
                 logger.debug(`[AgentRunner] Clear event: type=${event.type}, subtype=${event.subtype || 'none'}`);
             }

package/dist/core/command-handler.js

@@ -54,8 +54,9 @@ const aliases = {
     '/name': '/rename'
 };
 // 命令快速路径前缀（不进入消息队列的命令）
-// 注意：/stop, /clear, /compact, /safe 故意不在此列表中，它们需要进入队列触发中断机制
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/slist', '/session', '/rename', '/repair', '/fork', '/p ', '/s ', '/name '];
+// 注意：/clear, /compact, /safe 故意不在此列表中，它们需要进入队列触发中断机制
+// /stop 是快速命令：直接调用 agentRunner.interrupt()，不走队列（否则队列自动中断后 /stop 检测不到活跃任务）
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/p ', '/s ', '/name '];
 export class CommandHandler {
     sessionManager;
     agentRunner;
@@ -82,8 +83,19 @@ export class CommandHandler {
     getProjectName(projectPath) {
         return this.getConfiguredProjectName(projectPath) || path.basename(projectPath);
     }
+    /** 获取消息队列 key：话题用 session.id，主会话用 channel-channelId */
+    getQueueKey(session, channel, channelId) {
+        if (session?.threadId)
+            return session.id;
+        return `${channel}-${channelId}`;
+    }
     /** 获取活跃会话，无会话时返回统一错误提示 */
-    async ensureSession(channel, channelId) {
+    async ensureSession(channel, channelId, threadId) {
+        if (threadId) {
+            // 话题会话：按 thread_id 查找
+            const session = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+            return { session };
+        }
         const session = await this.sessionManager.getActiveSession(channel, channelId);
         if (!session) {
             return { error: '❌ 当前没有活跃会话\n使用 /new 创建新会话' };
@@ -111,7 +123,7 @@ export class CommandHandler {
     /**
      * 主命令处理入口
      */
-    async handle(content, channel, channelId, sendMessage, userId) {
+    async handle(content, channel, channelId, sendMessage, userId, threadId) {
         // 规范化命令（将别名转换为完整命令）
         let normalizedContent = content;
         for (const [alias, full] of Object.entries(aliases)) {
@@ -122,6 +134,13 @@ export class CommandHandler {
         }
         // 权限检查：区分用户级命令和管理级命令
         const { isOwner: checkOwner } = await import('../config.js');
+        // 话题内禁用部分命令
+        if (threadId) {
+            const threadBlocked = ['/new', '/slist', '/plist', '/bind', '/s', '/session', '/project', '/p', '/fork'];
+            const isBlocked = threadBlocked.some(c => normalizedContent === c || normalizedContent.startsWith(c + ' '));
+            if (isBlocked)
+                return '⚠️ 话题中不支持此命令';
+        }
         const isAdmin = !userId || checkOwner(this.config, channel, userId);
         if (normalizedContent.startsWith('/')) {
             const userCommands = ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/s '];
@@ -216,9 +235,18 @@ export class CommandHandler {
         }
         // /stop 命令：中断当前任务
         if (normalizedContent === '/stop') {
-            const sessionKey = `${channel}-${channelId}`;
+            // 话题使用 session.id 作为队列 key，主会话使用 channel-channelId
+            let sessionKey;
+            if (threadId) {
+                const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+                sessionKey = threadSession.id;
+            }
+            else {
+                sessionKey = `${channel}-${channelId}`;
+            }
             const queueLength = this.messageQueue.getQueueLength(sessionKey);
-            if (queueLength === 0) {
+            const hasActive = this.agentRunner.hasActiveStream(sessionKey);
+            if (queueLength === 0 && !hasActive) {
                 return '当前没有正在处理的任务';
             }
             await this.agentRunner.interrupt(sessionKey);
@@ -226,19 +254,19 @@ export class CommandHandler {
         }
         // /clear 命令：通过 SDK /clear 清空会话历史
         if (normalizedContent === '/clear') {
-            const result = await this.ensureSession(channel, channelId);
+            const result = await this.ensureSession(channel, channelId, threadId);
             if ('error' in result)
                 return result.error;
             const { session } = result;
-            if (!session.claudeSessionId) {
+            if (!session.agentSessionId) {
                 return '❌ 当前会话没有历史记录，无需清空';
             }
             const projectPath = path.isAbsolute(session.projectPath)
                 ? session.projectPath
                 : path.resolve(process.cwd(), session.projectPath);
-            const cleared = await this.agentRunner.clearSession(session.claudeSessionId, projectPath);
+            const cleared = await this.agentRunner.clearSession(session.agentSessionId, projectPath);
             if (cleared) {
-                await this.sessionManager.updateClaudeSessionIdBySessionId(session.id, '');
+                await this.sessionManager.updateAgentSessionIdBySessionId(session.id, '');
                 this.agentRunner.updateSessionId(session.id, '');
                 return '✅ 已清空当前会话的对话历史';
             }
@@ -248,11 +276,11 @@ export class CommandHandler {
         }
         // /compact 命令：手动压缩会话上下文
         if (normalizedContent === '/compact') {
-            const result = await this.ensureSession(channel, channelId);
+            const result = await this.ensureSession(channel, channelId, threadId);
             if ('error' in result)
                 return result.error;
             const { session } = result;
-            if (!session.claudeSessionId) {
+            if (!session.agentSessionId) {
                 return '❌ 当前会话没有历史记录，无需压缩';
             }
             const projectPath = path.isAbsolute(session.projectPath)
@@ -261,7 +289,7 @@ export class CommandHandler {
             if (sendMessage) {
                 await sendMessage(channelId, '⏳ 正在压缩会话上下文...');
             }
-            const compacted = await this.agentRunner.compactSession(session.id, session.claudeSessionId, projectPath);
+            const compacted = await this.agentRunner.compactSession(session.id, session.agentSessionId, projectPath);
             if (compacted) {
                 return '✅ 会话上下文已压缩';
             }
@@ -269,8 +297,14 @@ export class CommandHandler {
                 return '❌ 会话压缩失败，请稍后重试';
             }
         }
-        // 尝试获取活跃会话（所有命令都尝试获取，但不强制）
-        let session = await this.sessionManager.getActiveSession(channel, channelId);
+        // 尝试获取活跃会话（话题时直接查找话题 session）
+        let session;
+        if (threadId) {
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+        }
+        else {
+            session = await this.sessionManager.getActiveSession(channel, channelId);
+        }
         // 对于需要创建会话的命令，如果没有会话则创建
         if (!session && (normalizedContent.startsWith('/new') ||
             normalizedContent.startsWith('/bind') ||
@@ -286,11 +320,12 @@ export class CommandHandler {
 
 提示：发送任意消息或使用 /new 命令创建会话`;
             }
-            const sessionKey = `${channel}-${channelId}`;
+            const sessionKey = this.getQueueKey(session, channel, channelId);
             const isCurrentlyProcessing = this.messageQueue.isProcessing(sessionKey);
             const queueLength = this.messageQueue.getQueueLength(sessionKey);
-            let activeStatus = session.isActive ? '✓ 活跃' : '休眠';
-            if (session.isActive && isCurrentlyProcessing) {
+            const isThread = !!session.threadId;
+            let activeStatus = isThread ? '话题' : (session.isActive ? '✓ 活跃' : '休眠');
+            if ((isThread || session.isActive) && isCurrentlyProcessing) {
                 if (queueLength > 0) {
                     activeStatus += ` [处理中，队列${queueLength}条]`;
                 }
@@ -306,8 +341,8 @@ export class CommandHandler {
                     `${Math.floor(timeSinceSuccess / 3600000)}小时前`;
             // 获取会话文件信息并同步 name
             let sessionTurns = 0;
-            if (session.claudeSessionId) {
-                const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.claudeSessionId);
+            if (session.agentSessionId) {
+                const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId);
                 sessionTurns = fileInfo.turns;
                 if (fileInfo.title && fileInfo.title !== session.name) {
                     await this.sessionManager.renameSession(session.id, fileInfo.title);
@@ -316,10 +351,10 @@ export class CommandHandler {
             }
             const lines = [];
             if (isAdmin) {
-                lines.push('📊 会话状态：', `渠道: ${channel} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `活跃状态: ${activeStatus}`, `会话轮数: ${sessionTurns}`, `异常计数: ${health.consecutiveErrors}`, `安全模式: ${health.safeMode ? '是 ⚠️' : '否 ✓'}`, `最后成功: ${timeStr}`, `Claude会话: ${session.claudeSessionId || '(未初始化)'}`, `创建时间: ${new Date(session.createdAt).toLocaleString('zh-CN')}`, `更新时间: ${new Date(session.updatedAt).toLocaleString('zh-CN')}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${channel} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `活跃状态: ${activeStatus}`, `会话轮数: ${sessionTurns}`, `异常计数: ${health.consecutiveErrors}`, `安全模式: ${health.safeMode ? '是 ⚠️' : '否 ✓'}`, `最后成功: ${timeStr}`, `Claude会话: ${session.agentSessionId || '(未初始化)'}`, `创建时间: ${new Date(session.createdAt).toLocaleString('zh-CN')}`, `更新时间: ${new Date(session.updatedAt).toLocaleString('zh-CN')}`);
             }
             else {
-                lines.push('📊 会话状态：', `会话: ${session.name || '(未命名)'}`, `状态: ${activeStatus}`, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `会话: ${session.name || '(未命名)'}`, `状态: ${activeStatus}`, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
             }
             if (health.safeMode) {
                 lines.push('');
@@ -380,10 +415,17 @@ export class CommandHandler {
                     return sessionsWithMessages.join('\n') + '\n再次输入 /restart 将强制重启。';
                 }
             }
+            // 话题中 restart 时保存 rootId 用于重启后回复到话题
+            let rootId;
+            if (threadId) {
+                const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+                rootId = threadSession.metadata?.feishu?.rootId;
+            }
             const restartInfo = {
                 channel,
                 channelId,
-                timestamp: Date.now()
+                timestamp: Date.now(),
+                ...(rootId ? { rootId } : {})
             };
             fs.writeFileSync(path.join(resolvePaths().dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
             const { spawn } = await import('child_process');
@@ -508,7 +550,7 @@ export class CommandHandler {
             }
             const newSession = await this.sessionManager.switchProject(channel, channelId, projectPath);
             const cachedEvents = this.messageCache.getEvents(newSession.id);
-            const hasExistingSession = newSession.claudeSessionId ? '（恢复已有会话）' : '（新建会话）';
+            const hasExistingSession = newSession.agentSessionId ? '（恢复已有会话）' : '（新建会话）';
             let response = `✓ 已切换到项目: ${projectName}\n  路径: ${projectPath}\n  ${hasExistingSession}`;
             if (cachedEvents.length > 0 && sendMessage) {
                 for (const event of cachedEvents) {
@@ -544,7 +586,7 @@ export class CommandHandler {
             }
             const newSession = await this.sessionManager.switchProject(channel, channelId, projectPath);
             const cachedEvents = this.messageCache.getEvents(newSession.id);
-            const hasExistingSession = newSession.claudeSessionId ? '（恢复已有会话）' : '（新建会话）';
+            const hasExistingSession = newSession.agentSessionId ? '（恢复已有会话）' : '（新建会话）';
             let response = `✓ 已绑定项目目录: ${projectPath}\n  ${hasExistingSession}`;
             if (cachedEvents.length > 0) {
                 response += `\n\n后台任务结果:`;
@@ -585,7 +627,7 @@ export class CommandHandler {
                     const sdkName = sdkSession.customTitle || undefined;
                     if (!sdkName)
                         continue;
-                    const dbSession = currentProjectSessions.find(s => s.claudeSessionId === sdkSession.sessionId);
+                    const dbSession = currentProjectSessions.find(s => s.agentSessionId === sdkSession.sessionId);
                     if (dbSession && sdkName !== dbSession.name) {
                         await this.sessionManager.renameSession(dbSession.id, sdkName);
                         dbSession.name = sdkName;
@@ -599,7 +641,7 @@ export class CommandHandler {
             const cliSessions = (isGroup || !isAdmin)
                 ? []
                 : await this.sessionManager.scanCliSessions(session.projectPath);
-            const dbSessionIds = new Set(currentProjectSessions.map(s => s.claudeSessionId).filter(Boolean));
+            const dbSessionIds = new Set(currentProjectSessions.map(s => s.agentSessionId).filter(Boolean));
             const lines = [`当前项目 ${path.basename(session.projectPath)} 的会话列表:\n`];
             const sessionKey = `${channel}-${channelId}`;
             const isProcessing = this.messageQueue.isProcessing(sessionKey);
@@ -608,9 +650,9 @@ export class CommandHandler {
                 for (const s of currentProjectSessions) {
                     const prefix = s.isActive ? '  ✓' : '   ';
                     const name = s.name || '(未命名)';
-                    const uuid = s.claudeSessionId ? `(${s.claudeSessionId.substring(0, 8)})` : '';
+                    const uuid = s.agentSessionId ? `(${s.agentSessionId.substring(0, 8)})` : '';
                     const idleTime = formatIdleTime(Date.now() - s.updatedAt);
-                    if (s.claudeSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.claudeSessionId)) {
+                    if (s.agentSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.agentSessionId)) {
                         lines.push(`${prefix} ❌ ${name} ${uuid} - ${idleTime} [会话文件缺失]`);
                     }
                     else {
@@ -673,8 +715,8 @@ export class CommandHandler {
             if (!targetSession) {
                 return `❌ 会话不存在: ${sessionName}\n使用 /slist 查看可用会话`;
             }
-            const lastInput = targetSession.claudeSessionId
-                ? this.sessionManager.readSessionLastUserMessage(targetSession.projectPath, targetSession.claudeSessionId)
+            const lastInput = targetSession.agentSessionId
+                ? this.sessionManager.readSessionLastUserMessage(targetSession.projectPath, targetSession.agentSessionId)
                 : null;
             const lastInputLine = lastInput ? `\n  最后输入: "${lastInput}"` : '';
             if (!session) {
@@ -711,9 +753,9 @@ export class CommandHandler {
                 return `❌ 会话名称 "${newName}" 已存在，请使用其他名称`;
             }
             // 双写：SDK + 数据库
-            if (session.claudeSessionId) {
+            if (session.agentSessionId) {
                 try {
-                    await sdkRenameSession(session.claudeSessionId, newName, { dir: session.projectPath });
+                    await sdkRenameSession(session.agentSessionId, newName, { dir: session.projectPath });
                 }
                 catch (error) {
                     logger.warn(`[CommandHandler] SDK renameSession failed (continuing with db update):`, error);
@@ -731,11 +773,11 @@ export class CommandHandler {
             if (!session) {
                 return `❌ 当前没有活跃会话，无法分支`;
             }
-            if (!session.claudeSessionId) {
+            if (!session.agentSessionId) {
                 return `❌ 当前会话尚未初始化 Claude 对话，无法分支\n\n请先发送一条消息，然后再使用 /fork`;
             }
             try {
-                const forkResult = await sdkForkSession(session.claudeSessionId, { dir: session.projectPath, title: forkName });
+                const forkResult = await sdkForkSession(session.agentSessionId, { dir: session.projectPath, title: forkName });
                 const newSession = await this.sessionManager.createForkedSession(session, forkResult.sessionId, forkName);
                 return `✅ 会话已分支: ${newSession.name}\n新会话已激活，可以继续对话\n\n使用 /slist 查看所有会话，/s <名称> 切换回原会话`;
             }
@@ -757,7 +799,7 @@ export class CommandHandler {
             const fsPromises = await import('fs/promises');
             try {
                 const backupDir = await backupClaudeDir(session.projectPath);
-                if (!session.claudeSessionId) {
+                if (!session.agentSessionId) {
                     await this.sessionManager.resetHealthStatus(session.id);
                     return `✓ 修复完成，已退出安全模式
 
@@ -768,11 +810,11 @@ export class CommandHandler {
 
 备份位置：${backupDir}`;
                 }
-                const healthCheck = await checkSessionFileHealth(session.projectPath, session.claudeSessionId);
+                const healthCheck = await checkSessionFileHealth(session.projectPath, session.agentSessionId);
                 if (healthCheck.corrupt) {
-                    const sessionFile = path.join(session.projectPath, '.claude', `${session.claudeSessionId}.jsonl`);
+                    const sessionFile = path.join(session.projectPath, '.claude', `${session.agentSessionId}.jsonl`);
                     await fsPromises.unlink(sessionFile);
-                    await this.sessionManager.updateClaudeSessionId(session.channel, session.channelId, '');
+                    await this.sessionManager.updateAgentSessionId(session.channel, session.channelId, '');
                     await this.sessionManager.resetHealthStatus(session.id);
                     return `✓ 修复完成，已退出安全模式