metame-cli 1.4.19 → 1.4.21

package/README.md

@@ -32,7 +32,7 @@ npm install -g metame-cli && metame
 
 ---
 
-> ### 🚀 v1.4.18 — Multi-User ACL + Session Context Preview
+> ### 🚀 v1.4.19 — Multi-User ACL + Session Context Preview
 >
 > - **Multi-user permission system**: role-based ACL (admin / member / stranger) — share your bots with teammates without giving them full access. Manage users with `/user` commands.
 > - **Session context preview**: `/resume` and `/sessions` now show the last message snippet so you know exactly what to pick up.
@@ -243,11 +243,11 @@ systemctl --user start metame
 
 **Create your first Agent:**
 
-1. Create a group chat in Telegram/Feishu, add your bot
-2. Send `/agent bind <name>` in the group (e.g. `/agent bind personal`)
-3. Pick a working directory from the buttons, or type a path directly — non-existent directories are created automatically → done
+1. In any existing group, say: `Create an agent, directory ~/xxx, responsible for xxx`
+2. Bot replies: ✅ Agent created — **send `/activate` in your new group to bind it**
+3. Create a new group, add the bot, send `/activate` → binding complete
 
-> Want more Agents? Repeat: new group → add bot → `/agent bind <name>`. Each group = independent AI workspace.
+> Want more Agents? Repeat: create in any group → new target group → `/activate`. Each group = independent AI workspace.
 
 ---
 
@@ -274,23 +274,26 @@ MetaMe's design philosophy: **one folder = one agent.**
 
 Give an agent a directory, drop a `CLAUDE.md` inside describing its role, and you're done. The folder is the agent — it can be a code project, a blog repo, any workspace you already have.
 
-### Option 1: Just say it (fastest)
+### Option 1: Just say it (recommended)
 
-No commands needed. Tell the bot what you want in plain language — MetaMe understands intent and acts:
+No commands needed. Tell the bot what you want in plain language. **The agent is created without binding to the current group** — send `/activate` in your new target group to complete the binding:
 
 ```
-You:  Create an agent for this group, directory ~/projects/assistant
-Bot:  ✅ Agent created and bound
-      Name: assistant
+You:  Create an agent, directory ~/projects/assistant, responsible for writing and content
+Bot:  ✅ Agent「assistant」created
       Dir: ~/projects/assistant
+      📝 CLAUDE.md written
 
-You:  Change this agent's role to: a writing and content creation assistant
-Bot:  ✅ Role definition updated in CLAUDE.md
+      Next: send /activate in your new group to bind
+
+── In the new group ──
 
-You:  Bind an agent to ~/AGI/MyProject
-Bot:  ✅ Agent bound
-      Name: MyProject
-      Dir: ~/AGI/MyProject
+You:  /activate
+Bot:  🤖 assistant bound
+      Dir: ~/projects/assistant
+
+You:  Change this agent's role to: focused on Python backend development
+Bot:  ✅ Role definition updated in CLAUDE.md
 
 You:  List all agents
 Bot:  📋 Agent list
@@ -299,21 +302,22 @@ Bot:  📋 Agent list
       ...
 ```
 
-Supported intents: create, bind, unbind, edit role, list — just say it naturally.
+Supported intents: create, bind (`/agent bind`), unbind, edit role, list — just say it naturally.
 
-### Option 2: Wizard commands
+### Option 2: Commands
 
 Use `/agent` commands in any Telegram/Feishu group:
 
 | Command | What it does |
 |---------|-------------|
-| `/agent new` | Step-by-step wizard: pick a directory → name the agent → describe its role. MetaMe writes the role into `CLAUDE.md` automatically. You can also type a path directly in chat — if it doesn't exist, MetaMe creates it for you. |
-| `/agent bind <name> [dir]` | Quick bind: register this group as a named agent, optionally set working directory. |
+| `/activate` | In a new group, sends this to auto-bind the most recently created pending agent. |
+| `/agent bind <name> [dir]` | Manual bind: register this group as a named agent. Works anytime — no need to recreate if agent already exists. |
 | `/agent list` | Show all configured agents. |
 | `/agent edit` | Update the current agent's role description (rewrites its `CLAUDE.md` section). |
+| `/agent unbind` | Remove this group's agent binding. |
 | `/agent reset` | Remove the current agent's role section. |
 
-You can tap a button to pick an existing directory, or type any path directly in chat. If the path doesn't exist, it's created automatically.
+> **Binding protection**: Each group can only be bound to one agent. Existing bindings cannot be overwritten without explicit `force:true`.
 
 ### From config file (for power users)
 
