metame-cli 1.5.19 → 1.5.20

package/scripts/daemon-bridges.js

@@ -4,9 +4,12 @@ let userAcl = null;
 try { userAcl = require('./daemon-user-acl'); } catch { /* optional */ }
 const { findTeamMember: _findTeamMember } = require('./daemon-team-dispatch');
 const { isRemoteMember } = require('./daemon-remote-dispatch');
+const { buildThreadChatId, rawChatId: _threadRawChatId } = require('./core/thread-chat-id');
 const imessageIO = (() => { try { return require('./daemon-siri-imessage'); } catch { return null; } })();
 const siriBridgeMod = (() => { try { return require('./daemon-siri-bridge'); } catch { return null; } })();
 const weixinBridgeMod = (() => { try { return require('./daemon-weixin-bridge'); } catch { return null; } })();
+const MSG_SESSION_MAX_ENTRIES = 5000;
+const MSG_SESSION_MAX_AGE_MS = 14 * 24 * 60 * 60 * 1000;
 
 function createBridgeStarter(deps) {
   const {
@@ -114,6 +117,20 @@ function createBridgeStarter(deps) {
     return null;
   }
 
+  /**
+   * Extract the topic root message ID (root_id) from a Feishu event.
+   * Returns non-null ONLY for messages inside a Feishu "话题" thread,
+   * NOT for plain quoted replies in conversation mode.
+   */
+  function extractFeishuThreadRootId(event) {
+    const msg = (event && event.message) || (event && event.event && event.event.message);
+    if (!msg) return null;
+    // root_id is set when the message belongs to a topic thread.
+    // In conversation mode, a simple "指定回复" sets parent_id but NOT root_id.
+    const rootId = String(msg.root_id || '').trim();
+    return rootId || null;
+  }
+
   function trackBridgeReplyMapping(messageId, payload = {}) {
     const safeMessageId = String(messageId || '').trim();
     if (!safeMessageId) return;
@@ -122,7 +139,20 @@ function createBridgeStarter(deps) {
     state.msg_sessions[safeMessageId] = {
       ...(state.msg_sessions[safeMessageId] || {}),
       ...payload,
+      touchedAt: Date.now(),
     };
+    const now = Date.now();
+    const entries = Object.entries(state.msg_sessions).filter(([, value]) => {
+      const touchedAt = Number(value && value.touchedAt || 0);
+      return !touchedAt || (now - touchedAt) <= MSG_SESSION_MAX_AGE_MS;
+    });
+    state.msg_sessions = Object.fromEntries(
+      (entries.length > MSG_SESSION_MAX_ENTRIES
+        ? entries
+          .sort((a, b) => Number((a[1] && a[1].touchedAt) || 0) - Number((b[1] && b[1].touchedAt) || 0))
+          .slice(entries.length - MSG_SESSION_MAX_ENTRIES)
+        : entries)
+    );
     saveState(state);
   }
 
@@ -160,10 +190,9 @@ function createBridgeStarter(deps) {
     const map = {
       ...(cfg.telegram  ? cfg.telegram.chat_agent_map  || {} : {}),
       ...(cfg.feishu    ? cfg.feishu.chat_agent_map    || {} : {}),
-      ...(cfg.weixin    ? cfg.weixin.chat_agent_map    || {} : {}),
       ...(cfg.imessage  ? cfg.imessage.chat_agent_map  || {} : {}),
     };
-    const key = map[String(chatId)];
+    const key = map[String(chatId)] || map[_threadRawChatId(chatId)];
     const proj = key && cfg.projects ? cfg.projects[key] : null;
     return { key: key || null, project: proj || null };
   }
@@ -181,9 +210,9 @@ function createBridgeStarter(deps) {
       },
     });
   }
