metame-cli 1.5.2 → 1.5.4

package/scripts/daemon-admin-commands.js

@@ -6,7 +6,9 @@ const {
   USAGE_CATEGORY_LABEL,
 } = require('./usage-classifier');
 const { IS_WIN } = require('./platform');
-const { ENGINE_MODEL_CONFIG } = require('./daemon-engine-runtime');
+const { ENGINE_MODEL_CONFIG, resolveEngineModel } = require('./daemon-engine-runtime');
+const { resolveProjectKey: _resolveProjectKey } = require('./team-dispatch');
+const { parseRemoteTargetRef, normalizeRemoteDispatchConfig } = require('./daemon-remote-dispatch');
 let mentorEngine = null;
 try { mentorEngine = require('./mentor-engine'); } catch { /* optional */ }
 
@@ -39,15 +41,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;
+  // 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) {
@@ -611,23 +624,81 @@ function createAdminCommandHandler(deps) {
         return { handled: true, config };
       }
 
+      // /dispatch peers — show remote dispatch config
+      if (args === 'peers') {
+        const rd = normalizeRemoteDispatchConfig(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}\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 };
+      }
+
       // /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,
+          }, 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,
+          }, 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;
@@ -662,13 +733,52 @@ function createAdminCommandHandler(deps) {
         '用法:',
         '/dispatch status — 查看状态',
         '/dispatch log — 查看记录',
+        '/dispatch peers — 查看远端配置',
         '/dispatch to <agent> <任务内容> — 直接跨 agent 派发',
+        '/dispatch to <peer:project> <任务内容> — 跨设备派发',
         '/TeamTask create <agent> <目标> [--scope <id>] [--parent <id>] — 创建/续接 TeamTask',
         '/TeamTask — 查看 TeamTask 列表',
       ].join('\n'));
       return { handled: true, config };
     }
 
