metame-cli 1.4.18 → 1.4.20

package/scripts/daemon-agent-commands.js

@@ -18,8 +18,10 @@ function createAgentCommandHandler(deps) {
     sessionLabel,
     loadSessionTags,
     sessionRichLabel,
+    getSessionRecentContext,
     pendingBinds,
     pendingAgentFlows,
+    pendingActivations,
     doBindAgent,
     mergeAgentRole,
     agentTools,
@@ -28,6 +30,30 @@ function createAgentCommandHandler(deps) {
     agentBindTtlMs,
   } = deps;
 
+  // Pending activations have no TTL — they persist until consumed.
+  // The creating chatId is stored to prevent self-activation.
+
+  function storePendingActivation(agentKey, agentName, cwd, createdByChatId) {
+    if (!pendingActivations) return;
+    pendingActivations.set(agentKey, {
+      agentKey, agentName, cwd,
+      createdByChatId: String(createdByChatId),
+      createdAt: Date.now(),
+    });
+  }
+
+  // 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);
@@ -135,9 +161,15 @@ function createAgentCommandHandler(deps) {
     return { ok: true, data: legacy };
   }
 
-  async function createAgentViaUnifiedApi(chatId, name, dir, roleDesc) {
+  async function createAgentViaUnifiedApi(chatId, name, dir, roleDesc, opts = {}) {
+    // Default: skip binding the creating chat — let the target group activate via /activate
+    const { skipChatBinding = true } = opts;
     if (agentTools && typeof agentTools.createNewWorkspaceAgent === 'function') {
-      return agentTools.createNewWorkspaceAgent(name, dir, roleDesc, chatId);
+      const res = await agentTools.createNewWorkspaceAgent(name, dir, roleDesc, chatId, { skipChatBinding });
+      if (res.ok && skipChatBinding && res.data && res.data.projectKey) {
+        storePendingActivation(res.data.projectKey, name, res.data.cwd, chatId);
+      }
+      return res;
     }
     const bound = await doBindAgent({ sendMessage: async () => {} }, chatId, name, dir);
     if (!bound || bound.ok === false) {
@@ -249,45 +281,30 @@ function createAgentCommandHandler(deps) {
       saveState(state2);
       const name = fullMatch.customTitle;
       const label = name || (fullMatch.summary || fullMatch.firstPrompt || '').slice(0, 40) || sessionId.slice(0, 8);
-      await bot.sendMessage(chatId, `Resumed: ${label}\nWorkdir: ${cwd}`);
-      return true;
-    }
 
-    // /agent new wizard state machine (kept for command compatibility)
-    {
-      const flow = getFreshFlow(String(chatId));
-      if (flow && flow.step === 'name' && text && !text.startsWith('/')) {
-        flow.name = text.trim();
-        flow.step = 'desc';
-        setFlow(String(chatId), flow);
-        await bot.sendMessage(chatId, `好的，Agent 名称是「${flow.name}」\n\n请描述这个 Agent 的角色和职责（用自然语言）：`);
-        return true;
-      }
-      if (flow && flow.step === 'desc' && text && !text.startsWith('/')) {
-        pendingAgentFlows.delete(String(chatId));
-        const { dir, name } = flow;
-        const description = text.trim();
-        await bot.sendMessage(chatId, `⏳ 正在配置 Agent「${name}」，稍等...`);
-        const created = await createAgentViaUnifiedApi(chatId, name, dir, description);
-        if (!created.ok) {
-          await bot.sendMessage(chatId, `❌ 创建 Agent 失败: ${created.error}`);
-          return true;
+      // 读取最近对话片段，帮助确认是否切换到正确的 session
+      const recentCtx = getSessionRecentContext ? getSessionRecentContext(sessionId) : null;
+      let msg = `✅ 已切换: **${label}**\n📁 ${path.basename(cwd)}`;
+      if (recentCtx) {
+        if (recentCtx.lastUser) {
+          const snippet = recentCtx.lastUser.replace(/\n/g, ' ').slice(0, 80);
+          msg += `\n\n💬 上次你说: _${snippet}${recentCtx.lastUser.length > 80 ? '…' : ''}_`;
         }
-        if (created.data && created.data.cwd && typeof attachOrCreateSession === 'function') {
-          attachOrCreateSession(chatId, normalizeCwd(created.data.cwd), name || '');
-        }
-        const roleInfo = created.data.role || {};
-        if (roleInfo.skipped) {
-          await bot.sendMessage(chatId, '✅ Agent 创建成功');
-        } else if (roleInfo.created) {
-          await bot.sendMessage(chatId, '📝 已创建 CLAUDE.md 并写入角色定义');
-        } else {
-          await bot.sendMessage(chatId, '📝 已将角色定义合并进现有 CLAUDE.md');
+        if (recentCtx.lastAssistant) {
+          const snippet = recentCtx.lastAssistant.replace(/\n/g, ' ').slice(0, 80);
+          msg += `\n🤖 上次回复: ${snippet}${recentCtx.lastAssistant.length > 80 ? '…' : ''}`;
         }
-        return true;
       }
+      if (bot.sendMarkdown) {
+        await bot.sendMarkdown(chatId, msg);
+      } else {
+        await bot.sendMessage(chatId, msg.replace(/[_*`]/g, ''));
+      }
+      return true;
     }
 
+    // wizard state machine removed — use natural language to create agents
+
     // /agent edit wait-input flow (kept for command compatibility)
     {
       const editFlow = getFreshFlow(String(chatId) + ':edit');
@@ -336,7 +353,7 @@ function createAgentCommandHandler(deps) {
         }
         const agents = res.data.agents || [];
         if (agents.length === 0) {
-          await bot.sendMessage(chatId, '暂无已配置的 Agent。\n使用 /agent new 创建，或 /agent bind <名称> 绑定目录。');
+          await bot.sendMessage(chatId, '暂无已配置的 Agent。\n用自然语言说"创建一个agent，目录是~/xxx"，或 /agent bind <名称> <目录>。');
           return true;
         }
         const lines = ['📋 已配置的 Agent：', ''];
@@ -354,19 +371,12 @@ function createAgentCommandHandler(deps) {
         return true;
       }
 
-      // /agent new (wizard)
-      if (agentSub === 'new') {
-        setFlow(String(chatId), { step: 'dir' });
-        await sendBrowse(bot, chatId, 'agent-new', HOME, '步骤1/3：选择这个 Agent 的工作目录');
-        return true;
-      }
-
       // /agent edit [描述]
       if (agentSub === 'edit') {
         const cfg = loadConfig();
         const { boundProj } = getBoundProject(chatId, cfg);
         if (!boundProj || !boundProj.cwd) {
-          await bot.sendMessage(chatId, '❌ 当前群未绑定 Agent，请先使用 /agent bind 或 /agent new');
+          await bot.sendMessage(chatId, '❌ 当前群未绑定 Agent，请先用自然语言创建 Agent 或 /agent bind <名称> <目录>');
           return true;
         }
         const cwd = normalizeCwd(boundProj.cwd);
@@ -413,7 +423,7 @@ function createAgentCommandHandler(deps) {
         const cfg = loadConfig();
         const { boundProj } = getBoundProject(chatId, cfg);
         if (!boundProj || !boundProj.cwd) {
-          await bot.sendMessage(chatId, '❌ 当前群未绑定 Agent，请先使用 /agent bind 或 /agent new');
+          await bot.sendMessage(chatId, '❌ 当前群未绑定 Agent，请先用自然语言创建 Agent 或 /agent bind <名称> <目录>');
           return true;
         }
         const cwd = normalizeCwd(boundProj.cwd);
@@ -438,7 +448,7 @@ function createAgentCommandHandler(deps) {
         const projects = config.projects || {};
         const entries = Object.entries(projects).filter(([, p]) => p.cwd);
         if (entries.length === 0) {
-          await bot.sendMessage(chatId, '暂无已配置的 Agent。\n使用 /agent new 新建，或 /agent bind <名称> 绑定目录。');
+          await bot.sendMessage(chatId, '暂无已配置的 Agent。\n用自然语言说"创建一个agent，目录是~/xxx"，或 /agent bind <名称> <目录>。');
           return true;
         }
         const currentSession = getSession(chatId);
@@ -453,6 +463,41 @@ 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 at all — guide to manual bind
+        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;
+    }
+
     // /agent-bind-dir <path>: internal callback for bind picker
     if (text.startsWith('/agent-bind-dir ')) {
       const dirPath = expandPath(text.slice(16).trim());
@@ -466,22 +511,6 @@ function createAgentCommandHandler(deps) {
       return true;
     }
 
-    // /agent-dir <path>: internal callback for /agent new wizard
-    if (text.startsWith('/agent-dir ')) {
-      const dirPath = expandPath(text.slice(11).trim());
-      const flow = getFreshFlow(String(chatId));
-      if (!flow || flow.step !== 'dir') {
-        await bot.sendMessage(chatId, '❌ 没有待完成的 /agent new，请重新发送 /agent new');
-        return true;
-      }
-      flow.dir = dirPath;
-      flow.step = 'name';
-      setFlow(String(chatId), flow);
-      const displayPath = dirPath.replace(HOME, '~');
-      await bot.sendMessage(chatId, `✓ 已选择目录：${displayPath}\n\n步骤2/3：给这个 Agent 起个名字？`);
-      return true;
-    }
-
     return false;
   }
 

package/scripts/daemon-agent-tools.js

@@ -37,7 +37,7 @@ function createAgentTools(deps) {
     if (!cfg[adapterKey].chat_agent_map) cfg[adapterKey].chat_agent_map = {};
   }
 
-  async function bindAgentToChat(chatId, agentName, workspaceDir) {
+  async function bindAgentToChat(chatId, agentName, workspaceDir, { force = false } = {}) {
     try {
       const safeName = sanitizeText(agentName, 120);
       if (!safeName) return { ok: false, error: 'agentName is required' };
@@ -64,6 +64,16 @@ function createAgentTools(deps) {
         return { ok: false, error: `workspaceDir is not a directory: ${resolvedDir}` };
       }
 
+      // Overwrite protection: reject if chat is already bound to a different agent
+      const existingKey = cfg[adapterKey].chat_agent_map[String(chatId)];
+      if (existingKey && existingKey !== projectKey && !force) {
+        return {
+          ok: false,
+          error: `此群已绑定到 "${existingKey}"，如需覆盖请使用 force:true`,
+          data: { existingKey },
+        };
+      }
+
       const idVal = typeof chatId === 'number' ? chatId : String(chatId);
       if (!cfg[adapterKey].allowed_chat_ids.includes(idVal)) cfg[adapterKey].allowed_chat_ids.push(idVal);
 
@@ -165,30 +175,57 @@ ${safeDelta}
     }
   }
 
-  async function createNewWorkspaceAgent(agentName, workspaceDir, roleDescription, chatId) {
-    const bindResult = await bindAgentToChat(chatId, agentName, workspaceDir);
-    if (!bindResult.ok) return bindResult;
+  async function createNewWorkspaceAgent(agentName, workspaceDir, roleDescription, chatId, { skipChatBinding = false } = {}) {
+    let bindData;
+
+    if (skipChatBinding) {
+      // Create the project entry without touching chat_agent_map
+      const safeName = sanitizeText(agentName, 120);
+      if (!safeName) return { ok: false, error: 'agentName is required' };
+      const resolvedDir = resolveWorkspaceDir(workspaceDir);
+      if (!resolvedDir) return { ok: false, error: 'workspaceDir is required' };
+      if (!fs.existsSync(resolvedDir) || !fs.statSync(resolvedDir).isDirectory()) {
+        return { ok: false, error: `workspaceDir not found or not a directory: ${resolvedDir}` };
+      }
+      const cfg = loadConfig();
+      if (!cfg.projects) cfg.projects = {};
+      const projectKey = toProjectKey(safeName, chatId);
+      const existed = !!cfg.projects[projectKey];
+      if (!existed) {
+        cfg.projects[projectKey] = { name: safeName, cwd: resolvedDir, nicknames: [safeName] };
+        writeConfigSafe(cfg);
+        backupConfig();
+      }
+      bindData = {
+        projectKey,
+        cwd: resolvedDir,
+        isNewProject: !existed,
+        chatId: null,      // not bound to any chat
+        project: cfg.projects[projectKey],
+      };
+    } else {
+      const bindResult = await bindAgentToChat(chatId, agentName, workspaceDir);
+      if (!bindResult.ok) return bindResult;
+      bindData = bindResult.data;
+    }
 
     const roleText = sanitizeText(roleDescription, 1200);
     if (!roleText) {
-      return { ok: true, data: { ...bindResult.data, role: { skipped: true } } };
+      return { ok: true, data: { ...bindData, role: { skipped: true } } };
     }
 
-    const roleResult = await editAgentRoleDefinition(bindResult.data.cwd, roleText);
+    const roleResult = await editAgentRoleDefinition(bindData.cwd, roleText);
     if (!roleResult.ok) {
       return {
         ok: false,
-        error: `agent bound but role update failed: ${roleResult.error}`,
-        data: { ...bindResult.data, roleError: roleResult.error },
+        error: `agent created but role update failed: ${roleResult.error}`,
+        data: { ...bindData, roleError: roleResult.error },
       };
     }
 
     return {
       ok: true,
-      data: {
-        ...bindResult.data,
-        role: roleResult.data,
-      },
+      data: { ...bindData, role: roleResult.data },
     };
   }
 

package/scripts/daemon-bridges.js

@@ -12,8 +12,29 @@ function createBridgeStarter(deps) {
     saveState,
     getSession,
     handleCommand,
+    pendingActivations,  // optional — used to show smart activation hint
   } = deps;
 
+  // Returns the best pending activation for a given chatId (excludes self-created)
+  function getPendingActivationForChat(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;
+      if (!latest || rec.createdAt > latest.createdAt) latest = rec;
+    }
+    return latest;
+  }
+
+  function unauthorizedMsg(chatId, useSend) {
+    const pending = getPendingActivationForChat(chatId);
+    if (pending) {
+      return `⚠️ 此群未授权\n\n发送以下命令激活 Agent「${pending.agentName}」：\n\`/activate\``;
+    }
+    return '⚠️ 此群未授权\n\n如已创建 Agent，发送 `/activate` 完成绑定。\n否则请先在主群创建 Agent。';
+  }
+
   async function startTelegramBridge(config, executeTaskByName) {
     if (!config.telegram || !config.telegram.enabled) return null;
     if (!config.telegram.bot_token) {
@@ -68,13 +89,13 @@ function createBridgeStarter(deps) {
             const trimmedText = msg.text && msg.text.trim();
             const isBindCmd = trimmedText && (
               trimmedText.startsWith('/agent bind')
-              || trimmedText.startsWith('/agent new')
               || trimmedText.startsWith('/agent-bind-dir')
               || trimmedText.startsWith('/browse bind')
+              || trimmedText === '/activate'
             );
             if (!allowedIds.includes(chatId) && !isBindCmd) {
               log('WARN', `Rejected message from unauthorized chat: ${chatId}`);
-              bot.sendMessage(chatId, '⚠️ This chat is not authorized.\n\nCopy and send this command to register:\n\n/agent bind personal').catch(() => {});
+              bot.sendMessage(chatId, unauthorizedMsg(chatId)).catch(() => {});
               continue;
             }
 
@@ -157,15 +178,14 @@ function createBridgeStarter(deps) {
         const trimmedText = text && text.trim();
         const isBindCmd = trimmedText && (
           trimmedText.startsWith('/agent bind')
-          || trimmedText.startsWith('/agent new')
           || trimmedText.startsWith('/agent-bind-dir')
           || trimmedText.startsWith('/browse bind')
+          || trimmedText === '/activate'
         );
         if (!allowedIds.includes(chatId) && !isBindCmd) {
           log('WARN', `Feishu: rejected message from ${chatId}`);
-          (bot.sendMarkdown
-            ? bot.sendMarkdown(chatId, '⚠️ 此会话未授权\n\n复制发送以下命令注册：\n\n/agent bind personal')
-            : bot.sendMessage(chatId, '⚠️ 此会话未授权\n\n复制发送以下命令注册：\n\n/agent bind personal')).catch(() => {});
+          const msg = unauthorizedMsg(chatId);
+          (bot.sendMarkdown ? bot.sendMarkdown(chatId, msg) : bot.sendMessage(chatId, msg)).catch(() => {});
           return;
         }