metame-cli 1.5.21 → 1.5.23

package/scripts/daemon-agent-commands.js

@@ -1,6 +1,23 @@
 'use strict';
 
 const { normalizeEngineName: _normalizeEngine } = require('./daemon-utils');
+const {
+  getBoundProject,
+  createWorkspaceAgent,
+  bindAgentToChat,
+  editAgentRole,
+  listAgents,
+  unbindAgent,
+  handleActivateCommand,
+} = require('./daemon-agent-workflow');
+const {
+  startNewAgentWizard,
+  completeAgentCreation,
+  readAgentRolePreview,
+  resetAgentRoleSection,
+  handleSoulCommand,
+} = require('./daemon-agent-lifecycle');
+const { parseTeamMembers, createTeamWorkspace } = require('./daemon-team-workflow');
 
 function createAgentCommandHandler(deps) {
   const {
@@ -22,6 +39,7 @@ function createAgentCommandHandler(deps) {
     loadSessionTags,
     sessionRichLabel,
     getSessionRecentContext,
+    getSessionRecentDialogue,
     pendingBinds,
     pendingAgentFlows,
     pendingTeamFlows,
@@ -163,21 +181,6 @@ function createAgentCommandHandler(deps) {
     return true;
   }
 
-  // Pending activations have no TTL — they persist until consumed.
-  // The creating chatId is stored to prevent self-activation.
-
-  // Returns the latest pending activation, excluding the creating chat
-  function getLatestActivationForChat(chatId) {
-    if (!pendingActivations || pendingActivations.size === 0) return null;
-    const cid = String(chatId);
-    let latest = null;
-    for (const rec of pendingActivations.values()) {
-      if (rec.createdByChatId === cid) continue; // creating chat cannot self-activate
-      if (!latest || rec.createdAt > latest.createdAt) latest = rec;
-    }
-    return latest;
-  }
-
   function resolveTtl(valueOrGetter, fallbackMs) {
     const raw = typeof valueOrGetter === 'function' ? valueOrGetter() : valueOrGetter;
     const num = Number(raw);
@@ -206,6 +209,29 @@ function createAgentCommandHandler(deps) {
     pendingAgentFlows.set(flowKey, { ...flow, __ts: Date.now() });
   }
 
+  function getFreshTimedFlow(flowMap, flowKey) {
+    if (!flowMap) return null;
+    const flow = flowMap.get(flowKey);
+    if (!flow) return null;
+    const FLOW_TTL_MS = resolveTtl(agentFlowTtlMs, 10 * 60 * 1000);
+    const ts = Number(flow.__ts || 0);
+    if (!(ts > 0) && flow && typeof flow === 'object') {
+      const stamped = { ...flow, __ts: Date.now() };
+      flowMap.set(flowKey, stamped);
+      return stamped;
+    }
+    if (ts > 0 && (Date.now() - ts) > FLOW_TTL_MS) {
+      flowMap.delete(flowKey);
+      return null;
+    }
+    return flow;
+  }
+
+  function setTimedFlow(flowMap, flowKey, flow) {
+    if (!flowMap) return;
+    flowMap.set(flowKey, { ...flow, __ts: Date.now() });
+  }
+
   function setPendingBind(chatKey, agentName) {
     pendingBinds.set(chatKey, { name: agentName, __ts: Date.now() });
   }
@@ -229,101 +255,31 @@ function createAgentCommandHandler(deps) {
     return raw.name || null;
   }
 
-  function getBoundProject(chatId, cfg) {
-    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];
-    return { boundKey: boundKey || null, boundProj: boundProj || null };
-  }
-
   async function bindViaUnifiedApi(bot, chatId, agentName, agentCwd) {
-    if (agentTools && typeof agentTools.bindAgentToChat === 'function') {
-      const res = await agentTools.bindAgentToChat(chatId, agentName, agentCwd);
-      if (!res.ok) {
-        await bot.sendMessage(chatId, `❌ 绑定失败: ${res.error}`);
-        return { ok: false };
-      }
-      const p = res.data.project || {};
-      const icon = p.icon || '🤖';
-      const action = res.data.isNewProject ? '绑定成功' : '重新绑定';
-      const displayCwd = String(res.data.cwd || '').replace(HOME, '~');
-      if (res.data.cwd && typeof attachOrCreateSession === 'function') {
-        attachOrCreateSession(
-          chatId,
-          normalizeCwd(res.data.cwd),
-          p.name || agentName || res.data.projectKey || '',
-          p.engine || getDefaultEngine()
-        );
-      }
-      await bot.sendMessage(chatId, `${icon} ${p.name || agentName} ${action}\n目录: ${displayCwd}`);
-      return { ok: true, data: res.data };
-    }
-
-    // Backward-compatible fallback
-    const fallback = await doBindAgent(bot, chatId, agentName, agentCwd);
-    if (!fallback || fallback.ok === false) {
-      return { ok: false, error: (fallback && fallback.error) || 'bind failed' };
-    }
-    const fallbackCwd = (fallback.data && fallback.data.cwd) || agentCwd;
-    if (fallbackCwd && typeof attachOrCreateSession === 'function') {
-      attachOrCreateSession(chatId, normalizeCwd(fallbackCwd), agentName || '', getDefaultEngine());
-    }
-    return {
-      ok: true,
-      data: {
-        cwd: fallbackCwd,
-        projectKey: fallback && fallback.data ? fallback.data.projectKey : null,
-        project: fallback && fallback.data ? fallback.data.project : null,
-      },
-    };
-  }
-
-  async function editRoleViaUnifiedApi(workspaceDir, deltaText) {
-    if (agentTools && typeof agentTools.editAgentRoleDefinition === 'function') {
-      return agentTools.editAgentRoleDefinition(workspaceDir, deltaText);
-    }
-    const legacy = await mergeAgentRole(workspaceDir, deltaText);
-    if (legacy.error) return { ok: false, error: legacy.error };
-    return { ok: true, data: legacy };
+    return bindAgentToChat({
+      agentTools,
+      doBindAgent,
+      bot,
+      chatId,
+      agentName,
+      agentCwd,
+      HOME,
+      attachOrCreateSession,
+      normalizeCwd,
+      getDefaultEngine,
+    });
   }
 
   async function listAgentsViaUnifiedApi(chatId) {
-    if (agentTools && typeof agentTools.listAllAgents === 'function') {
-      return agentTools.listAllAgents(chatId);
-    }
-
-    const cfg = loadConfig();
-    const projects = cfg.projects || {};
-    const entries = Object.entries(projects)
-      .filter(([, p]) => p && p.cwd)
-      .map(([key, p]) => ({
-        key,
-        name: p.name || key,
-        cwd: p.cwd,
-        icon: p.icon || '🤖',
-      }));
-    const { boundKey } = getBoundProject(chatId, cfg);
-    return { ok: true, data: { agents: entries, boundKey } };
+    return listAgents({ agentTools, chatId, loadConfig });
   }
 
   async function unbindViaUnifiedApi(chatId) {
-    if (agentTools && typeof agentTools.unbindCurrentAgent === 'function') {
-      return agentTools.unbindCurrentAgent(chatId);
-    }
+    return unbindAgent({ agentTools, chatId, loadConfig, writeConfigSafe, backupConfig });
+  }
 
-    const cfg = loadConfig();
-    const isTg = typeof chatId === 'number';
-    const ak = isTg ? 'telegram' : 'feishu';
-    if (!cfg[ak]) cfg[ak] = {};
-    if (!cfg[ak].chat_agent_map) cfg[ak].chat_agent_map = {};
-    const old = cfg[ak].chat_agent_map[String(chatId)] || null;
-    if (old) {
-      delete cfg[ak].chat_agent_map[String(chatId)];
-    }
-    return { ok: true, data: { unbound: !!old, previousProjectKey: old } };
+  async function editRoleViaUnifiedApi(workspaceDir, deltaText) {
+    return editAgentRole({ agentTools, mergeAgentRole, workspaceDir, deltaText });
   }
 
   async function handleAgentCommand(ctx) {
@@ -466,11 +422,19 @@ function createAgentCommandHandler(deps) {
 
       // 读取最近对话片段，帮助确认是否切换到正确的 session
       const recentCtx = getSessionRecentContext ? getSessionRecentContext(targetSessionId) : null;
+      const recentDialogue = getSessionRecentDialogue ? getSessionRecentDialogue(targetSessionId, 4) : null;
       let msg = `✅ 已切换: **${label}**\n📁 ${path.basename(cwd)}`;
       if (selectedLogicalCurrent) {
         msg += '\n\n已恢复当前智能体会话。';
       }
-      if (recentCtx) {
+      if (Array.isArray(recentDialogue) && recentDialogue.length > 0) {
+        msg += '\n\n最近对话:';
+        for (const item of recentDialogue) {
+          const marker = item.role === 'assistant' ? '🤖' : '👤';
+          const snippet = String(item.text || '').replace(/\n/g, ' ').slice(0, 120);
+          if (snippet) msg += `\n${marker} ${snippet}`;
+        }
+      } else if (recentCtx) {
         if (recentCtx.lastUser) {
           const snippet = recentCtx.lastUser.replace(/\n/g, ' ').slice(0, 80);
           msg += `\n\n💬 上次你说: _${snippet}${recentCtx.lastUser.length > 80 ? '…' : ''}_`;
@@ -492,48 +456,68 @@ function createAgentCommandHandler(deps) {
 
     // /agent new 多步向导状态机（name/desc 步骤）
     if (pendingAgentFlows) {
-      const flow = pendingAgentFlows.get(String(chatId));
+      const flow = getFreshTimedFlow(pendingAgentFlows, String(chatId));
       if (flow && text && !text.startsWith('/')) {
         if (flow.step === 'name') {
           flow.name = text.trim();
+          if (flow.isClone) {
+            pendingAgentFlows.delete(String(chatId));
+            return completeAgentCreation({
+              bot,
+              chatId,
+              flow,
+              description: '',
+              createWorkspaceAgent: ({ chatId: createChatId, agentName, workspaceDir, roleDescription }) => createWorkspaceAgent({
+                agentTools,
+                chatId: createChatId,
+                agentName,
+                workspaceDir,
+                roleDescription,
+                attachOrCreateSession,
+                normalizeCwd,
+                getDefaultEngine,
+              }),
+              doBindAgent,
+              mergeAgentRole,
+            });
+          }
           flow.step = 'desc';
-          pendingAgentFlows.set(String(chatId), flow);
+          setTimedFlow(pendingAgentFlows, 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;
+          return completeAgentCreation({
+            bot,
+            chatId,
+            flow,
+            description: text.trim(),
+            createWorkspaceAgent: ({ chatId: createChatId, agentName, workspaceDir, roleDescription }) => createWorkspaceAgent({
+              agentTools,
+              chatId: createChatId,
+              agentName,
+              workspaceDir,
+              roleDescription,
+              attachOrCreateSession,
+              normalizeCwd,
+              getDefaultEngine,
+            }),
+            doBindAgent,
+            mergeAgentRole,
+          });
         }
       }
     }
 
     // /agent new team 多步向导状态机
     if (pendingTeamFlows) {
-      const teamFlow = pendingTeamFlows.get(String(chatId));
+      const teamFlow = getFreshTimedFlow(pendingTeamFlows, String(chatId));
       if (teamFlow && text && !text.startsWith('/')) {
         if (teamFlow.step === 'name') {
           teamFlow.name = text.trim();
           teamFlow.step = 'members';
-          pendingTeamFlows.set(String(chatId), teamFlow);
+          setTimedFlow(pendingTeamFlows, String(chatId), teamFlow);
           await bot.sendMessage(chatId, `团队名称：「${teamFlow.name}」
 
 请输入成员列表，格式：
@@ -549,26 +533,14 @@ function createAgentCommandHandler(deps) {
         }
 
         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] });
-            }
-          }
+          const members = parseTeamMembers(text, teamFlow.name);
           if (members.length === 0) {
             await bot.sendMessage(chatId, '⚠️ 请至少添加一个成员，格式：名称:icon:颜色');
             return true;
           }
           teamFlow.members = members;
           teamFlow.step = 'cwd';
-          pendingTeamFlows.set(String(chatId), teamFlow);
+          setTimedFlow(pendingTeamFlows, 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}」选择父工作目录`);
@@ -601,37 +573,17 @@ function createAgentCommandHandler(deps) {
 
       // /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;
+        return startNewAgentWizard({
+          bot,
+          chatId,
+          secondArg: agentParts[1],
+          pendingTeamFlows,
+          pendingAgentFlows,
+          loadConfig,
+          normalizeCwd,
+          sendBrowse,
+          HOME,
+        });
       }
 
       // /agent bind <名称> [目录]
@@ -703,12 +655,7 @@ function createAgentCommandHandler(deps) {
           return true;
         }
 
-        const claudeMdPath = path.join(cwd, 'CLAUDE.md');
-        let currentContent = '（CLAUDE.md 不存在）';
-        if (fs.existsSync(claudeMdPath)) {
-          currentContent = fs.readFileSync(claudeMdPath, 'utf8');
-          if (currentContent.length > 500) currentContent = currentContent.slice(0, 500) + '\n...(已截断)';
-        }
+        const currentContent = readAgentRolePreview({ fs, path, cwd });
         setFlow(String(chatId) + ':edit', { cwd });
         await bot.sendMessage(chatId, `📄 当前 CLAUDE.md 内容:\n\`\`\`\n${currentContent}\n\`\`\`\n\n请描述你想做的修改（用自然语言，例如：「把角色改成后端工程师，专注 Python」）：`);
         return true;
@@ -738,18 +685,15 @@ function createAgentCommandHandler(deps) {
           return true;
         }
         const cwd = normalizeCwd(boundProj.cwd);
-        const claudeMdPath = path.join(cwd, 'CLAUDE.md');
-        if (!fs.existsSync(claudeMdPath)) {
+        const resetResult = resetAgentRoleSection({ fs, path, cwd });
+        if (resetResult.status === 'missing') {
           await bot.sendMessage(chatId, '⚠️ CLAUDE.md 不存在，无需重置');
           return true;
         }
-        const before = fs.readFileSync(claudeMdPath, 'utf8');
-        const after = before.replace(/(?:^|\n)## Agent 角色\n[\s\S]*?(?=\n## |$)/, '').trimStart();
-        if (after === before.trimStart()) {
+        if (resetResult.status === 'unchanged') {
           await bot.sendMessage(chatId, '⚠️ 未找到「## Agent 角色」section，CLAUDE.md 未修改');
           return true;
         }
-        fs.writeFileSync(claudeMdPath, after, 'utf8');
         await bot.sendMessage(chatId, '✅ 已删除角色 section，请重新发送角色描述（/agent edit 或自然语言修改）');
         return true;
       }
@@ -768,66 +712,16 @@ function createAgentCommandHandler(deps) {
           await bot.sendMessage(chatId, '❌ 当前群未绑定 Agent，请先 /agent bind <名称> <目录>');
           return true;
         }
-        const cwd = normalizeCwd(boundProj.cwd);
-        const soulPath = path.join(cwd, 'SOUL.md');
-
-        if (soulAction === 'repair') {
-          if (agentTools && typeof agentTools.repairAgentSoul === 'function') {
-            const res = await agentTools.repairAgentSoul(cwd);
-            if (!res.ok) {
-              await bot.sendMessage(chatId, '❌ Soul 修复失败: ' + res.error);
-            } else {
-              const viewModes = res.data.views
-                ? Object.entries(res.data.views).map(([k, v]) => k + ':' + v).join(', ')
-                : '—';
-              await bot.sendMessage(chatId, [
-                '✅ Agent Soul 层已就绪',
-                'agent_id: ' + res.data.agentId,
-                '链接方式: ' + viewModes,
-                '',
-                '文件位置:',
-                '  SOUL.md   → ~/.metame/agents/' + res.data.agentId + '/soul.md',
-                '  MEMORY.md → ~/.metame/agents/' + res.data.agentId + '/memory-snapshot.md',
-              ].join('\n'));
-            }
-          } else {
-            await bot.sendMessage(chatId, '❌ agentTools 不可用');
-          }
-          return true;
-        }
-
-        if (soulAction === 'edit') {
-          const soulText = agentParts.slice(2).join(' ').trim();
-          if (!soulText) {
-            await bot.sendMessage(chatId, '用法: /agent soul edit <新内容>\n当前内容: /agent soul');
-            return true;
-          }
-          try {
-            fs.writeFileSync(soulPath, soulText, 'utf8');
-            await bot.sendMessage(chatId, '✅ SOUL.md 已更新');
-          } catch (e) {
-            await bot.sendMessage(chatId, '❌ 写入失败: ' + e.message);
-          }
-          return true;
-        }
-
-        // Default: show current SOUL.md content
-        if (!fs.existsSync(soulPath)) {
-          await bot.sendMessage(chatId, [
-            '⚠️ SOUL.md 不存在',
-            '',
-            '老项目或刚绑定的 Agent 可能尚未建立 Soul 层。',
-            '运行 /agent soul repair 自动生成。',
-          ].join('\n'));
-          return true;
-        }
-        try {
-          const soulContent = fs.readFileSync(soulPath, 'utf8').trim().slice(0, 2000);
-          await bot.sendMessage(chatId, '📋 当前 Soul:\n\n' + soulContent);
-        } catch (e) {
-          await bot.sendMessage(chatId, '❌ 读取 SOUL.md 失败: ' + e.message);
-        }
-        return true;
+        return handleSoulCommand({
+          bot,
+          chatId,
+          soulAction,
+          soulText: agentParts.slice(2).join(' ').trim(),
+          cwd: normalizeCwd(boundProj.cwd),
+          fs,
+          path,
+          agentTools,
+        });
       }
 
 
@@ -853,66 +747,13 @@ function createAgentCommandHandler(deps) {
 
     // /activate — bind this unbound chat to the most recently created pending agent
     if (text === '/activate' || text.startsWith('/activate ')) {
-      const cfg = loadConfig();
-      const { boundKey } = getBoundProject(chatId, cfg);
-      if (boundKey) {
-        await bot.sendMessage(chatId, `此群已绑定到「${boundKey}」，无需激活。如需更换请先 /agent unbind`);
-        return true;
-      }
-      const activation = getLatestActivationForChat(chatId);
-      if (!activation) {
-        // Check if this chat was the creator (self-activate attempt)
-        if (pendingActivations) {
-          for (const rec of pendingActivations.values()) {
-            if (rec.createdByChatId === String(chatId)) {
-              await bot.sendMessage(chatId,
-                `❌ 不能在创建来源群激活。\n请在你新建的目标群里发送 \`/activate\`\n\n` +
-                `或在任意群用: \`/agent bind ${rec.agentName} ${rec.cwd}\``
-              );
-              return true;
-            }
-          }
-        }
-        // No pending activation — fall back to scanning daemon.yaml for unbound projects
-        const allBoundKeys = new Set(Object.values({
-          ...(cfg.telegram ? cfg.telegram.chat_agent_map : {}),
-          ...(cfg.feishu ? cfg.feishu.chat_agent_map : {}),
-        }));
-        const unboundProjects = Object.entries(cfg.projects || {})
-          .filter(([key, p]) => p && p.cwd && !allBoundKeys.has(key))
-          .map(([key, p]) => ({ key, name: p.name || key, cwd: p.cwd, icon: p.icon || '🤖' }));
-
-        if (unboundProjects.length === 1) {
-          // Exactly one unbound project — auto-bind using project KEY (not display name)
-          // to ensure toProjectKey() resolves to the correct existing key in daemon.yaml
-          const proj = unboundProjects[0];
-          const bindRes2 = await bindViaUnifiedApi(bot, chatId, proj.key, proj.cwd);
-          if (bindRes2.ok) pendingActivations && pendingActivations.delete(proj.key);
-          return true;
-        }
-
-        if (unboundProjects.length > 1) {
-          // Multiple unbound projects — show pick list using project keys
-          const lines = ['请选择要激活的 Agent：', ''];
-          for (const p of unboundProjects) {
-            lines.push(`${p.icon} ${p.name}  →  \`/agent bind ${p.key} ${p.cwd}\``);
-          }
-          lines.push('\n发送对应命令即可绑定此群。');
-          await bot.sendMessage(chatId, lines.join('\n'));
-          return true;
-        }
-
-        // Truly nothing to activate
-        await bot.sendMessage(chatId,
-          '没有待激活的 Agent。\n\n如果已创建过 Agent，直接用:\n`/agent bind <名称> <目录>`\n即可绑定，不需要重新创建。'
-        );
-        return true;
-      }
-      const bindRes = await bindViaUnifiedApi(bot, chatId, activation.agentName, activation.cwd);
-      if (bindRes.ok) {
-        pendingActivations && pendingActivations.delete(activation.agentKey);
-      }
-      return true;
+      return handleActivateCommand({
+        bot,
+        chatId,
+        loadConfig,
+        pendingActivations,
+        bindAgent: (agentName, agentCwd) => bindViaUnifiedApi(bot, chatId, agentName, agentCwd),
+      });
     }
 
     // /agent-dir <path>: /agent new 向导的目录选择回调（步骤1→步骤2）
@@ -928,7 +769,7 @@ function createAgentCommandHandler(deps) {
       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 起个名字？`);
+      await bot.sendMessage(chatId, `✓ 已选择目录：${displayPath}${cloneHint}\n\n${flow.isClone ? '步骤2/2' : '步骤2/3'}：给这个 Agent 起个名字？`);
       return true;
     }
 
@@ -948,65 +789,30 @@ function createAgentCommandHandler(deps) {
     // /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));
+      const teamFlow = getFreshTimedFlow(pendingTeamFlows, String(chatId));
       if (!teamFlow || teamFlow.step !== 'cwd') {
         await bot.sendMessage(chatId, '❌ 没有待完成的团队创建，请重新发送 /agent new team');
         return true;
       }
       teamFlow.step = 'creating';
-      pendingTeamFlows.set(String(chatId), teamFlow);
+      setTimedFlow(pendingTeamFlows, 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 { teamDir, parentProjectKey } = createTeamWorkspace({
+          fs,
+          path,
+          execSync,
+          dirPath,
+          teamName: teamFlow.name,
+          members,
+          loadConfig,
+          normalizeCwd,
+          writeConfigSafe,
+          backupConfig,
+          HOME,
+        });
 
         const memberList = members.map(m => `${m.icon} ${m.key}`).join('  |  ');
         const yamlNote = parentProjectKey