+    // /msg — team internal messaging (like sessions_send)
+    if (text.startsWith('/msg ')) {
+      const args = text.slice('/msg '.length).trim();
+      const msgMatch = args.match(/^(\S+)\s+(.+)$/s);
+      if (!msgMatch) {
+        await bot.sendMessage(chatId, '用法: /msg <agent> <消息内容>\n示例: /msg 甲 帮我看看这个文档');
+        return { handled: true, config };
+      }
+      const targetName = msgMatch[1];
+      const message = msgMatch[2].trim();
+
+      // Resolve target by nickname or key (handles team members via compound key)
+      const senderKey = resolveSenderKey(chatId, config);
+      const resolved = resolveDispatchTarget(targetName, config.projects || {});
+
+      if (!resolved) {
+        await bot.sendMessage(chatId, `未找到 agent: ${targetName}`);
+        return { handled: true, config };
+      }
+      const { dispatchKey: targetKey, projInfo: toProj } = resolved;
+
+      const result = dispatchTask(targetKey, {
+        from: senderKey,
+        type: 'message',
+        priority: 'normal',
+        payload: { title: 'team message', prompt: `[来自团队的消息]\n\n${message}` },
+        callback: false,
+      }, config, null, null);
+
+      if (result.success) {
+        await bot.sendMessage(chatId, `📬 已发送消息给 ${toProj.icon || '🤖'} ${toProj.name || targetKey}`);
+      } else {
+        await bot.sendMessage(chatId, `❌ 发送失败: ${result.error}`);
+      }
+      return { handled: true, config };
+    }
+
     if (text === '/budget') {
       const limit = (config.budget && config.budget.daily_limit) || 50000;
       const used = state.budget.tokens_used;
@@ -676,6 +786,102 @@ function createAdminCommandHandler(deps) {
       return { handled: true, config };
     }
 
+    if (text === '/reset-budget') {
+      if (!state.budget) state.budget = {};
+      state.budget.tokens_used = 0;
+      state.budget.date = new Date().toISOString().slice(0, 10);
+      await bot.sendMessage(chatId, `✅ Budget 已重置 (${state.budget.date})`);
+      return { handled: true, config };
+    }
+
+    if (text === '/toggle' || text.startsWith('/toggle ')) {
+      const arg = text.slice('/toggle'.length).trim();
+      const cfg = config;
+      const tasks = (cfg.heartbeat && cfg.heartbeat.tasks) || [];
+
+      // Group mapping: friendly name → task names
+      const groups = {
+        cognition: ['cognitive-distill', 'self-reflect'],
+        memory: ['memory-extract', 'nightly-reflect', 'memory-gc', 'memory-index'],
+        skill: ['skill-evolve'],
+      };
+
+      if (!arg) {
+        // Show status
+        const lines = ['⚙️ 后台任务开关:'];
+        for (const [group, names] of Object.entries(groups)) {
+          const statuses = names.map(n => {
+            const t = tasks.find(t2 => t2.name === n);
+            return t ? (t.enabled !== false ? '✅' : '❌') : '⚠️';
+          });
+          const allOn = statuses.every(s => s === '✅');
+          const allOff = statuses.every(s => s === '❌');
+          lines.push(`  ${allOn ? '✅' : allOff ? '❌' : '⚠️'} ${group}`);
+        }
+        lines.push('', '用法: /toggle <cognition|memory|skill> <on|off>');
+        await bot.sendMessage(chatId, lines.join('\n'));
+        return { handled: true, config };
+      }
+
+      const parts = arg.split(/\s+/);
+      const groupName = parts[0];
+      const action = parts[1];
+
+      if (!groups[groupName]) {
+        await bot.sendMessage(chatId, `未知分组: ${groupName}\n可选: cognition, memory, skill`);
+        return { handled: true, config };
+      }
+      if (action !== 'on' && action !== 'off') {
+        await bot.sendMessage(chatId, `用法: /toggle ${groupName} <on|off>`);
+        return { handled: true, config };
+      }
+
+      const enabled = action === 'on';
+      const affected = [];
+      for (const name of groups[groupName]) {
+        const t = tasks.find(t2 => t2.name === name);
+        if (t) {
+          t.enabled = enabled;
+          affected.push(name);
+        }
+      }
+      if (affected.length === 0) {
+        await bot.sendMessage(chatId, `⚠️ 未找到 ${groupName} 相关任务，请检查 heartbeat 配置`);
+        return { handled: true, config };
+      }
+      writeConfigSafe(cfg);
+      config = loadConfig();
+      await bot.sendMessage(chatId, `${enabled ? '✅' : '❌'} ${groupName} ${enabled ? 'ON' : 'OFF'} (${affected.join(', ')})`);
+      return { handled: true, config };
+    }
+
+    // /broadcast [on|off] — toggle team broadcast for the current chat's bound project
+    if (text === '/broadcast' || text.startsWith('/broadcast ')) {
+      const arg = text.slice('/broadcast'.length).trim();
+      const cfg = config;
+      const feishuMap = { ...(cfg.feishu ? cfg.feishu.chat_agent_map : {}), ...(cfg.telegram ? cfg.telegram.chat_agent_map : {}) };
+      const boundKey = feishuMap[String(chatId)];
+      const boundProj = boundKey && cfg.projects ? cfg.projects[boundKey] : null;
+      if (!boundProj || !Array.isArray(boundProj.team) || boundProj.team.length === 0) {
+        await bot.sendMessage(chatId, '⚠️ 当前群没有绑定 team 项目');
+        return { handled: true, config };
+      }
+      if (!arg) {
+        const status = boundProj.broadcast ? '✅ ON' : '❌ OFF';
+        await bot.sendMessage(chatId, `📢 团队广播: ${status}\n\n用法: /broadcast on|off\n开启后 team 成员间的传话会在群里可见`);
+        return { handled: true, config };
+      }
+      if (arg !== 'on' && arg !== 'off') {
+        await bot.sendMessage(chatId, '用法: /broadcast on|off');
+        return { handled: true, config };
+      }
+      cfg.projects[boundKey].broadcast = arg === 'on';
+      writeConfigSafe(cfg);
+      config = loadConfig();
+      await bot.sendMessage(chatId, `📢 团队广播已${arg === 'on' ? '开启' : '关闭'}`);
+      return { handled: true, config };
+    }
+
     if (text === '/usage' || text.startsWith('/usage ')) {
       const arg = text.slice('/usage'.length).trim() || 'today';
       const usage = state.usage || {};
@@ -999,9 +1205,7 @@ function createAdminCommandHandler(deps) {
       );
       const optionValues = optionEntries.map(o => o.value);
       const daemonCfg = config.daemon || {};
-      const currentModel = (daemonCfg.models && daemonCfg.models[currentEngine])
-        || daemonCfg.model   // legacy fallback
-        || engineCfg.main;
+      const currentModel = resolveEngineModel(currentEngine, daemonCfg);
       // providerMod manages Claude providers only — for codex use engineCfg.provider
       const activeProvider = (currentEngine === 'claude' && providerMod)
         ? providerMod.getActiveName()
@@ -1089,8 +1293,7 @@ function createAdminCommandHandler(deps) {
           : curEngineCfg.provider;
         const distill = getDistillModel();
         const daemonCfg = config.daemon || {};
-        const currentModel = (daemonCfg.models && daemonCfg.models[cur])
-          || daemonCfg.model || curEngineCfg.main;
+        const currentModel = resolveEngineModel(cur, daemonCfg);
         await bot.sendMessage(chatId, [
           `🔧 引擎: ${cur}  |  Provider: ${activeProvider}`,
           `🤖 会话模型: ${currentModel}  |  后台轻量: ${distill}`,
@@ -1111,9 +1314,7 @@ function createAdminCommandHandler(deps) {
       const distill = getDistillModel();
       const freshCfg = loadConfig();
       const freshDaemon = freshCfg.daemon || {};
-      const targetEngineCfg = ENGINE_MODEL_CONFIG[arg] || ENGINE_MODEL_CONFIG.claude;
-      const syncedModel = (freshDaemon.models && freshDaemon.models[arg])
-        || freshDaemon.model || targetEngineCfg.main;
+      const syncedModel = resolveEngineModel(arg, freshDaemon);
 
       // Auto-switch provider if the preferred one exists in providers.yaml
       let providerNote = '';

package/scripts/daemon-agent-commands.js

@@ -21,7 +21,11 @@ function createAgentCommandHandler(deps) {
     getSessionRecentContext,
     pendingBinds,
     pendingAgentFlows,
+    pendingTeamFlows,
     pendingActivations,
+    writeConfigSafe,
+    backupConfig,
+    execSync,
     doBindAgent,
     mergeAgentRole,
     agentTools,
@@ -244,12 +248,36 @@ function createAgentCommandHandler(deps) {
     const config = ctx.config || {};
     const text = ctx.text || '';
 
+    // /cancel — 取消任何挂起的向导流
+    if (text === '/cancel') {
+      let cancelled = false;
+      if (pendingTeamFlows && pendingTeamFlows.has(String(chatId))) {
+        pendingTeamFlows.delete(String(chatId));
+        cancelled = true;
+      }
+      if (pendingAgentFlows && pendingAgentFlows.has(String(chatId))) {
+        pendingAgentFlows.delete(String(chatId));
+        cancelled = true;
+      }
+      if (pendingBinds && pendingBinds.has(String(chatId))) {
+        pendingBinds.delete(String(chatId));
+        cancelled = true;
+      }
+      await bot.sendMessage(chatId, cancelled ? '✅ 已取消当前操作' : '没有进行中的操作');
+      return true;
+    }
+
     if (text === '/resume' || text.startsWith('/resume ')) {
       const arg = text.slice(7).trim();
 
-      // Get current workdir to scope session list
+      // Get current workdir to scope session list — prefer bound project cwd over session cwd
+      const cfgForResume = loadConfig();
+      const chatAgentMapForResume = { ...(cfgForResume.telegram ? cfgForResume.telegram.chat_agent_map : {}), ...(cfgForResume.feishu ? cfgForResume.feishu.chat_agent_map : {}) };
+      const boundKeyForResume = chatAgentMapForResume[String(chatId)];
+      const boundProjForResume = boundKeyForResume && cfgForResume.projects ? cfgForResume.projects[boundKeyForResume] : null;
+      const boundCwdForResume = (boundProjForResume && boundProjForResume.cwd) ? normalizeCwd(boundProjForResume.cwd) : null;
       const curSession = getSession(chatId);
-      const curCwd = curSession ? curSession.cwd : null;
+      const curCwd = boundCwdForResume || (curSession ? curSession.cwd : null);
       const recentSessions = listRecentSessions(5, curCwd);
 
       if (!arg) {
@@ -297,13 +325,17 @@ function createAgentCommandHandler(deps) {
 
       const state2 = loadState();
       const cfgForEngine = loadConfig();
-      const engineByTargetCwd = inferEngineByCwd(cfgForEngine, cwd);
-      const currentEngine = normalizeEngineName(state2.sessions[chatId] && state2.sessions[chatId].engine);
-      state2.sessions[chatId] = {
-        id: sessionId,
+      const engineByTargetCwd = inferEngineByCwd(cfgForEngine, cwd) || getDefaultEngine();
+      // For bound chats, write session to virtual chatId (_agent_{key}) so askClaude picks it up
+      const resumeChatAgentMap = { ...(cfgForEngine.telegram ? cfgForEngine.telegram.chat_agent_map : {}), ...(cfgForEngine.feishu ? cfgForEngine.feishu.chat_agent_map : {}) };
+      const resumeBoundKey = resumeChatAgentMap[String(chatId)];
+      const sessionKey = resumeBoundKey ? `_agent_${resumeBoundKey}` : String(chatId);
+      const existing = state2.sessions[sessionKey] || {};
+      const existingEngines = existing.engines || {};
+      state2.sessions[sessionKey] = {
+        ...existing,
         cwd,
-        started: true,
-        engine: engineByTargetCwd || currentEngine,
+        engines: { ...existingEngines, [engineByTargetCwd]: { id: sessionId, started: true } },
       };
       saveState(state2);
       const name = fullMatch.customTitle;
@@ -332,6 +364,93 @@ function createAgentCommandHandler(deps) {
 
     // wizard state machine removed — use natural language to create agents
 
+    // /agent new 多步向导状态机（name/desc 步骤）
+    if (pendingAgentFlows) {
+      const flow = pendingAgentFlows.get(String(chatId));
+      if (flow && text && !text.startsWith('/')) {
+        if (flow.step === 'name') {
+          flow.name = text.trim();
+          flow.step = 'desc';
+          pendingAgentFlows.set(String(chatId), flow);
+          await bot.sendMessage(chatId, `好的，Agent 名称是「${flow.name}」\n\n步骤3/3：请描述这个 Agent 的角色和职责（用自然语言）：`);
+          return true;
+        }
+        if (flow.step === 'desc') {
+          pendingAgentFlows.delete(String(chatId));
+          const { dir, name, isClone, parentCwd } = flow;
+          const description = text.trim();
+          await bot.sendMessage(chatId, `⏳ 正在配置 Agent「${name}」，稍等...`);
+          try {
+            await doBindAgent(bot, chatId, name, dir);
+            const mergeResult = await mergeAgentRole(dir, description, isClone, parentCwd);
+            if (mergeResult && mergeResult.error) {
+              await bot.sendMessage(chatId, `⚠️ CLAUDE.md 合并失败: ${mergeResult.error}，其他配置已保存`);
+            } else if (mergeResult && mergeResult.symlinked) {
+              await bot.sendMessage(chatId, `🔗 CLAUDE.md 已链接到父 Agent（分身模式）\n✅ Agent「${name}」创建完成`);
+            } else if (mergeResult && mergeResult.created) {
+              await bot.sendMessage(chatId, `📝 已创建 CLAUDE.md\n✅ Agent「${name}」创建完成`);
+            } else {
+              await bot.sendMessage(chatId, `📝 已更新 CLAUDE.md\n✅ Agent「${name}」创建完成`);
+            }
+          } catch (e) {
+            await bot.sendMessage(chatId, `❌ 创建 Agent 失败: ${e.message}`);
+          }
+          return true;
+        }
+      }
+    }
+
+    // /agent new team 多步向导状态机
+    if (pendingTeamFlows) {
+      const teamFlow = pendingTeamFlows.get(String(chatId));
+      if (teamFlow && text && !text.startsWith('/')) {
+        if (teamFlow.step === 'name') {
+          teamFlow.name = text.trim();
+          teamFlow.step = 'members';
+          pendingTeamFlows.set(String(chatId), teamFlow);
+          await bot.sendMessage(chatId, `团队名称：「${teamFlow.name}」
+
+请输入成员列表，格式：
+名称:icon:颜色
+
+可用颜色：green, yellow, red, blue, purple, orange, pink, indigo
+
+示例：
+编剧:✍️:green, 审核:🔍:yellow, 推广:📢:red
+
+一行一个成员，或用逗号分隔多个`);
+          return true;
+        }
+
+        if (teamFlow.step === 'members') {
+          const validColors = ['green', 'yellow', 'red', 'blue', 'purple', 'orange', 'pink', 'indigo'];
+          const memberLines = text.split(/[,，\n]/).filter(l => l.trim());
+          const members = [];
+          for (const line of memberLines) {
+            const parts = line.trim().split(':');
+            const name = parts[0] && parts[0].trim();
+            const icon = (parts[1] && parts[1].trim()) || '🤖';
+            const rawColor = parts[2] && parts[2].trim().toLowerCase();
+            const color = validColors.includes(rawColor) ? rawColor : validColors[members.length % validColors.length];
+            if (name) {
+              members.push({ key: name, name: `${teamFlow.name} · ${name}`, icon, color, nicknames: [name] });
+            }
+          }
+          if (members.length === 0) {
+            await bot.sendMessage(chatId, '⚠️ 请至少添加一个成员，格式：名称:icon:颜色');
+            return true;
+          }
+          teamFlow.members = members;
+          teamFlow.step = 'cwd';
+          pendingTeamFlows.set(String(chatId), teamFlow);
+          const memberList = members.map(m => `${m.icon} ${m.name} (${m.color})`).join('\n');
+          await bot.sendMessage(chatId, `✅ 成员配置：\n\n${memberList}\n\n正在选择父目录...`);
+          await sendBrowse(bot, chatId, 'team-new', HOME, `为「${teamFlow.name}」选择父工作目录`);
+          return true;
+        }
+      }
+    }
+
     // /agent edit wait-input flow (kept for command compatibility)
     {
       const editFlow = getFreshFlow(String(chatId) + ':edit');
@@ -354,6 +473,41 @@ function createAgentCommandHandler(deps) {
       const agentParts = agentArg.split(/\s+/).filter(Boolean);
       const agentSub = agentParts[0] || ''; // bind / list / new / edit / reset / unbind / ''
 
+      // /agent new [team] — 创建新 Agent 或团队
+      if (agentSub === 'new') {
+        const secondArg = agentParts[1];
+        if (secondArg === 'team') {
+          if (!pendingTeamFlows) {
+            await bot.sendMessage(chatId, '❌ 团队向导暂不可用');
+            return true;
+          }
+          pendingTeamFlows.set(String(chatId), { step: 'name' });
+          await bot.sendMessage(chatId, `🏗️ **团队创建向导**
+
+请输入团队名称（如：短剧团队、销售团队）：
+
+输入 /cancel 可取消`);
+          return true;
+        }
+        // /agent new clone — 分身模式
+        const isClone = secondArg === 'clone';
+        let parentCwd = null;
+        if (isClone) {
+          const cfg = loadConfig();
+          const agentMap = {
+            ...(cfg.telegram ? cfg.telegram.chat_agent_map : {}),
+            ...(cfg.feishu ? cfg.feishu.chat_agent_map : {}),
+          };
+          const boundKey = agentMap[String(chatId)];
+          const boundProj = boundKey && cfg.projects && cfg.projects[boundKey];
+          if (boundProj && boundProj.cwd) parentCwd = normalizeCwd(boundProj.cwd);
+        }
+        pendingAgentFlows.set(String(chatId), { step: 'dir', isClone, parentCwd, __ts: Date.now() });
+        const hint = isClone ? `（${parentCwd ? '分身模式：将链接父 Agent 的 CLAUDE.md' : '⚠️ 当前群未绑定 Agent'})` : '';
+        await sendBrowse(bot, chatId, 'agent-new', HOME, `步骤1/3：选择 Agent 的工作目录${hint}`);
+        return true;
+      }
+
       // /agent bind <名称> [目录]
       if (agentSub === 'bind') {
         const bindName = agentParts[1];
@@ -635,6 +789,23 @@ function createAgentCommandHandler(deps) {
       return true;
     }
 
+    // /agent-dir <path>: /agent new 向导的目录选择回调（步骤1→步骤2）
+    if (text.startsWith('/agent-dir ')) {
+      const dirPath = expandPath(text.slice(11).trim());
+      const flow = pendingAgentFlows && pendingAgentFlows.get(String(chatId));
+      if (!flow || flow.step !== 'dir') {
+        await bot.sendMessage(chatId, '❌ 没有待完成的 /agent new，请重新发送 /agent new');
+        return true;
+      }
+      flow.dir = dirPath;
+      flow.step = 'name';
+      pendingAgentFlows.set(String(chatId), flow);
+      const displayPath = dirPath.replace(HOME, '~');
+      const cloneHint = flow.isClone ? '（分身模式）' : '';
+      await bot.sendMessage(chatId, `✓ 已选择目录：${displayPath}${cloneHint}\n\n步骤2/3：给这个 Agent 起个名字？`);
+      return true;
+    }
+
     // /agent-bind-dir <path>: internal callback for bind picker
     if (text.startsWith('/agent-bind-dir ')) {
       const dirPath = expandPath(text.slice(16).trim());
@@ -648,6 +819,90 @@ function createAgentCommandHandler(deps) {
       return true;
     }
 
+    // /agent-team-dir <path>: directory picker callback for team creation
+    if (text.startsWith('/agent-team-dir ')) {
+      const dirPath = expandPath(text.slice(16).trim());
+      const teamFlow = pendingTeamFlows && pendingTeamFlows.get(String(chatId));
+      if (!teamFlow || teamFlow.step !== 'cwd') {
+        await bot.sendMessage(chatId, '❌ 没有待完成的团队创建，请重新发送 /agent new team');
+        return true;
+      }
+      teamFlow.step = 'creating';
+      pendingTeamFlows.set(String(chatId), teamFlow);
+      await bot.sendMessage(chatId, `⏳ 正在创建团队「${teamFlow.name}」...`);
+
+      try {
+        const teamDir = path.join(dirPath, 'team');
+        if (!fs.existsSync(teamDir)) fs.mkdirSync(teamDir, { recursive: true });
+
+        const members = Array.isArray(teamFlow.members) ? teamFlow.members : [];
+        const results = [];
+        for (const member of members) {
+          const memberDir = path.join(teamDir, member.key);
+          if (!fs.existsSync(memberDir)) fs.mkdirSync(memberDir, { recursive: true });
+          const claudeMdPath = path.join(memberDir, 'CLAUDE.md');
+          if (!fs.existsSync(claudeMdPath)) {
+            fs.writeFileSync(claudeMdPath, `# ${member.name}\n\n（团队成员：${teamFlow.name}）\n`, 'utf8');
+          }
+          // Init git repo for checkpoint support
+          try {
+            if (execSync) execSync('git init -q', { cwd: memberDir, stdio: 'ignore' });
+          } catch { /* non-critical */ }
+          results.push(`✅ ${member.icon} ${member.key}: ${memberDir.replace(HOME, '~')}`);
+        }
+
+        // Register in daemon.yaml under parent project's team array
+        const cfg = loadConfig();
+        let parentProjectKey = null;
+        if (cfg.projects) {
+          for (const [projKey, proj] of Object.entries(cfg.projects)) {
+            if (normalizeCwd(proj.cwd || '') === normalizeCwd(dirPath)) {
+              parentProjectKey = projKey;
+              break;
+            }
+          }
+        }
+
+        if (parentProjectKey && cfg.projects[parentProjectKey]) {
+          const proj = cfg.projects[parentProjectKey];
+          if (!proj.team) proj.team = [];
+          for (const member of members) {
+            if (!proj.team.some(m => m.key === member.key)) {
+              proj.team.push({
+                key: member.key,
+                name: member.name,
+                icon: member.icon,
+                color: member.color,
+                cwd: path.join(teamDir, member.key),
+                nicknames: member.nicknames,
+              });
+            }
+          }
+          if (writeConfigSafe) writeConfigSafe(cfg);
+          if (backupConfig) backupConfig();
+        }
+
+        const memberList = members.map(m => `${m.icon} ${m.key}`).join('  |  ');
+        const yamlNote = parentProjectKey
+          ? `📝 已更新 daemon.yaml：${parentProjectKey}.team`
+          : '⚠️ 未找到父项目，请手动在 daemon.yaml 中注册 team 段';
+        await bot.sendMessage(chatId, `🎉 **团队创建完成！**
+
+**${teamFlow.name}**
+${memberList}
+
+📁 目录：${teamDir.replace(HOME, '~')}/
+${yamlNote}
+
+💡 发 \`/agent\` 可切换到成员对话`);
+      } catch (e) {
+        await bot.sendMessage(chatId, `❌ 创建失败: ${e.message}`);
+      }
+
+      pendingTeamFlows.delete(String(chatId));
+      return true;
+    }
+
     return false;
   }