evolclaw 3.1.5 → 3.1.6

package/dist/channels/feishu.js

@@ -283,7 +283,8 @@ export class FeishuChannel {
                         else if (msg.message_type === 'merge_forward') {
                             const { text: mergedText, images: mergedImages } = await this.extractMergeForwardContent(msg.message_id, msg.chat_id);
                             if (mergedText) {
-                                const finalContent = quotedText + mergedText;
+                                // 直接发送合并转发时，parent_id 指向自己，引用解析会把相同内容填入 quotedText 导致重复，丢弃
+                                const finalContent = mergedText;
                                 const allImages = [...quotedImages, ...mergedImages];
                                 await this.messageHandler({ channelId: msg.chat_id, content: finalContent, images: allImages.length > 0 ? allImages : undefined, peerId, peerName, messageId: msg.message_id, threadId, rootId, chatType });
                             }
@@ -513,10 +514,15 @@ export class FeishuChannel {
                 if (options.replyInThread) {
                     replyData.reply_in_thread = true;
                 }
-                await this.client.im.message.reply({
+                const replyRes = await this.client.im.message.reply({
                     path: { message_id: options.replyToMessageId },
                     data: replyData
                 });
+                if (options.replyInThread && options.onThreadCreated) {
+                    const newThreadId = replyRes?.data?.thread_id;
+                    if (newThreadId)
+                        options.onThreadCreated(newThreadId);
+                }
             }
             else {
                 await this.client.im.message.create({
@@ -710,13 +716,18 @@ export class FeishuChannel {
             // seenThreads 无时间戳，仅限容量（话题持久存在，不按时间清理）
             if (this.seenThreads.size > 1000)
                 this.seenThreads.clear();
-            // 重写文件，去掉过期条目
-            if (this.config.seenMsgFile && this.seenMessages.size > 0) {
+            // 重写文件，去掉过期条目（仅在有记录被清理时才写）
+            if (cleaned > 0 && this.config.seenMsgFile) {
                 try {
-                    const lines = [...this.seenMessages.entries()]
-                        .map(([id, ts]) => JSON.stringify({ id, ts }))
-                        .join('\n') + '\n';
-                    fs.writeFileSync(this.config.seenMsgFile, lines);
+                    if (this.seenMessages.size === 0) {
+                        fs.unlinkSync(this.config.seenMsgFile);
+                    }
+                    else {
+                        const lines = [...this.seenMessages.entries()]
+                            .map(([id, ts]) => JSON.stringify({ id, ts }))
+                            .join('\n') + '\n';
+                        fs.writeFileSync(this.config.seenMsgFile, lines);
+                    }
                 }
                 catch { }
             }
@@ -1196,6 +1207,15 @@ export function buildResolvedV2(interaction, response) {
         });
         bodyElements.push({ tag: 'markdown', content: lines.join('\n') });
     }
+    // CommandCard: 显示原有按钮列表（保留上下文）
+    if (kind.kind === 'command-card' && kind.buttons?.length) {
+        const lines = kind.buttons.map(btn => {
+            const prefix = btn.command === action ? '✓' : '•';
+            const cleanLabel = btn.label.replace(/^✓\s*/, '');
+            return `${prefix} ${cleanLabel}`;
+        });
+        bodyElements.push({ tag: 'markdown', content: lines.join('\n') });
+    }
     return {
         toast: { type: 'success', content: statusText },
         card: {
@@ -1403,7 +1423,7 @@ export class FeishuChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true },
+                capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true, thread: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
                     const channelId = envelope.channelId;
@@ -1417,6 +1437,8 @@ export class FeishuChannelPlugin {
                             const sendCtx = { ...(ctx ?? {}) };
                             if (payload.kind === 'result.text' && payload.isFinal)
                                 sendCtx.title = '✅ 最终回复:';
+                            if (ctx?.metadata?.onThreadCreated)
+                                sendCtx.onThreadCreated = ctx.metadata.onThreadCreated;
                             await channel.sendMessage(channelId, payload.text, sendCtx);
                             return;
                         }

package/dist/channels/qqbot.js

@@ -335,7 +335,7 @@ export class QQBotChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
+                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
                     const channelId = envelope.channelId;

package/dist/channels/wechat.js

@@ -731,7 +731,7 @@ export class WechatChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true },
+                capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true, thread: false },
                 send: async (envelope, payload) => {
                     const channelId = envelope.channelId;
                     switch (payload.kind) {

package/dist/channels/wecom.js

@@ -491,7 +491,7 @@ export class WecomChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
+                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
                     const channelId = envelope.channelId;

package/dist/cli/agent.js

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import os from 'os';
 import readline from 'readline';
 import { resolvePaths, agentMdPath as getAgentMdPathFromPaths, aunPath as defaultAunPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, loadAgent, saveAgent, ensureAgentDirSkeleton } from '../config-store.js';
@@ -11,11 +10,6 @@ import { commandExists } from '../utils/cross-platform.js';
 import { isCodexSdkAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
-const BASEAGENT_ENV_KEY = {
-    claude: 'ANTHROPIC_API_KEY',
-    codex: 'OPENAI_API_KEY',
-    gemini: 'GEMINI_API_KEY',
-};
 function isBaseagentAvailable(baseagent) {
     if (baseagent === 'codex')
         return isCodexSdkAvailable();
@@ -30,8 +24,7 @@ function pickDefaultBaseagent(available) {
     return available.includes('claude') ? 'claude' : available[0];
 }
 function buildBaseagentsBlock(chosen) {
-    const env = BASEAGENT_ENV_KEY[chosen];
-    return { [chosen]: env ? { apiKey: `$ENV:${env}` } : {} };
+    return { [chosen]: {} };
 }
 const DEFAULT_CHATMODE = { private: 'interactive', group: 'proactive', nothuman: 'proactive' };
 const DEFAULT_DISPATCH = 'mention';
@@ -296,11 +289,11 @@ export async function agentCreateInteractive(opts = {}) {
             const defaults = loadDefaults();
             const rootPath = defaults?.projects?.rootPath
                 || (defaults?.projects?.defaultPath && path.dirname(defaults.projects.defaultPath))
-                || path.join(os.homedir(), 'evolclaw-projects');
+                || resolvePaths().root + '/projects';
             suggestedProjectPath = deriveAgentProjectPath(rootPath, aid);
         }
         catch {
-            suggestedProjectPath = deriveAgentProjectPath(path.join(os.homedir(), 'evolclaw-projects'), aid);
+            suggestedProjectPath = deriveAgentProjectPath(resolvePaths().root + '/projects', aid);
         }
         const projectInput = (await ask(`Project path [${suggestedProjectPath}]: `)).trim();
         const projectPath = projectInput || suggestedProjectPath;
@@ -633,7 +626,7 @@ export async function agentSyncAids() {
     const defaults = loadDefaults();
     const rootPath = defaults?.projects?.rootPath
         || (defaults?.projects?.defaultPath && path.dirname(defaults.projects.defaultPath))
-        || path.join(os.homedir(), 'evolclaw-projects');
+        || resolvePaths().root + '/projects';
     const created = [];
     for (const aid of localAids) {
         if (existingAids.has(aid))
@@ -761,6 +754,12 @@ export async function agentSet(aid, key, rawValue) {
         return { ok: false, error: `Failed to read config: ${e?.message || e}` };
     }
     const value = parseJsonValue(rawValue);
+    // active_baseagent 白名单校验：只允许已知 baseagent，挡住把模型名（如 deepseek）误设为后端
+    if (key === 'active_baseagent') {
+        if (typeof value !== 'string' || !BASEAGENT_CANDIDATES.includes(value)) {
+            return { ok: false, error: `无效 active_baseagent: ${JSON.stringify(value)}（可选: ${BASEAGENT_CANDIDATES.join(' / ')}）` };
+        }
+    }
     setNestedValue(config, key, value);
     try {
         saveAgent(config);

package/dist/cli/bench.js

@@ -8,7 +8,7 @@ import { aidList, aidCreate } from '../aun/aid/identity.js';
 import { msgSend, msgPull } from '../aun/msg/index.js';
 import { getPackageRoot, aunPath as defaultAunPath } from '../paths.js';
 import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
-import { isHelpFlag } from './help.js';
+import { isHelpFlag, getArgValue } from './help.js';
 const execFileAsync = promisify(execFile);
 // ==================== ANSI ====================
 const GREEN = '\x1b[32m';
@@ -132,10 +132,6 @@ function percentile(sorted, p) {
     const idx = Math.ceil((p / 100) * sorted.length) - 1;
     return sorted[Math.max(0, idx)];
 }
-function getArgValue(args, flag) {
-    const idx = args.indexOf(flag);
-    return idx >= 0 && idx + 1 < args.length ? args[idx + 1] : undefined;
-}
 // ==================== Promise Pool ====================
 function withTimeout(promise, ms, label) {
     return new Promise((resolve, reject) => {

package/dist/cli/help.js

@@ -21,3 +21,11 @@ export function wantsHelp(args) {
             return true;
     return false;
 }
+/**
+ * 取出 `--flag <value>` 形式的参数值。
+ * flag 不存在或其后无值时返回 undefined。
+ */
+export function getArgValue(args, flag) {
+    const idx = args.indexOf(flag);
+    return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+}

package/dist/cli/index.js

@@ -11,7 +11,7 @@ import { migrateProject } from '../config-store.js';
 import { cmdInit } from './init.js';
 import { ipcQuery } from '../ipc.js';
 import { cmdInitWechat, cmdInitFeishu, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom } from './init-channel.js';
-import { isHelpFlag, wantsHelp } from './help.js';
+import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
 import { tryUpgrade, tryUpgradeAunSdk } from '../utils/npm-ops.js';
@@ -292,6 +292,13 @@ async function cmdStart() {
     // 旧配置自动迁移（evolclaw.json → 新结构）
     const { autoMigrateIfNeeded } = await import('../config-store.js');
     autoMigrateIfNeeded();
+    // 未初始化时自动引导
+    const defaults = loadDefaults();
+    if (!defaults || !defaults.baseagents || Object.keys(defaults.baseagents).length === 0) {
+        console.log('⚡ 未检测到初始化配置，自动启动初始化向导...\n');
+        await cmdInit();
+        return;
+    }
     // 检查至少有一个 self-agent
     const { agents, skipped } = loadAllAgents();
     if (agents.length === 0) {
@@ -313,7 +320,7 @@ async function cmdStart() {
     const aliveMains = status.mains.filter(m => m.alive);
     if (aliveMains.length > 0) {
         const first = aliveMains[0];
-        console.log(`❌ EvolClaw is already running (PID: ${aliveMains.map(m => m.record.pid).join(', ')})`);
+        console.log(`  EvolClaw is already running (PID: ${aliveMains.map(m => m.record.pid).join(', ')})`);
         console.log(`  启动于: ${new Date(first.record.startedAtIso).toLocaleString()}`);
         console.log(`  启动方式: ${first.record.launchedBy}`);
         // 报告 AID 状态
@@ -371,14 +378,7 @@ async function cmdStart() {
     const checkReady = () => {
         // ready signal 出现（优先检查，避免 Windows 上误判进程状态）
         if (fs.existsSync(p.readySignal)) {
-            const pkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'package.json'), 'utf-8'));
-            let aunVer = 'unknown';
-            try {
-                const aunPkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'node_modules', '@agentunion', 'fastaun', 'package.json'), 'utf-8'));
-                aunVer = aunPkg.version;
-            }
-            catch { /* ignore */ }
-            console.log(`✓ EvolClaw v${pkg.version} started successfully (PID: ${childPid})  fastaun v${aunVer}`);
+            console.log(`✓ EvolClaw started successfully (PID: ${childPid})`);
             console.log(`  EVOLCLAW_HOME: ${resolveRoot()}`);
             console.log(`  Logs: ${p.logs}/`);
             // 从主日志提取渠道连接摘要
@@ -495,7 +495,6 @@ async function cmdStop() {
 }
 async function cmdRestart(opts = {}) {
     const cmdStartedAt = Date.now();
-    printStartupInfo();
     console.log('🔄 Restarting EvolClaw...');
     // 版本检查与自动升级
     console.log('📦 Checking for updates...');
@@ -2103,95 +2102,22 @@ async function cmdWatchAid() {
     platform.onShutdown(cleanup);
 }
 async function cmdWatchWeb() {
-    const p = resolvePaths();
-    fs.mkdirSync(p.instanceDir, { recursive: true });
-    const useColor = !!process.stdout.isTTY;
-    const RST = useColor ? '\x1b[0m' : '';
-    const DIM = useColor ? '\x1b[2m' : '';
-    const BOLD = useColor ? '\x1b[1m' : '';
-    const CYAN = useColor ? '\x1b[36m' : '';
-    const GREEN = useColor ? '\x1b[32m' : '';
-    const YELLOW = useColor ? '\x1b[33m' : '';
-    const logLine = (line) => {
-        const t = new Date();
-        const ts = `${String(t.getHours()).padStart(2, '0')}:${String(t.getMinutes()).padStart(2, '0')}:${String(t.getSeconds()).padStart(2, '0')}`;
-        process.stdout.write(`${DIM}${ts}${RST} ${line}\n`);
-    };
-    // 调试日志文件：每次运行 watch web 时清空，便于建立调试闭环
-    // 查看 sessions 调试日志 → 读这个文件
-    const logFile = path.join(p.logs, 'watch-web.log');
-    try {
-        fs.mkdirSync(p.logs, { recursive: true });
-        fs.writeFileSync(logFile, `# watch-web debug log\n# started ${new Date().toISOString()} pid=${process.pid}\n`);
-    }
-    catch { /* best effort */ }
-    const fileLog = (line) => {
-        const t = new Date();
-        const ts = `${String(t.getHours()).padStart(2, '0')}:${String(t.getMinutes()).padStart(2, '0')}:${String(t.getSeconds()).padStart(2, '0')}.${String(t.getMilliseconds()).padStart(3, '0')}`;
+    // ecweb 是独立插件包（可执行命令），按需安装。
+    // 复用 npm-ops.npmInstallGlobal（含 EACCES→sudo 回退、Windows npm.cmd、超时）。
+    const { execFileSync } = await import('child_process');
+    const home = resolvePaths().root;
+    if (!platform.commandExists('ecweb')) {
+        process.stdout.write('📦 ecweb 未安装，正在从 npm 安装...\n');
+        const { npmInstallGlobal } = await import('../utils/npm-ops.js');
         try {
-            fs.appendFileSync(logFile, `${ts} ${line.replace(/\x1b\[[0-9;]*m/g, '')}\n`);
+            await npmInstallGlobal('ecweb');
         }
-        catch { /* ignore */ }
-    };
-    // 同时输出到终端和日志文件
-    const log = (line) => { logLine(line); fileLog(line); };
-    const { startWatchWebServer } = await import('./watch-web/server.js');
-    let handle;
-    try {
-        handle = await startWatchWebServer({ log });
-    }
-    catch (e) {
-        console.error(`❌ 启动 Web 服务失败: ${e?.message || e}`);
-        process.exit(1);
-    }
-    // 注册 instance 文件
-    const instanceFile = path.join(p.instanceDir, `watch-web-${process.pid}.json`);
-    fs.writeFileSync(instanceFile, JSON.stringify({
-        pid: process.pid, startedAt: Date.now(), startedAtIso: new Date().toISOString(),
-        type: 'watch-web', port: handle.port,
-    }, null, 2));
-    // 列出本机访问地址
-    const os = await import('os');
-    const ifaces = os.networkInterfaces();
-    const lanIps = [];
-    for (const list of Object.values(ifaces)) {
-        for (const ni of list || []) {
-            if (ni.family === 'IPv4' && !ni.internal)
-                lanIps.push(ni.address);
-        }
-    }
-    process.stdout.write(`\n${BOLD}${CYAN}🔭 EvolClaw Watch Web${RST}\n\n`);
-    process.stdout.write(`  ${BOLD}配对码:${RST}  ${GREEN}${BOLD}${handle.pairingCode}${RST}  ${DIM}(5 分钟内有效，配对后 token 缓存 24h 自动续期)${RST}\n\n`);
-    process.stdout.write(`  ${BOLD}本机:${RST}    http://localhost:${handle.port}\n`);
-    for (const ip of lanIps) {
-        process.stdout.write(`  ${BOLD}局域网:${RST}  http://${ip}:${handle.port}\n`);
-    }
-    process.stdout.write(`\n  ${DIM}绑定 0.0.0.0，远程可访问。按任意键退出。${RST}\n`);
-    process.stdout.write(`  ${DIM}调试日志: ${logFile}${RST}\n\n`);
-    const cleanup = () => {
-        try {
-            fs.unlinkSync(instanceFile);
+        catch (e) {
+            process.stderr.write(`❌ 安装 ecweb 失败: ${e?.stderr || e?.message || e}\n   可手动安装: npm install -g ecweb\n`);
+            process.exit(1);
         }
-        catch { }
-        handle.close().finally(() => process.exit(0));
-    };
-    process.on('exit', () => { try {
-        fs.unlinkSync(instanceFile);
-    }
-    catch { } });
-    process.on('SIGINT', cleanup);
-    process.on('SIGTERM', cleanup);
-    platform.onShutdown(cleanup);
-    // 按任意键退出
-    if (process.stdin.isTTY) {
-        process.stdin.setRawMode(true);
-        process.stdin.resume();
-        process.stdin.on('data', (key) => {
-            logLine(`${YELLOW}收到退出指令，关闭服务…${RST}`);
-            cleanup();
-        });
     }
-    await new Promise(() => { });
+    execFileSync('ecweb', ['--home', home], { stdio: 'inherit' });
 }
 async function cmdRestartMonitor() {
     const p = resolvePaths();
@@ -2719,8 +2645,6 @@ async function cmdMv(oldDir, newDir) {
             console.log('✓ 项目目录已移动');
         if (r.evolclawDbUpdated > 0)
             console.log(`✓ EvolClaw 会话存储已更新 (${r.evolclawDbUpdated} 条记录)`);
-        if (r.evolclawConfigUpdated)
-            console.log('✓ agent config projects.list 已更新');
         console.log('\n迁移完成！');
     }
     catch (e) {
@@ -2894,7 +2818,7 @@ Agent:
 // ==================== Agent ====================
 async function cmdAgent(args) {
     const sub = args[0];
-    const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
+    const formatJson = getArgValue(args, '--format') === 'json';
     if (!sub || isHelpFlag(sub)) {
         console.log(`用法: evolclaw agent <command>
 
@@ -3469,7 +3393,7 @@ function resolveAunPath(args) {
 }
 async function cmdAid(args) {
     const sub = args[0];
-    const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
+    const formatJson = getArgValue(args, '--format') === 'json';
     const aunPath = resolveAunPath(args);
     if (!sub || isHelpFlag(sub)) {
         console.log(`用法: evolclaw aid <command>
@@ -3970,6 +3894,10 @@ async function cmdRpc(args) {
 
 每行 JSON 格式: {"method":"<namespace.method>","params":{...}}
 
+Options:
+  --app <name>   指定应用 slot（独立消费通道）。仅对 message.pull / group.pull
+                 等消费类方法有意义——隔离 seq 游标与消息过滤；默认与 daemon 共享通道。
+
 示例:
   evolclaw rpc --as alice.agentid.pub --params '{"method":"message.send","params":{"to":"bob.agentid.pub","payload":{"type":"text","text":"hello"}}}'
   evolclaw rpc --as alice.agentid.pub --params calls.jsonl`);
@@ -3978,6 +3906,7 @@ async function cmdRpc(args) {
     const asIdx = args.indexOf('--as');
     const paramsIdx = args.indexOf('--params');
     const aunPath = resolveAunPath(args);
+    const appSlot = getArgValue(args, '--app');
     if (asIdx === -1 || asIdx + 1 >= args.length) {
         console.error('❌ 缺少 --as <aid>');
         process.exit(1);
@@ -4022,11 +3951,11 @@ async function cmdRpc(args) {
     }
     const { rpcCall, rpcBatch } = await import('../aun/rpc/index.js');
     if (calls.length === 1) {
-        const result = await rpcCall(aid, calls[0].method, calls[0].params, { aunPath });
+        const result = await rpcCall(aid, calls[0].method, calls[0].params, { aunPath, slotId: appSlot });
         console.log(JSON.stringify(result));
     }
     else {
-        const results = await rpcBatch(aid, calls, { aunPath });
+        const results = await rpcBatch(aid, calls, { aunPath, slotId: appSlot });
         for (const r of results) {
             console.log(JSON.stringify(r));
         }
@@ -4036,7 +3965,7 @@ async function cmdRpc(args) {
 async function cmdStorage(args) {
     const sub = args[0];
     const aunPath = resolveAunPath(args);
-    const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
+    const formatJson = getArgValue(args, '--format') === 'json';
     if (!sub || isHelpFlag(sub)) {
         console.log(`用法: evolclaw storage <command> <aid> [options]
 
@@ -4183,7 +4112,7 @@ Commands:
 async function cmdMsg(args) {
     const sub = args[0];
     const aunPath = resolveAunPath(args);
-    const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
+    const formatJson = getArgValue(args, '--format') === 'json';
     const appIdx = args.indexOf('--app');
     const appSlot = appIdx >= 0 ? args[appIdx + 1] : undefined;
     if (!sub || isHelpFlag(sub)) {
@@ -4207,6 +4136,8 @@ Options:
   --content-type <mime> 显式覆盖 MIME（仅 --file 模式）
   --text <说明>          附件说明文字（仅 --file 模式）
   --transcript <text>   语音转写（仅 --as voice）
+  --                    end-of-options：其后所有参数按正文处理
+                        （用于发送恰好等于某 flag 的文本，如 send a b -- --encrypt）
 
 示例:
   evolclaw msg send alice.agentid.pub bob.agentid.pub "hello"
@@ -4465,7 +4396,7 @@ Options:
 async function cmdGroup(args) {
     const sub = args[0];
     const aunPath = resolveAunPath(args);
-    const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
+    const formatJson = getArgValue(args, '--format') === 'json';
     const appIdx = args.indexOf('--app');
     const appSlot = appIdx >= 0 ? args[appIdx + 1] : undefined;
     if (!sub || isHelpFlag(sub)) {
@@ -4496,8 +4427,11 @@ async function cmdGroup(args) {
 Options:
   --app <name>          指定应用 slot（独立消费通道，不影响 daemon）
   --format json         输出 JSON 格式
-  --mention <aid>       发送时 @ 某个成员（可多次）
+  --encrypt             启用端到端加密（仅 send）
+  --mention <aid>       发送时 @ 某个成员（可多次，或用逗号分隔多个 aid）
   --mention-all         发送时 @ 所有人
+  --                    end-of-options：其后所有参数按正文处理
+                        （用于发送恰好等于某 flag 的文本，如 send a g -- --encrypt）
 
 示例:
   evolclaw group create alice.agentid.pub "Dev Team" --visibility private
@@ -4529,12 +4463,23 @@ Options:
         }
         return gid;
     };
-    // 收集 --mention（可多次）
+    // 收集 --mention（可多次；每次的值支持逗号分隔多个 aid）
     const collectMentions = () => {
         const mentions = [];
-        for (let i = 0; i < args.length - 1; i++) {
-            if (args[i] === '--mention') {
-                mentions.push({ aid: args[i + 1] });
+        for (let i = 0; i < args.length; i++) {
+            if (args[i] !== '--mention')
+                continue;
+            const val = args[i + 1];
+            if (val === undefined || val.startsWith('--')) {
+                console.error(`❌ --mention 后面缺少 <aid>`);
+                process.exit(1);
+            }
+            for (const aid of val.split(',').map(s => s.trim()).filter(Boolean)) {
+                if (!isValidAid(aid)) {
+                    console.error(`❌ --mention 的 aid 无效: ${aid}`);
+                    process.exit(1);
+                }
+                mentions.push({ aid });
             }
         }
         if (args.includes('--mention-all')) {
@@ -4828,32 +4773,50 @@ Options:
     process.exit(1);
 }
 // ==================== Main ====================
-function getArgValue(args, flag) {
-    const idx = args.indexOf(flag);
-    return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
-}
 /**
- * 收集位置参数（从 startIdx 开始），跳过 flag 及其值。
- * 已知"取值"的 flag 会消耗下一个 arg；已知"开关"的 flag 只占自身。
+ * 收集位置参数（从 startIdx 开始）。
+ *
+ * flag 判定采用**精确匹配已知 flag 集合**，而非 `startsWith('--')`——
+ * 这样"正文恰好以 -- 开头"（如消息文本 `--file 坏了`）不会被误当 flag 吞掉。
+ * 仅当 token 精确等于某个已知 flag 时才按 flag 处理：
+ *   - VALUE_FLAGS：消耗自身 + 下一个 arg（flag 的值）
+ *   - BOOLEAN_FLAGS：仅消耗自身
+ * 其余以 -- 开头但不在集合中的 token，一律视为正文。
+ *
+ * 另支持 POSIX `--` end-of-options 分隔符：遇到单独的 `--` 后，
+ * 其后所有 token 无条件按正文处理（用于发送精确等于某 flag 的文本，如 `-- --encrypt`）。
  */
+const VALUE_FLAGS = new Set([
+    '--format', '--app', '--after-seq', '--limit', '--file', '--link',
+    '--payload', '--title', '--description', '--text', '--transcript',
+    '--as', '--content-type', '--mention', '--visibility', '--join-mode',
+    '--group-id', '--name', '--message', '--answer', '--page', '--size',
+    '--aun-path', '--thread',
+]);
+const BOOLEAN_FLAGS = new Set([
+    '--encrypt', '--mention-all',
+]);
 function collectPositional(args, startIdx) {
-    const VALUE_FLAGS = new Set([
-        '--format', '--app', '--after-seq', '--limit', '--file', '--link',
-        '--payload', '--title', '--description', '--text', '--transcript',
-        '--as', '--content-type', '--mention', '--visibility', '--join-mode',
-        '--group-id', '--name', '--message', '--answer', '--page', '--size',
-        '--aun-path',
-    ]);
     const out = [];
+    let endOfFlags = false;
     for (let i = startIdx; i < args.length; i++) {
         const a = args[i];
-        if (a.startsWith('--')) {
-            if (VALUE_FLAGS.has(a))
-                i++; // 跳过 flag 的值
-            // else: 开关 flag，自身已被跳过
+        if (endOfFlags) {
+            out.push(a);
+            continue;
+        }
+        if (a === '--') {
+            endOfFlags = true;
             continue;
         }
-        out.push(a);
+        if (VALUE_FLAGS.has(a)) {
+            i++;
+            continue;
+        } // 精确匹配取值 flag：跳过其值
+        if (BOOLEAN_FLAGS.has(a)) {
+            continue;
+        } // 精确匹配开关 flag：仅跳过自身
+        out.push(a); // 其余（含以 -- 开头的未知 token）= 正文
     }
     return out;
 }