@@ -359,6 +363,7 @@ All agents share your cognitive profile (`~/.claude_profile.yaml`) — they all
 
 | Command | Action |
 |---------|--------|
+| `/continue` | Sync to computer's current work (session + directory) |
 | `/last` | Resume most recent session |
 | `/new` | Start new session (project picker) |
 | `/resume` | Pick from session list |
@@ -367,7 +372,8 @@ All agents share your cognitive profile (`~/.claude_profile.yaml`) — they all
 | `/undo <hash>` | Roll back to a specific git checkpoint |
 | `/list` | Browse & download project files |
 | `/model` | Switch model (sonnet/opus/haiku) |
-| `/agent bind <name> [dir]` | Register group as dedicated agent |
+| `/activate` | Activate and bind the most recently created pending agent in a new group |
+| `/agent bind <name> [dir]` | Manually register group as dedicated agent |
 | `/mac` | macOS control helper: permissions check/open + AppleScript/JXA execution |
 | `/sh <cmd>` | Raw shell — bypasses Claude |
 | `/memory` | Memory stats: fact count, session tags, DB size |
@@ -416,7 +422,7 @@ All agents share your cognitive profile (`~/.claude_profile.yaml`) — they all
 ## Security
 
 - All data stays on your machine. No cloud, no telemetry.
-- `allowed_chat_ids` whitelist — unauthorized users get a one-step `/agent bind` guide instead of silent rejection.
+- `allowed_chat_ids` whitelist — new groups get a smart prompt: if a pending agent activation exists, they're guided to send `/activate`; otherwise they receive setup instructions.
 - `operator_ids` for shared groups — non-operators get read-only mode.
 - `~/.metame/` directory is mode 700.
 - Bot tokens stored locally, never transmitted.
@@ -427,7 +433,7 @@ All agents share your cognitive profile (`~/.claude_profile.yaml`) — they all
 |--------|-------|
 | Daemon memory (idle) | ~100 MB RSS — standard Node.js process baseline |
 | Daemon CPU (idle, between heartbeats) | ~0% — event-loop sleeping |
-| Cognitive profile injection | ~800 tokens/session (0.4% of 200k context) |
+| Cognitive profile injection | ~600 tokens/session (0.3% of 200k context) |
 | Dispatch latency (Unix socket) | <100ms |
 | Memory consolidation (per session) | ~1,500–2,000 tokens input + ~50–300 tokens output (Haiku) |
 | Session summary (per session) | ~400–900 tokens input + ≤250 tokens output (Haiku) |

package/index.js

