metame-cli 1.5.24 → 1.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "metame-cli",
-    "version": "1.5.24",
+    "version": "1.5.26",
     "description": "The Cognitive Profile Layer for Claude Code. Knows how you think, not just what you said.",
     "main": "index.js",
     "bin": {

package/scripts/daemon-bridges.js

@@ -224,6 +224,21 @@ function createBridgeStarter(deps) {
       },
     });
   }
+
+  function _createPipelineTarget({ pipelineChatId, effectiveChatId, bot }) {
+    const replyChatId = String(pipelineChatId || '').trim();
+    const processChatId = String(effectiveChatId || pipelineChatId || '').trim();
+    if (!replyChatId || !processChatId) {
+      return { processChatId: replyChatId || processChatId, bot };
+    }
+    if (replyChatId === processChatId) {
+      return { processChatId, bot };
+    }
+    return {
+      processChatId,
+      bot: _createTeamProxyBot(bot, replyChatId),
+    };
+  }
   // 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) {
@@ -877,6 +892,13 @@ function createBridgeStarter(deps) {
           // Use pipelineChatId so each topic gets independent sticky state
           const _chatKey = String(pipelineChatId);
           const _rawChatKey = _threadRawChatId(_chatKey);
+          const _topicMainRoute = !!(
+            threadRootId
+            && _parentMapping
+            && !_isQuotedReply
+            && _parentMapping.logicalChatId
+            && !String(_parentMapping.logicalChatId).startsWith('_agent_')
+          );
           const _setSticky = (key) => {
             if (!_st.team_sticky) _st.team_sticky = {};
             _st.team_sticky[_chatKey] = key;
@@ -899,6 +921,11 @@ function createBridgeStarter(deps) {
             saveState(_st);
           };
           let _stickyKey = (_st.team_sticky || {})[_chatKey] || (_st.team_sticky || {})[_rawChatKey] || null;
+          const _pipelineTarget = _createPipelineTarget({
+            pipelineChatId,
+            effectiveChatId: _topicMainRoute ? chatId : pipelineChatId,
+            bot,
+          });
 
           // Team group routing: if bound project has a team array, check message for member nickname
           // Non-/stop slash commands bypass team routing → handled by main project
@@ -978,7 +1005,13 @@ 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(pipelineChatId, trimmedText, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+              await pipeline.processMessage(_pipelineTarget.processChatId, trimmedText, {
+                bot: _pipelineTarget.bot,
+                config: liveCfg,
+                executeTaskByName,
+                senderId: acl.senderId,
+                readOnly: acl.readOnly,
+              });
               return;
             }
             // 1. Explicit nickname → route + set sticky
@@ -1034,7 +1067,13 @@ function createBridgeStarter(deps) {
                     return;
                   }
               try {
-                await pipeline.processMessage(pipelineChatId, rest, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+                await pipeline.processMessage(_pipelineTarget.processChatId, rest, {
+                  bot: _pipelineTarget.bot,
+                  config: liveCfg,
+                  executeTaskByName,
+                  senderId: acl.senderId,
+                  readOnly: acl.readOnly,
+                });
               } catch (e) {
                 log('ERROR', `Team main-route handleCommand failed: ${e.message}`);
                 bot.sendMessage(pipelineChatId, `❌ 执行失败: ${e.message}`).catch(() => {});
@@ -1058,7 +1097,13 @@ function createBridgeStarter(deps) {
           }
 
           try {
-            await pipeline.processMessage(pipelineChatId, text, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+            await pipeline.processMessage(_pipelineTarget.processChatId, text, {
+              bot: _pipelineTarget.bot,
+              config: liveCfg,
+              executeTaskByName,
+              senderId: acl.senderId,
+              readOnly: acl.readOnly,
+            });
           } catch (e) {
             log('ERROR', `Feishu handleCommand failed for ${chatId}: ${e.message}`);
             bot.sendMessage(pipelineChatId, `❌ 命令执行失败: ${e.message}`).catch(() => {});

package/scripts/daemon-command-router.js

@@ -431,7 +431,8 @@ function createCommandRouter(deps) {
         !!curHasEngine &&
         cur.cwd !== projCwd &&
         !rawHasEngine;
-      if (!cur || !curHasEngine || shouldReattachForCwdChange) {
+      const _isControlCmd = text && /^\/(stop|quit)$/.test(text.trim());
+      if (!_isControlCmd && (!cur || !curHasEngine || shouldReattachForCwdChange)) {
         const initReason = !cur ? 'no-session' : (!curHasEngine ? 'engine-missing' : 'cwd-changed');
         log('INFO', `SESSION-INIT [${String(sessionChatId).slice(-32)}] ${initReason}`);
         attachOrCreateSession(sessionChatId, projCwd, proj.name || mappedKey, targetEngine);

package/scripts/daemon-exec-commands.js

@@ -4,6 +4,7 @@ const { classifyTaskUsage } = require('./usage-classifier');
 const { normalizeModel } = require('./daemon-task-scheduler');
 const { resolveEngineModel } = require('./daemon-engine-runtime');
 const { createCommandSessionResolver } = require('./daemon-command-session-route');
+const { isThreadChatId: _isThreadChatId, rawChatId: _rawThreadChatId } = require('./core/thread-chat-id');
 
 function createExecCommandHandler(deps) {
   const {
@@ -218,7 +219,12 @@ function createExecCommandHandler(deps) {
       const _pl = pipeline && pipeline.current;
       if (_pl) {
         _pl.clearQueue(chatId);
-        const stopped = _pl.interruptActive(chatId);
+        let stopped = _pl.interruptActive(chatId);
+        if (!stopped && _isThreadChatId(chatId)) {
+          // Thread-scoped /stop: fall back to raw chatId (task may be keyed at group level).
+          // Do NOT clearQueue(_raw) — that would discard queued tasks from other threads.
+          stopped = _pl.interruptActive(_rawThreadChatId(chatId));
+        }
         if (stopped) {
           await bot.sendMessage(chatId, '⏹ Stopping current engine task...');
         } else {
@@ -226,7 +232,8 @@ function createExecCommandHandler(deps) {
         }
       } else {
         // Fallback: direct activeProcesses manipulation (pipeline not yet initialized)
-        const proc = activeProcesses.get(chatId);
+        const _raw = _isThreadChatId(chatId) ? _rawThreadChatId(chatId) : null;
+        const proc = activeProcesses.get(chatId) || (_raw && activeProcesses.get(_raw));
         if (proc && proc.child) {
           proc.aborted = true;
           const signal = proc.killSignal || 'SIGTERM';
@@ -248,9 +255,12 @@ function createExecCommandHandler(deps) {
       const _pl = pipeline && pipeline.current;
       if (_pl) {
         _pl.clearQueue(chatId);
-        _pl.interruptActive(chatId);
+        if (!_pl.interruptActive(chatId) && _isThreadChatId(chatId)) {
+          _pl.interruptActive(_rawThreadChatId(chatId));
+        }
       } else {
-        const proc = activeProcesses.get(chatId);
+        const _raw = _isThreadChatId(chatId) ? _rawThreadChatId(chatId) : null;
+        const proc = activeProcesses.get(chatId) || (_raw && activeProcesses.get(_raw));
         if (proc && proc.child) {
           proc.aborted = true;
           const signal = proc.killSignal || 'SIGTERM';