metame-cli 1.5.3 → 1.5.5

package/scripts/daemon-admin-commands.js

@@ -7,6 +7,14 @@ const {
 } = require('./usage-classifier');
 const { IS_WIN } = require('./platform');
 const { ENGINE_MODEL_CONFIG, resolveEngineModel } = require('./daemon-engine-runtime');
+const { resolveProjectKey: _resolveProjectKey } = require('./team-dispatch');
+const {
+  parseRemoteTargetRef,
+  getRemoteDispatchStatus,
+  generatePairCode,
+  isValidPairCode,
+  deriveSecretFromPairCode,
+} = require('./daemon-remote-dispatch');
 let mentorEngine = null;
 try { mentorEngine = require('./mentor-engine'); } catch { /* optional */ }
 
@@ -39,26 +47,26 @@ function createAdminCommandHandler(deps) {
     getDistillModel = () => 'haiku',
   } = deps;
 
-  function resolveProjectKey(targetName, projects) {
-    if (!targetName || !projects) return null;
-    for (const [key, proj] of Object.entries(projects || {})) {
-      const nicknames = Array.isArray(proj.nicknames)
-        ? proj.nicknames
-        : (proj.nicknames ? [proj.nicknames] : []);
-      if (key === targetName || nicknames.some(n => n === targetName)) return key;
-
-      // Also search team members (nested projects)
-      if (Array.isArray(proj.team)) {
-        for (const member of proj.team) {
-          const memberNicks = Array.isArray(member.nicknames) ? member.nicknames : [];
-          if (member.key === targetName || memberNicks.some(n => n === targetName)) {
-            // Return full path: parentKey/teamMemberKey
-            return `${key}/${member.key}`;
-          }
-        }
-      }
+  // resolveProjectKey: imported from team-dispatch.js (shared with dispatch_to and daemon.js)
+  const resolveProjectKey = _resolveProjectKey;
+
+  /**
+   * Resolve a target name to { dispatchKey, projInfo }.
+   * resolveProjectKey returns 'parent/member' for team members; this splits
+   * it into the bare dispatch key and looks up the project/member config.
+   */
+  function resolveDispatchTarget(targetName, projects) {
+    const resolved = resolveProjectKey(targetName, projects || {});
+    if (!resolved) return null;
+    if (!resolved.includes('/')) {
+      return { dispatchKey: resolved, projInfo: (projects || {})[resolved] || {} };
     }
-    return null;
+    const [parentKey, memberKey] = resolved.split('/');
+    const parent = (projects || {})[parentKey] || {};
+    const member = Array.isArray(parent.team)
+      ? (parent.team.find(m => m.key === memberKey) || {})
+      : {};
+    return { dispatchKey: memberKey, projInfo: member };
   }
 
   function resolveSenderKey(chatId, config) {
@@ -69,6 +77,14 @@ function createAdminCommandHandler(deps) {
     return map[String(chatId)] || 'user';
   }
 
+  function resolveBoundProjectKey(chatId, config) {
+    const map = {
+      ...(config && config.feishu ? config.feishu.chat_agent_map : {}),
+      ...(config && config.telegram ? config.telegram.chat_agent_map : {}),
+    };
+    return map[String(chatId)] || '';
+  }
+
   function popFlag(input, flagName) {
     const src = String(input || '');
     const re = new RegExp(`(?:^|\\s)--${flagName}\\s+(\\S+)`, 'i');
@@ -97,6 +113,87 @@ function createAdminCommandHandler(deps) {
     };
   }
 
+  function isLikelyTeamTaskResumeIntent(text) {
+    const src = String(text || '').trim();
+    if (!src || src.startsWith('/')) return false;
+    if (src.length < 4 || src.length > 120) return false;
+    if (/(?:新建|创建|查看|列出|列表|详情|状态|有哪些|teamtask\s*$|\/teamtask)/i.test(src)) return false;
+    return /(?:继续(?:做|改|修)?|接着(?:做|改|修)?|续上|接续|返工|复工|再修(?:一下)?|再改(?:一下)?).*(?:上次|那个|这单|这个任务|任务|TeamTask|team task|工单)?|(?:上次|那个|这单|这个任务).*(?:继续|接着|返工|复工|再修|再改)/i.test(src);
+  }
+
+  function listAutoResumeCandidates(chatId, senderKey, config) {
+    if (!taskBoard || typeof taskBoard.listRecentTasks !== 'function') return [];
+    const now = Date.now();
+    const chatKey = String(chatId);
+    const recent = taskBoard.listRecentTasks(12, null, 'team');
+    return recent.filter((task) => {
+      if (!task || task.task_kind !== 'team') return false;
+      if (!config.projects || !config.projects[task.to_agent]) return false;
+      const sourceChatId = String(task.inputs && task.inputs.source_chat_id || '').trim();
+      if (!sourceChatId || sourceChatId !== chatKey) return false;
+      const updatedAt = Date.parse(task.updated_at || task.created_at || '');
+      if (!Number.isFinite(updatedAt) || (now - updatedAt) > 12 * 3600_000) return false;
+      const participants = Array.isArray(task.participants) ? task.participants : [];
+      return task.from_agent === senderKey || participants.includes(senderKey);
+    });
+  }
+
+  function buildTeamTaskResumeEnvelope(task, targetKey, chatId, config) {
+    return taskEnvelope && taskEnvelope.normalizeTaskEnvelope
+      ? taskEnvelope.normalizeTaskEnvelope({
+        ...task,
+        status: 'queued',
+        updated_at: new Date().toISOString(),
+        task_kind: 'team',
+        participants: taskBoard.listScopeParticipants(task.scope_id || task.task_id),
+      }, {
+        from_agent: task.from_agent || resolveSenderKey(chatId, config),
+        to_agent: targetKey,
+        scope_id: task.scope_id || task.task_id,
+      })
+      : {
+        task_id: task.task_id,
+        scope_id: task.scope_id || task.task_id,
+        from_agent: task.from_agent || resolveSenderKey(chatId, config),
+        to_agent: targetKey,
+        participants: taskBoard.listScopeParticipants(task.scope_id || task.task_id),
+        goal: task.goal,
+        definition_of_done: task.definition_of_done || [],
+        inputs: task.inputs || {},
+        artifacts: task.artifacts || [],
+        owned_paths: task.owned_paths || [],
+        priority: task.priority || 'normal',
+        status: 'queued',
+        task_kind: 'team',
+        created_at: task.created_at,
+        updated_at: new Date().toISOString(),
+      };
+  }
+
+  function dispatchTeamTaskResume(task, chatId, config, senderId = null) {
+    const targetKey = task.to_agent;
+    if (!config.projects || !config.projects[targetKey]) {
+      return { success: false, error: `target_missing:${targetKey}` };
+    }
+    const envelope = buildTeamTaskResumeEnvelope(task, targetKey, chatId, config);
+    const result = dispatchTask(targetKey, {
+      from: envelope.from_agent || 'user',
+      type: 'task',
+      priority: envelope.priority || 'normal',
+      payload: {
+        title: envelope.goal.slice(0, 60),
+        prompt: envelope.goal,
+        task_envelope: envelope,
+      },
+      callback: false,
+      new_session: false,
+      source_chat_id: String(chatId),
+      source_sender_key: envelope.from_agent || resolveSenderKey(chatId, config),
+      source_sender_id: String(senderId || '').trim() || '',
+    }, config);
+    return { success: !!(result && result.success), result, envelope, targetKey };
+  }
+
   function formatTaskSchedule(task) {
     const at = typeof task.at === 'string' ? task.at.trim() : '';
     if (at) {
@@ -165,8 +262,30 @@ function createAdminCommandHandler(deps) {
     }
   }
 
+  async function sendLocalDispatchReceipt(bot, chatId, targetKey, projInfo, result, preview) {
+    if (!result || !result.success) return;
+    const icon = projInfo && projInfo.icon ? projInfo.icon : '🤖';
+    const name = projInfo && projInfo.name ? projInfo.name : targetKey;
+    const lines = [
+      '📮 Dispatch 回执',
+      '',
+      `状态: ${icon} ${name} 已接收并入队`,
+    ];
+    if (result.id) lines.push(`编号: ${result.id}`);
+    if (preview) lines.push(`摘要: ${String(preview).slice(0, 120)}`);
+    if (result.task_id) {
+      lines.push('');
+      lines.push(`TeamTask: ${result.task_id}`);
+      if (result.scope_id && result.scope_id !== result.task_id) {
+        lines.push(`Scope: ${result.scope_id}`);
+      }
+      lines.push(`如需复工，请使用: /TeamTask resume ${result.task_id}`);
+    }
+    await bot.sendMessage(chatId, lines.join('\n'));
+  }
+
   async function handleAdminCommand(ctx) {
-    const { bot, chatId, text } = ctx;
+    const { bot, chatId, text, senderId = null } = ctx;
     const state = ctx.state || {};
     let config = ctx.config || {};
 
@@ -366,6 +485,39 @@ function createAdminCommandHandler(deps) {
       return { handled: true, config };
     }
 
+    if (isLikelyTeamTaskResumeIntent(text)) {
+      const senderKey = resolveSenderKey(chatId, config);
+      const candidates = listAutoResumeCandidates(chatId, senderKey, config);
+      if (candidates.length === 1) {
+        const task = candidates[0];
+        const resumed = dispatchTeamTaskResume(task, chatId, config, senderId);
+        if (resumed.success) {
+          if (taskBoard && typeof taskBoard.appendTaskEvent === 'function') {
+            taskBoard.appendTaskEvent(task.task_id, 'task_resume_requested', String(chatId), { by: String(chatId), source: 'nl_auto_resume' });
+          }
+          await bot.sendMessage(chatId, [
+            `🔄 已自动续跑最近的 TeamTask: ${task.task_id}`,
+            `目标: ${task.to_agent}`,
+            `意图: ${text.trim().slice(0, 80)}`,
+            '回执会在目标端真正接收后返回。',
+          ].join('\n'));
+          await sendLocalDispatchReceipt(bot, chatId, resumed.targetKey, config.projects[resumed.targetKey], resumed.result, resumed.envelope.goal);
+          return { handled: true, config };
+        }
+        await bot.sendMessage(chatId, `❌ 自动续跑失败: ${resumed.result && resumed.result.error ? resumed.result.error : 'unknown_error'}`);
+        return { handled: true, config };
+      }
+      if (candidates.length > 1) {
+        const lines = ['⚠️ 检测到你可能想复工 TeamTask，但最近有多条候选任务：'];
+        for (const task of candidates.slice(0, 3)) {
+          lines.push(`- ${task.task_id} [${task.status}] ${task.goal.slice(0, 50)}`);
+        }
+        lines.push('请直接回复更明确一点，或使用 /TeamTask 查看后再选择。');
+        await bot.sendMessage(chatId, lines.join('\n'));
+        return { handled: true, config };
+      }
+    }
+
     // /TeamTask — create/list/detail/resume team collaboration tasks
     const teamTaskCmdMatch = text.match(/^\/teamtask(?:\s+([\s\S]+))?$/i);
     if (teamTaskCmdMatch) {
@@ -430,13 +582,18 @@ function createAdminCommandHandler(deps) {
             task_envelope: envelope,
           },
           callback: false,
+          source_chat_id: String(chatId),
+          source_sender_key: senderKey,
+          source_sender_id: String(senderId || '').trim() || '',
         }, config);
         if (result.success) {
           await bot.sendMessage(chatId, [
-            `✅ 已创建 TeamTask 并派发: ${envelope.task_id}`,
+            `✅ 已创建 TeamTask 并提交派发: ${envelope.task_id}`,
             `Scope: ${envelope.scope_id || envelope.task_id}`,
+            '回执会在目标端真正接收后返回。',
             `查看: /TeamTask ${envelope.task_id}`,
           ].join('\n'));
+          await sendLocalDispatchReceipt(bot, chatId, targetKey, config.projects[targetKey], result, goal);
         } else {
           await bot.sendMessage(chatId, `❌ 创建 TeamTask 失败: ${result.error}`);
         }
@@ -476,52 +633,13 @@ function createAdminCommandHandler(deps) {
           await bot.sendMessage(chatId, `❌ 目标 agent 不存在: ${targetKey}`);
           return { handled: true, config };
         }
-        const envelope = taskEnvelope && taskEnvelope.normalizeTaskEnvelope
-          ? taskEnvelope.normalizeTaskEnvelope({
-            ...task,
-            status: 'queued',
-            updated_at: new Date().toISOString(),
-            task_kind: 'team',
-            participants: taskBoard.listScopeParticipants(task.scope_id || task.task_id),
-          }, {
-            from_agent: task.from_agent || resolveSenderKey(chatId, config),
-            to_agent: targetKey,
-            scope_id: task.scope_id || task.task_id,
-          })
-          : {
-            task_id: task.task_id,
-            scope_id: task.scope_id || task.task_id,
-            from_agent: task.from_agent || resolveSenderKey(chatId, config),
-            to_agent: targetKey,
-            participants: taskBoard.listScopeParticipants(task.scope_id || task.task_id),
-            goal: task.goal,
-            definition_of_done: task.definition_of_done || [],
-            inputs: task.inputs || {},
-            artifacts: task.artifacts || [],
-            owned_paths: task.owned_paths || [],
-            priority: task.priority || 'normal',
-            status: 'queued',
-            task_kind: 'team',
-            created_at: task.created_at,
-            updated_at: new Date().toISOString(),
-          };
-
-        const result = dispatchTask(targetKey, {
-          from: envelope.from_agent || 'user',
-          type: 'task',
-          priority: envelope.priority || 'normal',
-          payload: {
-            title: envelope.goal.slice(0, 60),
-            prompt: envelope.goal,
-            task_envelope: envelope,
-          },
-          callback: false,
-          new_session: false,
-        }, config);
+        const resumed = dispatchTeamTaskResume(task, chatId, config, senderId);
+        const { result, envelope } = resumed;
 
         if (result.success) {
           taskBoard.appendTaskEvent(task.task_id, 'task_resume_requested', String(chatId), { by: String(chatId) });
-          await bot.sendMessage(chatId, `✅ 已续跑 TeamTask: ${task.task_id}`);
+          await bot.sendMessage(chatId, `✅ 已续跑 TeamTask: ${task.task_id}\n回执会在目标端真正接收后返回。`);
+          await sendLocalDispatchReceipt(bot, chatId, targetKey, config.projects[targetKey], result, envelope.goal);
         } else {
           await bot.sendMessage(chatId, `❌ 续跑失败: ${result.error}`);
         }
@@ -622,23 +740,126 @@ function createAdminCommandHandler(deps) {
         return { handled: true, config };
       }
 
+      // /dispatch peers — show remote dispatch config
+      if (args === 'peers') {
+        const rd = getRemoteDispatchStatus(config);
+        if (!rd) {
+          await bot.sendMessage(chatId, '📡 远端 Dispatch 未配置\n\n在 daemon.yaml 中设置 feishu.remote_dispatch 启用。');
+          return { handled: true, config };
+        }
+        let msg = `📡 远端 Dispatch 配置\n─────────────\nself: ${rd.selfPeer}\nrelay chat: ${rd.chatId}\nmode: pair code\nsecret: ${rd.hasSecret ? 'configured' : 'missing'}\n\n远端成员:\n`;
+        let hasRemote = false;
+        for (const [key, proj] of Object.entries(config.projects || {})) {
+          if (!Array.isArray(proj.team)) continue;
+          for (const m of proj.team) {
+            if (m.peer) {
+              hasRemote = true;
+              msg += `- ${m.icon || '🤖'} ${m.name || m.key} → peer:${m.peer} (${key}/${m.key})\n`;
+            }
+          }
+        }
+        if (!hasRemote) msg += '(无远端成员)\n';
+        await bot.sendMessage(chatId, msg.trim());
+        return { handled: true, config };
+      }
+
+      if (args === 'code') {
+        const rd = getRemoteDispatchStatus(config);
+        if (!rd) {
+          await bot.sendMessage(chatId, '📡 远端 Dispatch 未配置\n\n在 daemon.yaml 中设置 feishu.remote_dispatch 启用。');
+          return { handled: true, config };
+        }
+        const code = generatePairCode();
+        const secret = deriveSecretFromPairCode(code, rd.chatId);
+        backupConfig();
+        const cfg = yaml.load(fs.readFileSync(CONFIG_FILE, 'utf8')) || {};
+        if (!cfg.feishu) cfg.feishu = {};
+        if (!cfg.feishu.remote_dispatch) cfg.feishu.remote_dispatch = {};
+        cfg.feishu.remote_dispatch.secret = secret;
+        writeConfigSafe(cfg);
+        config = loadConfig();
+        await bot.sendMessage(chatId, `🔐 配对码已生成\n\n配对码: ${code}\n\n把这 6 位码发到另一台设备执行:\n/dispatch pair ${code}`);
+        return { handled: true, config };
+      }
+
+      const pairMatch = args.match(/^pair\s+(\d{6})$/);
+      if (pairMatch) {
+        const rd = getRemoteDispatchStatus(config);
+        if (!rd) {
+          await bot.sendMessage(chatId, '📡 远端 Dispatch 未配置\n\n在 daemon.yaml 中设置 feishu.remote_dispatch 启用。');
+          return { handled: true, config };
+        }
+        const code = pairMatch[1];
+        if (!isValidPairCode(code)) {
+          await bot.sendMessage(chatId, '❌ 配对码必须是 6 位数字');
+          return { handled: true, config };
+        }
+        const secret = deriveSecretFromPairCode(code, rd.chatId);
+        backupConfig();
+        const cfg = yaml.load(fs.readFileSync(CONFIG_FILE, 'utf8')) || {};
+        if (!cfg.feishu) cfg.feishu = {};
+        if (!cfg.feishu.remote_dispatch) cfg.feishu.remote_dispatch = {};
+        cfg.feishu.remote_dispatch.secret = secret;
+        writeConfigSafe(cfg);
+        config = loadConfig();
+        await bot.sendMessage(chatId, `✅ 配对码已写入\n\n当前设备: ${rd.selfPeer}\nrelay chat: ${rd.chatId}\n现在可以测试 /dispatch to <peer:project> ...`);
+        return { handled: true, config };
+      }
+
       // /dispatch to <agent> <prompt>
       const toMatch = args.match(/^to\s+(\S+)\s+(.+)$/s);
       if (toMatch) {
         const targetName = toMatch[1];
         const prompt = toMatch[2].trim();
+        const senderKey = resolveSenderKey(chatId, config);
 
-        // Resolve target by project key or nickname
-        const targetKey = resolveProjectKey(targetName, config.projects || {});
-        if (!targetKey) {
-          await bot.sendMessage(chatId, `未找到 agent: ${targetName}\n可用: ${Object.keys(config.projects || {}).join(', ')}`);
+        // Check for remote target (peer:project format)
+        const remoteTarget = parseRemoteTargetRef(targetName);
+        if (remoteTarget && deps.sendRemoteDispatch) {
+          const res = await deps.sendRemoteDispatch({
+            type: 'task',
+            to_peer: remoteTarget.peer,
+            target_project: remoteTarget.project,
+            prompt,
+            source_chat_id: String(chatId),
+            source_sender_key: senderKey,
+            source_sender_id: String(senderId || '').trim() || '',
+          }, config);
+          if (res.success) {
+            await bot.sendMessage(chatId, `📡 已发送给 ${remoteTarget.peer}:${remoteTarget.project}`);
+          } else {
+            await bot.sendMessage(chatId, `❌ 远端派发失败: ${res.error}`);
+          }
           return { handled: true, config };
         }
 
-        // Determine sender from current chat's project mapping
-        const senderKey = resolveSenderKey(chatId, config);
+        // Resolve target by project key or nickname (handles team members via compound key)
+        const resolved = resolveDispatchTarget(targetName, config.projects || {});
+        if (!resolved) {
+          await bot.sendMessage(chatId, `未找到 agent: ${targetName}\n可用: ${Object.keys(config.projects || {}).join(', ')}`);
+          return { handled: true, config };
+        }
+        const { dispatchKey: targetKey, projInfo } = resolved;
+
+        // Check if resolved target is a remote team member
+        if (projInfo.peer && deps.sendRemoteDispatch) {
+          const res = await deps.sendRemoteDispatch({
+            type: 'task',
+            to_peer: projInfo.peer,
+            target_project: targetKey,
+            prompt,
+            source_chat_id: String(chatId),
+            source_sender_key: senderKey,
+            source_sender_id: String(senderId || '').trim() || '',
+          }, config);
+          if (res.success) {
+            await bot.sendMessage(chatId, `📡 已发送给 ${projInfo.icon || '🤖'} ${projInfo.name || targetKey} (${projInfo.peer})`);
+          } else {
+            await bot.sendMessage(chatId, `❌ 远端派发失败: ${res.error}`);
+          }
+          return { handled: true, config };
+        }
 
-        const projInfo = config.projects[targetKey] || {};
         // Find the target project's own Feishu chat (reverse lookup of chat_agent_map)
         const feishuChatAgentMap = (config.feishu && config.feishu.chat_agent_map) || {};
         const targetChatId = Object.entries(feishuChatAgentMap).find(([, v]) => v === targetKey)?.[0] || null;
@@ -659,10 +880,14 @@ function createAdminCommandHandler(deps) {
           priority: 'normal',
           payload: { title: prompt.slice(0, 60), prompt },
           callback: false,
+          source_chat_id: String(chatId),
+          source_sender_key: senderKey,
+          source_sender_id: String(senderId || '').trim() || '',
         }, config, replyFn, dispatchStreamOptions);
 
         if (result.success) {
-          await bot.sendMessage(chatId, `✅ 已派发给 ${projInfo.name || targetName}，执行中…`);
+          await bot.sendMessage(chatId, `✅ 已提交派发给 ${projInfo.name || targetName}，等待回执…`);
+          await sendLocalDispatchReceipt(bot, chatId, targetKey, projInfo, result, prompt);
         } else {
           await bot.sendMessage(chatId, `❌ 派发失败: ${result.error}`);
         }
@@ -673,7 +898,11 @@ function createAdminCommandHandler(deps) {
         '用法:',
         '/dispatch status — 查看状态',
         '/dispatch log — 查看记录',
+        '/dispatch peers — 查看远端配置',
+        '/dispatch code — 生成 6 位配对码并写入本机',
+        '/dispatch pair <123456> — 输入 6 位配对码写入本机',
         '/dispatch to <agent> <任务内容> — 直接跨 agent 派发',
+        '/dispatch to <peer:project> <任务内容> — 跨设备派发',
         '/TeamTask create <agent> <目标> [--scope <id>] [--parent <id>] — 创建/续接 TeamTask',
         '/TeamTask — 查看 TeamTask 列表',
       ].join('\n'));
@@ -691,42 +920,30 @@ function createAdminCommandHandler(deps) {
       const targetName = msgMatch[1];
       const message = msgMatch[2].trim();
 
-      // Resolve target - check team members first, then projects
-      let targetKey = null;
+      // Resolve target by nickname or key (handles team members via compound key)
       const senderKey = resolveSenderKey(chatId, config);
-      const senderProj = config.projects ? config.projects[senderKey] : null;
-
-      // Check if sender has a team
-      if (senderProj && Array.isArray(senderProj.team)) {
-        for (const member of senderProj.team) {
-          const nicks = Array.isArray(member.nicknames) ? member.nicknames : [];
-          if (member.key === targetName || nicks.some(n => n === targetName)) {
-            targetKey = member.key;
-            break;
-          }
-        }
-      }
-      // Fall back to project lookup
-      if (!targetKey) {
-        targetKey = resolveProjectKey(targetName, config.projects || {});
-      }
+      const resolved = resolveDispatchTarget(targetName, config.projects || {});
 
-      if (!targetKey) {
+      if (!resolved) {
         await bot.sendMessage(chatId, `未找到 agent: ${targetName}`);
         return { handled: true, config };
       }
+      const { dispatchKey: targetKey, projInfo: toProj } = resolved;
 
-      const toProj = config.projects[targetKey] || {};
       const result = dispatchTask(targetKey, {
         from: senderKey,
         type: 'message',
         priority: 'normal',
         payload: { title: 'team message', prompt: `[来自团队的消息]\n\n${message}` },
         callback: false,
+        source_chat_id: String(chatId),
+        source_sender_key: senderKey,
+        source_sender_id: String(senderId || '').trim() || '',
       }, config, null, null);
 
       if (result.success) {
         await bot.sendMessage(chatId, `📬 已发送消息给 ${toProj.icon || '🤖'} ${toProj.name || targetKey}`);
+        await sendLocalDispatchReceipt(bot, chatId, targetKey, toProj, result, message);
       } else {
         await bot.sendMessage(chatId, `❌ 发送失败: ${result.error}`);
       }
@@ -917,7 +1134,7 @@ function createAdminCommandHandler(deps) {
         const arg = text.slice('/mentor'.length).trim();
 
         if (!arg || arg === 'status') {
-          const status = mentorEngine && typeof mentorEngine.getRuntimeStatus === 'function'
+          const status = mentorCfg.enabled && mentorEngine && typeof mentorEngine.getRuntimeStatus === 'function'
             ? mentorEngine.getRuntimeStatus()
             : { debt_count: 0, cooldown_remaining_ms: 0 };
           const mode = String(mentorCfg.mode || modeFromLevel(mentorCfg.friction_level));
@@ -937,6 +1154,9 @@ function createAdminCommandHandler(deps) {
 
         if (arg === 'on' || arg === 'off') {
           mentorCfg.enabled = arg === 'on';
+          if (!mentorCfg.enabled && mentorEngine && typeof mentorEngine.clearRuntime === 'function') {
+            mentorEngine.clearRuntime();
+          }
           writeConfigSafe(cfg);
           config = loadConfig();
           await bot.sendMessage(chatId, mentorCfg.enabled
@@ -1239,21 +1459,30 @@ function createAdminCommandHandler(deps) {
     // Switching engine auto-syncs: distill model + preferred provider (if available)
     if (text === '/engine' || text.startsWith('/engine ')) {
       const arg = text.slice('/engine'.length).trim().toLowerCase();
+      const boundProjectKey = resolveBoundProjectKey(chatId, config);
+      const boundProject = boundProjectKey && config && config.projects ? config.projects[boundProjectKey] : null;
       if (!arg) {
-        const cur = getDefaultEngine();
-        const curEngineCfg = ENGINE_MODEL_CONFIG[cur] || ENGINE_MODEL_CONFIG.claude;
-        const activeProvider = (cur === 'claude' && providerMod)
+        const cur = boundProject && boundProject.engine ? String(boundProject.engine).trim().toLowerCase() : getDefaultEngine();
+        const safeCur = cur === 'codex' ? 'codex' : 'claude';
+        const curEngineCfg = ENGINE_MODEL_CONFIG[safeCur] || ENGINE_MODEL_CONFIG.claude;
+        const activeProvider = (safeCur === 'claude' && providerMod)
           ? providerMod.getActiveName()
           : curEngineCfg.provider;
         const distill = getDistillModel();
         const daemonCfg = config.daemon || {};
-        const currentModel = resolveEngineModel(cur, daemonCfg);
+        const currentModel = resolveEngineModel(safeCur, daemonCfg, boundProject && boundProject.model);
+        const scopeLine = boundProjectKey
+          ? `📍 当前 chat 绑定 Agent: ${boundProjectKey}`
+          : `📍 当前 chat 使用全局默认引擎`;
         await bot.sendMessage(chatId, [
-          `🔧 引擎: ${cur}  |  Provider: ${activeProvider}`,
+          `🔧 引擎: ${safeCur}  |  Provider: ${activeProvider}`,
           `🤖 会话模型: ${currentModel}  |  后台轻量: ${distill}`,
+          scopeLine,
           '',
           '用法: /engine claude 或 /engine codex',
-          '切换引擎将自动同步 distill model 和首选 provider',
+          boundProjectKey
+            ? '当前 chat 已绑定 Agent；切换时会同步更新该 Agent 的 engine/model'
+            : '切换引擎将自动同步 distill model 和首选 provider',
         ].join('\n'));
         return { handled: true, config };
       }
@@ -1266,13 +1495,29 @@ function createAdminCommandHandler(deps) {
 
       setDefaultEngine(arg); // syncs distill model + providerMod.setEngine (no longer resets session model)
       const distill = getDistillModel();
-      const freshCfg = loadConfig();
+      let freshCfg = loadConfig();
+      if (boundProjectKey && freshCfg && freshCfg.projects && freshCfg.projects[boundProjectKey]) {
+        const nextCfg = JSON.parse(JSON.stringify(freshCfg));
+        nextCfg.projects[boundProjectKey].engine = arg;
+        nextCfg.projects[boundProjectKey].model = resolveEngineModel(arg, nextCfg.daemon || {});
+        writeConfigSafe(nextCfg);
+        freshCfg = loadConfig();
+      }
       const freshDaemon = freshCfg.daemon || {};
-      const syncedModel = resolveEngineModel(arg, freshDaemon);
+      const syncedModel = resolveEngineModel(
+        arg,
+        freshDaemon,
+        boundProjectKey && freshCfg.projects && freshCfg.projects[boundProjectKey]
+          ? freshCfg.projects[boundProjectKey].model
+          : ''
+      );
 
-      // Auto-switch provider if the preferred one exists in providers.yaml
+      // Auto-switch provider only for Claude-compatible routing.
+      // Codex auth is handled by `codex login` / `OPENAI_API_KEY`, not providers.yaml.
       let providerNote = '';
-      if (providerMod && preferredProvider) {
+      if (arg === 'codex') {
+        providerNote = '\n🔌 Codex 认证: 使用 `codex login` 或 OPENAI_API_KEY（/provider 不参与 Codex 路由）';
+      } else if (providerMod && preferredProvider) {
         try {
           providerMod.setActive(preferredProvider);
           providerNote = `\n🔌 Provider 已同步: ${preferredProvider}`;
@@ -1283,8 +1528,11 @@ function createAdminCommandHandler(deps) {
         }
       }
 
-      await bot.sendMessage(chatId, `✅ 引擎已切换: ${arg}\n🤖 会话模型: ${syncedModel}\n🧪 后台轻量模型: ${distill}${providerNote}`);
-      return { handled: true, config };
+      const scopeNote = boundProjectKey
+        ? `\n📍 已同步当前 Agent: ${boundProjectKey}`
+        : '';
+      await bot.sendMessage(chatId, `✅ 引擎已切换: ${arg}\n🤖 会话模型: ${syncedModel}\n🧪 后台轻量模型: ${distill}${scopeNote}${providerNote}`);
+      return { handled: true, config: freshCfg };
     }
 
     // /distill-model [name] — show or update distill model