@@ -30,7 +30,7 @@ if (!fs.existsSync(METAME_DIR)) {
 // Auto-deploy bundled scripts to ~/.metame/
 // IMPORTANT: daemon.yaml is USER CONFIG — never overwrite it. Only daemon-default.yaml (template) is synced.
 const scriptsDir = path.join(__dirname, 'scripts');
-const BUNDLED_BASE_SCRIPTS = ['signal-capture.js', 'distill.js', 'schema.js', 'pending-traits.js', 'migrate-v2.js', 'daemon.js', 'telegram-adapter.js', 'feishu-adapter.js', 'daemon-default.yaml', 'providers.js', 'session-analytics.js', 'resolve-yaml.js', 'utils.js', 'skill-evolution.js', 'memory.js', 'memory-extract.js', 'memory-search.js', 'qmd-client.js', 'session-summarize.js', 'check-macos-control-capabilities.sh', 'usage-classifier.js', 'task-board.js'];
+const BUNDLED_BASE_SCRIPTS = ['signal-capture.js', 'distill.js', 'schema.js', 'pending-traits.js', 'migrate-v2.js', 'daemon.js', 'telegram-adapter.js', 'feishu-adapter.js', 'daemon-default.yaml', 'providers.js', 'session-analytics.js', 'resolve-yaml.js', 'utils.js', 'skill-evolution.js', 'memory.js', 'memory-extract.js', 'memory-search.js', 'memory-gc.js', 'qmd-client.js', 'session-summarize.js', 'check-macos-control-capabilities.sh', 'usage-classifier.js', 'task-board.js', 'memory-nightly-reflect.js', 'memory-index.js'];
 const DAEMON_MODULE_SCRIPTS = (() => {
   try {
     return fs.readdirSync(scriptsDir).filter((f) => /^daemon-[\w-]+\.js$/.test(f));
@@ -78,6 +78,44 @@ if (scriptsUpdated) {
   console.log('📦 Scripts synced to ~/.metame/ — daemon will auto-restart when idle.');
 }
 
+// ---------------------------------------------------------
+// Deploy bundled skills to ~/.claude/skills/
+// Only installs if not already present — never overwrites user customizations.
+// ---------------------------------------------------------
+const CLAUDE_SKILLS_DIR = path.join(HOME_DIR, '.claude', 'skills');
+const bundledSkillsDir = path.join(__dirname, 'skills');
+if (fs.existsSync(bundledSkillsDir)) {
+  try {
+    if (!fs.existsSync(CLAUDE_SKILLS_DIR)) {
+      fs.mkdirSync(CLAUDE_SKILLS_DIR, { recursive: true });
+    }
+    const skillsInstalled = [];
+    for (const skillName of fs.readdirSync(bundledSkillsDir)) {
+      const srcSkill = path.join(bundledSkillsDir, skillName);
+      const destSkill = path.join(CLAUDE_SKILLS_DIR, skillName);
+      if (!fs.statSync(srcSkill).isDirectory()) continue;
+      if (fs.existsSync(destSkill)) continue; // already installed, respect user's version
+      // Copy skill directory recursively
+      const copyDir = (src, dest) => {
+        fs.mkdirSync(dest, { recursive: true });
+        for (const entry of fs.readdirSync(src)) {
+          const s = path.join(src, entry);
+          const d = path.join(dest, entry);
+          if (fs.statSync(s).isDirectory()) copyDir(s, d);
+          else fs.copyFileSync(s, d);
+        }
+      };
+      copyDir(srcSkill, destSkill);
+      skillsInstalled.push(skillName);
+    }
+    if (skillsInstalled.length > 0) {
+      console.log(`🧠 Skills installed: ${skillsInstalled.join(', ')}`);
+    }
+  } catch {
+    // Non-fatal
+  }
+}
+
 // Load daemon config for local launch flags
 let daemonCfg = {};
 try {

package/package.json

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

package/scripts/daemon-admin-commands.js

@@ -26,6 +26,10 @@ function createAdminCommandHandler(deps) {
     skillEvolution,
     taskBoard,
     taskEnvelope,
+    getActiveProcesses,
+    getMessageQueue,
+    loadState,
+    saveState,
   } = deps;
 
   function resolveProjectKey(targetName, projects) {
@@ -102,7 +106,13 @@ function createAdminCommandHandler(deps) {
         if (fs.existsSync(BRAIN_FILE)) {
           const doc = yaml.load(fs.readFileSync(BRAIN_FILE, 'utf8')) || {};
           if (doc.identity) msg += `\nProfile: ${doc.identity.nickname || 'unknown'}`;
-          if (doc.context && doc.context.focus) msg += `\nFocus: ${doc.context.focus}`;
+          const nowPath = require('path').join(require('os').homedir(), '.metame', 'memory', 'NOW.md');
+          try {
+            if (fs.existsSync(nowPath)) {
+              const nowContent = fs.readFileSync(nowPath, 'utf8').trim().split('\n')[0];
+              if (nowContent) msg += `\nNOW: ${nowContent.slice(0, 80)}`;
+            }
+          } catch { /* ignore */ }
         }
       } catch { /* ignore */ }
       await bot.sendMessage(chatId, msg);
@@ -639,6 +649,57 @@ function createAdminCommandHandler(deps) {
       return { handled: true, config };
     }
 
+    // /recover — kill all stuck tasks and reset message queues
+    if (text === '/recover') {
+      const activeProcesses = getActiveProcesses ? getActiveProcesses() : null;
+      const messageQueue = getMessageQueue ? getMessageQueue() : null;
+      if (!activeProcesses) {
+        await bot.sendMessage(chatId, '❌ 无法访问任务状态');
+        return { handled: true, config };
+      }
+      const stuckChatIds = [...activeProcesses.keys()];
+      let killed = 0;
+      for (const cid of stuckChatIds) {
+        const proc = activeProcesses.get(cid);
+        if (proc && proc.child) {
+          try { process.kill(-proc.child.pid, 'SIGTERM'); } catch { try { proc.child.kill('SIGTERM'); } catch { } }
+          killed++;
+        }
+        activeProcesses.delete(cid);
+        if (messageQueue && messageQueue.has(cid)) {
+          const q = messageQueue.get(cid);
+          if (q && q.timer) clearTimeout(q.timer);
+          messageQueue.delete(cid);
+        }
+      }
+      // Clear stale sessions (started: false = never completed first message, likely locked)
+      try {
+        const state = loadState();
+        let cleared = 0;
+        for (const [cid, sess] of Object.entries(state.sessions || {})) {
+          if (sess && !sess.started) {
+            delete state.sessions[cid];
+            cleared++;
+          }
+        }
+        if (cleared > 0) saveState(state);
+      } catch { /* non-critical */ }
+      // SIGKILL stragglers after 3s grace period
+      if (killed > 0) {
+        setTimeout(() => {
+          for (const cid of stuckChatIds) {
+            // proc references are stale but child.pid is still valid for cleanup
+            try { const proc = activeProcesses.get(cid); if (proc && proc.child) process.kill(-proc.child.pid, 'SIGKILL'); } catch { }
+          }
+        }, 3000);
+      }
+      const summary = killed > 0
+        ? `✅ 已重置 ${killed} 个卡住的任务，可重新发送消息。`
+        : '✅ 当前没有卡住的任务。';
+      await bot.sendMessage(chatId, summary);
+      return { handled: true, config };
+    }
+
     // /doctor — diagnostics; /fix — restore backup; /reset — reset model to sonnet
     if (text === '/fix') {
       if (restoreConfig()) {
@@ -696,15 +757,36 @@ function createAdminCommandHandler(deps) {
       const hasBak = fs.existsSync(bakFile);
       checks.push(hasBak ? '✅ 有备份' : '⚠️ 无备份');
 
+      // Check for stuck tasks (only flag tasks running > 10 minutes as suspicious)
+      const activeProcesses = getActiveProcesses ? getActiveProcesses() : null;
+      let hasStuck = false;
+      if (activeProcesses && activeProcesses.size > 0) {
+        const now = Date.now();
+        const stuckThreshold = 10 * 60 * 1000; // 10 minutes
+        const entries = [...activeProcesses.entries()];
+        const stuckEntries = entries.filter(([, proc]) => proc && proc.startedAt && (now - proc.startedAt) > stuckThreshold);
+        if (stuckEntries.length > 0) {
+          const stuckList = stuckEntries.map(([cid, proc]) => `${cid.slice(-8)}(${Math.round((now - proc.startedAt) / 60000)}min)`).join(', ');
+          checks.push(`⚠️ ${stuckEntries.length} 个任务疑似卡住 (${stuckList})`);
+          hasStuck = true;
+          issues++;
+        } else {
+          checks.push(`✅ ${entries.length} 个任务正常运行中`);
+        }
+      } else {
+        checks.push('✅ 无运行中任务');
+      }
+
       let msg = `🏥 诊断\n${checks.join('\n')}`;
       if (issues > 0) {
         if (bot.sendButtons) {
           const buttons = [];
-          if (hasBak) buttons.push([{ text: '🔧 恢复备份', callback_data: '/fix' }]);
-          buttons.push([{ text: '🔄 重置opus', callback_data: '/reset' }]);
+          if (hasStuck) buttons.push([{ text: '🔧 一键重置卡住任务', callback_data: '/recover' }]);
+          if (hasBak) buttons.push([{ text: '📦 恢复配置备份', callback_data: '/fix' }]);
+          buttons.push([{ text: '🔄 重置模型 opus', callback_data: '/reset' }]);
           await bot.sendButtons(chatId, msg, buttons);
         } else {
-          msg += '\n/fix 恢复备份 /reset 重置opus';
+          msg += '\n/recover 重置卡住任务 /fix 恢复备份 /reset 重置opus';
           await bot.sendMessage(chatId, msg);
         }
       } else {

package/scripts/daemon-agent-commands.js

@@ -21,6 +21,7 @@ function createAgentCommandHandler(deps) {
     getSessionRecentContext,
     pendingBinds,
     pendingAgentFlows,
+    pendingActivations,
     doBindAgent,
     mergeAgentRole,
     agentTools,
@@ -29,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);
@@ -136,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) {
@@ -272,40 +303,7 @@ function createAgentCommandHandler(deps) {
       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;
-        }
-        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');
-        }
-        return true;
-      }
-    }
+    // wizard state machine removed — use natural language to create agents
 
     // /agent edit wait-input flow (kept for command compatibility)
     {
@@ -355,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：', ''];
@@ -373,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);
@@ -432,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);
@@ -457,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);
@@ -472,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());
@@ -485,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 },
     };
   }