-  // Get team member's working directory using subdir (not worktree).
-  // Creates agents/<key>/ directory and symlinks CLAUDE.md from parent.
-  function _getMemberCwd(parentCwd, key) {
+  // Get team member's working directory inside the source tree, never under ~/.metame.
+  // Creates agents/<key>/ directory by default, or ensures an explicit member.cwd exists.
+  function _getMemberCwd(parentCwd, key, explicitCwd = null) {
     const { existsSync, mkdirSync, symlinkSync, readFileSync, writeFileSync } = require('fs');
     const { execFileSync } = require('child_process');
     const WIN_HIDE = process.platform === 'win32' ? { windowsHide: true } : {};
@@ -194,12 +223,14 @@ function createBridgeStarter(deps) {
       log('WARN', `Sanitized team member key: ${key} -> ${safeKey}`);
     }
 
-    // Use agents/<key>/ as the working directory
+    // Use explicit member cwd when provided, otherwise default to agents/<key>/.
     const agentsDir = path.join(parentCwd, 'agents');
-    const memberDir = path.join(agentsDir, safeKey);
+    const memberDir = explicitCwd
+      ? path.resolve(String(explicitCwd).replace(/^~/, require('os').homedir()))
+      : path.join(agentsDir, safeKey);
 
-    // Create agents directory if not exists
-    if (!existsSync(agentsDir)) {
+    // Create agents directory if using the default layout.
+    if (!explicitCwd && !existsSync(agentsDir)) {
       mkdirSync(agentsDir, { recursive: true });
     }
 
@@ -282,9 +313,11 @@ function createBridgeStarter(deps) {
     const virtualChatId = `_agent_${member.key}`;
     const parentCwd = member.cwd || boundProj.cwd;
     const resolvedParentCwd = parentCwd.replace(/^~/, require('os').homedir());
-    const memberCwd = typeof getOrCreateWorktree === 'function'
-      ? getOrCreateWorktree(resolvedParentCwd, member.key)
-      : _getMemberCwd(resolvedParentCwd, member.key);
+    const memberCwd = _getMemberCwd(
+      resolvedParentCwd,
+      member.key,
+      member.cwd || null,
+    );
     if (!memberCwd) {
       log('ERROR', `Team [${member.key}] cannot start: directory unavailable`);
       bot.sendMessage(realChatId, `❌ ${member.icon || '🤖'} ${member.name} 启动失败：工作目录创建失败`).catch(() => {});
@@ -710,6 +743,13 @@ function createBridgeStarter(deps) {
           return;
         }
 
+        // ── Topic mode detection (before file/text split) ──
+        const threadRootId = extractFeishuThreadRootId(event);
+        const pipelineChatId = threadRootId ? buildThreadChatId(chatId, threadRootId) : chatId;
+        if (threadRootId) {
+          log('INFO', `Feishu topic detected: root=${threadRootId} → pipelineChatId=${pipelineChatId}`);
+        }
+
         if (fileInfo && fileInfo.fileKey) {
           const acl = await applyUserAcl({
             bot,
@@ -721,7 +761,7 @@ function createBridgeStarter(deps) {
           });
           if (acl.blocked) return;
           log('INFO', `Feishu file from ${chatId}: ${fileInfo.fileName} (key: ${fileInfo.fileKey}, msgId: ${fileInfo.messageId}, type: ${fileInfo.msgType})`);
-          const session = getSession(chatId);
+          const session = getSession(pipelineChatId) || getSession(chatId);
           const cwd = session?.cwd || HOME;
           const uploadDir = path.join(cwd, 'upload');
           if (!fs.existsSync(uploadDir)) fs.mkdirSync(uploadDir, { recursive: true });
@@ -729,7 +769,7 @@ function createBridgeStarter(deps) {
 
           try {
             await bot.downloadFile(fileInfo.messageId, fileInfo.fileKey, destPath, fileInfo.msgType);
-            await bot.sendMessage(chatId, `📥 Saved: ${fileInfo.fileName}`);
+            await bot.sendMessage(pipelineChatId, `📥 Saved: ${fileInfo.fileName}`);
 
             const prompt = text
               ? `User uploaded a file to the project: ${destPath}\nUser says: "${text}"`
@@ -737,21 +777,21 @@ function createBridgeStarter(deps) {
 
             // Respect team_sticky: route to active agent same as text messages
             const _stFile = loadState();
-            const _chatKeyFile = String(chatId);
+            const _chatKeyFile = String(pipelineChatId);
             const { project: _boundProjFile } = _getBoundProject(chatId, liveCfg);
             const _stickyKeyFile = (_stFile.team_sticky || {})[_chatKeyFile];
             if (_boundProjFile && Array.isArray(_boundProjFile.team) && _boundProjFile.team.length > 0 && _stickyKeyFile) {
               const _stickyMember = _boundProjFile.team.find(m => m.key === _stickyKeyFile);
               if (_stickyMember) {
                 log('INFO', `Feishu file → sticky route to ${_stickyKeyFile}`);
-                _dispatchToTeamMember(_stickyMember, _boundProjFile, prompt, liveCfg, bot, chatId, executeTaskByName, acl);
+                _dispatchToTeamMember(_stickyMember, _boundProjFile, prompt, liveCfg, bot, pipelineChatId, executeTaskByName, acl);
                 return;
               }
             }
-            await pipeline.processMessage(chatId, prompt, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+            await pipeline.processMessage(pipelineChatId, prompt, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
           } catch (err) {
             log('ERROR', `Feishu file download failed: ${err.message}`);
-            await bot.sendMessage(chatId, `❌ Download failed: ${err.message}`);
+            await bot.sendMessage(pipelineChatId, `❌ Download failed: ${err.message}`);
           }
           return;
         }
@@ -772,10 +812,13 @@ function createBridgeStarter(deps) {
           let _replyMappingFound = false; // true = mapping exists (agentKey may be null = main)
           // Load state once for the entire routing block
           const _st = loadState();
-          if (parentId) {
+          // Quoted reply = explicit parentId but NOT a topic thread (topics always carry parentId=root_id)
+          const _isQuotedReply = !!(parentId && !threadRootId);
+          if (_isQuotedReply) {
             log('INFO', `Feishu reply metadata detected chat=${chatId} parentId=${parentId}`);
           }
-          if (parentId) {
+          // In topic mode, session continuity is handled by pipelineChatId — skip msg_sessions lookup
+          if (_isQuotedReply) {
             const mapped = _st.msg_sessions && _st.msg_sessions[parentId];
             if (mapped) {
               _replyMappingFound = true;
@@ -798,7 +841,8 @@ function createBridgeStarter(deps) {
           }
 
           // Helper: set/clear sticky on shared state object and persist
-          const _chatKey = String(chatId);
+          // Use pipelineChatId so each topic gets independent sticky state
+          const _chatKey = String(pipelineChatId);
           const _setSticky = (key) => {
             if (!_st.team_sticky) _st.team_sticky = {};
             _st.team_sticky[_chatKey] = key;
@@ -842,15 +886,15 @@ function createBridgeStarter(deps) {
                 pipeline.clearQueue(vid);
                 const stopped = pipeline.interruptActive(vid);
                 if (stopped) {
-                  await bot.sendMessage(chatId, `⏹ Stopping ${label}...`);
+                  await bot.sendMessage(pipelineChatId, `⏹ Stopping ${label}...`);
                 } else {
-                  await bot.sendMessage(chatId, `${label} 当前没有活跃任务`);
+                  await bot.sendMessage(pipelineChatId, `${label} 当前没有活跃任务`);
                 }
                 return;
               }
               // /stop <bad-nickname> → no match, report error instead of falling through
               if (_stopArg) {
-                await bot.sendMessage(chatId, `❌ 未找到团队成员: ${_stopArg}`);
+                await bot.sendMessage(pipelineChatId, `❌ 未找到团队成员: ${_stopArg}`);
                 return;
               }
               // Bare /stop, no sticky set → fall through to handleCommand
@@ -861,13 +905,13 @@ function createBridgeStarter(deps) {
             //   a) agentKey = known team member → route to that member (set sticky)
             //   b) agentKey = null, mapping found → user replied to main; clear sticky, route to main
             //   c) parentId present, no mapping  → intent is explicit, avoid sticky; clear sticky, route to main
-            if (parentId) {
+            if (_isQuotedReply) {
               if (_replyAgentKey) {
                 const member = _boundProj.team.find(m => m.key === _replyAgentKey);
                 if (member) {
                   _setSticky(member.key);
                   log('INFO', `Quoted reply → force route to ${_replyAgentKey} (sticky set)`);
-                  _dispatchToTeamMember(member, _boundProj, trimmedText, liveCfg, bot, chatId, executeTaskByName, acl);
+                  _dispatchToTeamMember(member, _boundProj, trimmedText, liveCfg, bot, pipelineChatId, executeTaskByName, acl);
                   return;
                 }
                 // agentKey set but not a current team member → fall through to main
@@ -876,7 +920,7 @@ function createBridgeStarter(deps) {
               // Cases b & c: no agentKey (main agent) or stale/unknown agentKey
               _clearSticky();
               log('INFO', `Quoted reply → route to main (agentKey=${_replyAgentKey} mappingFound=${_replyMappingFound})`);
-              await pipeline.processMessage(chatId, trimmedText, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+              await pipeline.processMessage(pipelineChatId, trimmedText, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
               return;
             }
             // 1. Explicit nickname → route + set sticky
@@ -887,7 +931,7 @@ function createBridgeStarter(deps) {
                   if (!rest) {
                     // Pure nickname, no task — confirm member is online
                     log('INFO', `Sticky set (pure nickname): ${_chatKey.slice(-8)} → ${member.key}`);
-                    bot.sendMarkdown(chatId, `${member.icon || '🤖'} **${member.name}** 在线`)
+                    bot.sendMarkdown(pipelineChatId, `${member.icon || '🤖'} **${member.name}** 在线`)
                       .then((msg) => {
                         if (msg && msg.message_id) {
                           trackBridgeReplyMapping(msg.message_id, inferSessionMapping(`_agent_${member.key}`, {
@@ -901,7 +945,7 @@ function createBridgeStarter(deps) {
                     return;
                   }
                   log('INFO', `Sticky set: ${_chatKey.slice(-8)} → ${member.key}`);
-                  _dispatchToTeamMember(member, _boundProj, rest, liveCfg, bot, chatId, executeTaskByName, acl);
+                  _dispatchToTeamMember(member, _boundProj, rest, liveCfg, bot, pipelineChatId, executeTaskByName, acl);
                   return;
             }
 
@@ -914,7 +958,7 @@ function createBridgeStarter(deps) {
               const rest = trimmedText.slice(_mainMatch.length).replace(/^[\s,，:：]+/, '');
                   log('INFO', `Main nickname → cleared sticky, routing to main${rest ? ` (task: ${rest.slice(0, 30)})` : ''}`);
                   if (!rest) {
-                    bot.sendMarkdown(chatId, `${_boundProj.icon || '🤖'} **${_boundProj.name}** 在线`)
+                    bot.sendMarkdown(pipelineChatId, `${_boundProj.icon || '🤖'} **${_boundProj.name}** 在线`)
                       .then((msg) => {
                         if (msg && msg.message_id) {
                           trackBridgeReplyMapping(msg.message_id, inferSessionMapping(String(chatId), {
@@ -929,10 +973,10 @@ function createBridgeStarter(deps) {
                     return;
                   }
               try {
-                await pipeline.processMessage(chatId, rest, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+                await pipeline.processMessage(pipelineChatId, rest, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
               } catch (e) {
                 log('ERROR', `Team main-route handleCommand failed: ${e.message}`);
-                bot.sendMessage(chatId, `❌ 执行失败: ${e.message}`).catch(() => {});
+                bot.sendMessage(pipelineChatId, `❌ 执行失败: ${e.message}`).catch(() => {});
               }
               return;
             }
@@ -942,7 +986,7 @@ function createBridgeStarter(deps) {
               const member = _boundProj.team.find(m => m.key === _stickyKey);
               if (member) {
                 log('INFO', `Sticky route: → ${_stickyKey}`);
-                _dispatchToTeamMember(member, _boundProj, trimmedText, liveCfg, bot, chatId, executeTaskByName, acl);
+                _dispatchToTeamMember(member, _boundProj, trimmedText, liveCfg, bot, pipelineChatId, executeTaskByName, acl);
                 return;
               }
             }
@@ -950,10 +994,10 @@ function createBridgeStarter(deps) {
           }
 
           try {
-            await pipeline.processMessage(chatId, text, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+            await pipeline.processMessage(pipelineChatId, text, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
           } catch (e) {
             log('ERROR', `Feishu handleCommand failed for ${chatId}: ${e.message}`);
-            bot.sendMessage(chatId, `❌ 命令执行失败: ${e.message}`).catch(() => {});
+            bot.sendMessage(pipelineChatId, `❌ 命令执行失败: ${e.message}`).catch(() => {});
           }
         }
       }, { log: (lvl, msg) => log(lvl, msg) });