evolclaw 3.0.0 → 3.1.1

package/dist/config-store.js

@@ -75,8 +75,62 @@ export function loadDefaults() {
     return expandEnvRefs(raw);
 }
 export function saveDefaults(value) {
+    backupDefaults(resolvePaths().defaultsConfig);
     atomicWriteJson(resolvePaths().defaultsConfig, value);
 }
+/**
+ * 备份 defaults.json 为 defaults_YYYYMMDDhhmmss.json。文件不存在时为 no-op。
+ * 同秒重复调用会被覆盖（同一秒内的内容相同，可接受）。
+ */
+function backupDefaults(filePath) {
+    if (!fs.existsSync(filePath))
+        return;
+    const now = new Date();
+    const ts = now.getFullYear().toString()
+        + String(now.getMonth() + 1).padStart(2, '0')
+        + String(now.getDate()).padStart(2, '0')
+        + String(now.getHours()).padStart(2, '0')
+        + String(now.getMinutes()).padStart(2, '0')
+        + String(now.getSeconds()).padStart(2, '0');
+    const backupPath = path.join(path.dirname(filePath), `defaults_${ts}.json`);
+    try {
+        fs.copyFileSync(filePath, backupPath);
+    }
+    catch (e) {
+        logger.warn(`[config] backup failed: ${backupPath}: ${e}`);
+    }
+}
+/**
+ * 安全写入 defaults.json：备份现有文件 → 深合并 patch → 原子写入。
+ *
+ * 与 saveDefaults() 不同，本函数保留现有字段，仅覆盖 patch 中显式指定的字段。
+ * 适用场景：evolclaw init 仅修改 active_baseagent/baseagents 时，不应丢失 chatmode/projects 等其它字段。
+ */
+export function saveDefaultsSafe(patch) {
+    const p = resolvePaths().defaultsConfig;
+    let existing = null;
+    try {
+        existing = atomicReadJson(p);
+    }
+    catch (e) {
+        logger.warn(`[config] existing defaults.json unparsable, will be backed up and replaced: ${e}`);
+    }
+    fs.mkdirSync(path.dirname(p), { recursive: true });
+    backupDefaults(p);
+    const merged = existing
+        ? deepMergeObject(existing, patch)
+        : { $schema_version: CONFIG_SCHEMA_VERSION, ...patch };
+    atomicWriteJson(p, merged);
+}
+export function loadProcessConfig() {
+    const raw = atomicReadJson(resolvePaths().processConfig);
+    if (raw === null)
+        return {};
+    return expandEnvRefs(raw);
+}
+export function saveProcessConfig(value) {
+    atomicWriteJson(resolvePaths().processConfig, value);
+}
 // ── 自动迁移 ───────────────────────────────────────────────────────────
 /**
  * 启动时自动迁移：如果 agents/defaults.json 不存在但 data/evolclaw.json 存在，
@@ -455,21 +509,44 @@ export function ensureAgentDirSkeleton(aid) {
     const root = agentDir(aid);
     const subs = [
         'personal',
-        'identities/contacts',
-        'identities/_observed',
-        'identities/_index',
-        'identities/_observed/_index',
-        'identities/_trash',
+        'personal/memory',
+        'personal/skills',
+        'relations/contacts',
+        'relations/_observed',
+        'relations/_observed/_index',
+        'relations/_index',
+        'relations/_trash',
         'venues',
         'venues/_index',
         'venues/_trash',
         'sessions',
         'data/cache',
+        'index',
     ];
     for (const sub of subs) {
         fs.mkdirSync(path.join(root, sub), { recursive: true });
     }
 }
+// ── identities → relations 迁移 ──────────────────────────────────────
+/**
+ * 启动时自动迁移：如果 agents/<aid>/identities/ 存在但 relations/ 不存在，
+ * 将 identities/ 重命名为 relations/。幂等。
+ */
+export function migrateIdentitiesIfNeeded() {
+    const agentsDir = resolvePaths().agentsDir;
+    if (!fs.existsSync(agentsDir))
+        return;
+    for (const entry of fs.readdirSync(agentsDir, { withFileTypes: true })) {
+        if (!entry.isDirectory())
+            continue;
+        const oldDir = path.join(agentsDir, entry.name, 'identities');
+        const newDir = path.join(agentsDir, entry.name, 'relations');
+        if (fs.existsSync(oldDir) && !fs.existsSync(newDir)) {
+            fs.renameSync(oldDir, newDir);
+            logger.info(`[migrate] Renamed agents/${entry.name}/identities/ → relations/`);
+        }
+    }
+}
 // ── Project Migration ────────────────────────────────────────────────────────
 import os from 'os';
 /** 将绝对路径编码为 Claude Code 的目录名格式（/ \ . 替换为 -） */

package/dist/core/channel-loader.js

@@ -89,23 +89,36 @@ export class ChannelLoader {
         }
         return instances;
     }
-    async connectAll(instances, delayMs = 150) {
+    async connectAll(instances, { concurrency = 3, intervalMs = 50 } = {}) {
         const connected = [];
         const failed = [];
+        const inflight = new Set();
         for (const inst of instances) {
-            try {
-                await inst.connect();
-                connected.push(inst.adapter.channelName);
-            }
-            catch (e) {
-                failed.push(e);
+            // 等待并发数降到 concurrency 以下
+            while (inflight.size >= concurrency) {
+                await Promise.race(inflight);
             }
-            if (delayMs > 0 && inst !== instances[instances.length - 1]) {
-                await new Promise(r => setTimeout(r, delayMs));
+            const task = (async () => {
+                try {
+                    await inst.connect();
+                    connected.push(inst.adapter.channelName);
+                }
+                catch (e) {
+                    failed.push({ name: inst.adapter.channelName, error: e });
+                    logger.warn(`[connectAll] ${inst.adapter.channelName} connect failed: ${e}`);
+                }
+            })();
+            const tracked = task.then(() => { inflight.delete(tracked); });
+            inflight.add(tracked);
+            // 间隔发起，避免瞬间并发冲击网关
+            if (intervalMs > 0) {
+                await new Promise(r => setTimeout(r, intervalMs));
             }
         }
+        // 等待所有剩余任务完成
+        await Promise.allSettled(inflight);
         if (failed.length > 0) {
-            logger.warn(`Some channels failed to connect:`, failed);
+            logger.warn(`[connectAll] ${failed.length} channel(s) failed initial connect (will retry in background): ${failed.map(f => f.name).join(', ')}`);
         }
         return connected;
     }

package/dist/core/command-handler.js

@@ -8,8 +8,9 @@ import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
-import { parseTriggerSet } from './trigger/parser.js';
+import { parseTriggerSet, parseTriggerUpdate } from './trigger/parser.js';
 import { calcNextFireAt } from './trigger/scheduler.js';
+import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../utils/npm-ops.js';
 const allEfforts = ['low', 'medium', 'high', 'max'];
 const nonMaxEfforts = allEfforts.filter(e => e !== 'max');
 function getAvailableEfforts(agent, model) {
@@ -23,17 +24,8 @@ function getAvailableEfforts(agent, model) {
     }
     return [];
 }
-function formatModelUsage(agent, model) {
-    const efforts = getAvailableEfforts(agent, model);
-    const lines = [
-        '用法:',
-        '  /model <模型>            切换模型',
-    ];
-    if (efforts.length > 0) {
-        lines.push('  /model <模型> <强度>     切换模型+推理强度');
-        lines.push('  /effort [level]          查看或切换推理强度');
-    }
-    return lines.join('\n');
+function formatModelUsage(_agent, _model) {
+    return '用法: /model <模型>';
 }
 /**
  * 写入用户级 ~/.claude/settings.json（与 Claude CLI 行为一致）
@@ -108,7 +100,7 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger'];
+const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger', '/upgrade'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -117,7 +109,7 @@ const aliases = {
     '/rw': '/rewind'
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger'];
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger', '/upgrade'];
 export class CommandHandler {
     sessionManager;
     messageCache;
@@ -340,9 +332,6 @@ export class CommandHandler {
             return renderCommandCardAsText(card);
         if (!adapter?.send)
             return renderCommandCardAsText(card);
-        // session 忙碌时降级到文本，避免并发触发带参写操作
-        if (this.isSessionBusy(opts.interaction.sessionId))
-            return renderCommandCardAsText(card);
         try {
             const envelope = buildEnvelope({
                 channel: opts.channel,
@@ -382,14 +371,6 @@ export class CommandHandler {
         });
         return { matched: true, result: '✓ 已回答' };
     }
-    /** 判断指定 session 是否有活跃流（用于 idle 守卫和卡片降级） */
-    isSessionBusy(sessionId) {
-        for (const agent of this.agentMap.values()) {
-            if (agent.hasActiveStream(sessionId))
-                return true;
-        }
-        return false;
-    }
     /** 获取活跃会话，无会话时自动创建（话题除外） */
     async ensureSession(channel, channelId, threadId, chatType) {
         if (threadId) {
@@ -526,7 +507,7 @@ export class CommandHandler {
                             ] } },
                     { cmd: '/dispatch', label: '切换分发模式', desc: '控制群聊消息过滤（仅@提及或广播响应）', next: { type: 'select', items: [
                                 { value: 'mention', label: '@ 提及', desc: '仅在被 @ 提及时响应' },
-                                { value: 'all', label: '广播', desc: '响应群内所有消息' },
+                                { value: 'broadcast', label: '广播', desc: '响应群内所有消息' },
                             ] } },
                 ]
             });
@@ -694,14 +675,14 @@ export class CommandHandler {
             return { data: { mode: arg } };
         }
         if (cmdBase === '/dispatch') {
-            const currentMode = session.metadata?.dispatchMode || 'mention';
+            const currentMode = session.metadata?.dispatchMode;
             if (mode === 'query') {
-                return { data: { mode: currentMode } };
+                return { data: { mode: currentMode ?? null } };
             }
             // update
             if (!arg)
                 return { error: '缺少目标模式' };
-            if (arg !== 'mention' && arg !== 'all')
+            if (arg !== 'mention' && arg !== 'broadcast')
                 return { error: `无效模式: ${arg}` };
             const identity = this.sessionManager.resolveIdentity(channel, userId);
             const chatType = session.chatType || 'private';
@@ -893,7 +874,7 @@ export class CommandHandler {
                 '💬 聊天设置：',
                 '  /activity [all|dm|owner|none] - 查看/控制中间输出显示模式',
                 '  /chatmode [interactive|proactive] - 查看/切换会话模式（被动响应或主动推进）',
-                '  /dispatch [mention|all] - 查看/切换群聊分发模式（仅@响应或广播响应，仅群聊）',
+                '  /dispatch [mention|broadcast] - 查看/切换群聊分发模式（仅@响应或广播响应，仅群聊）',
                 '',
                 '🔐 权限管理：',
                 '  /perm - 查看当前权限模式',
@@ -970,7 +951,7 @@ export class CommandHandler {
             // 聊天设置
             if (isAdmin) {
                 cmds.push({ command: '/chatmode', args: '[interactive|proactive]', description: '查看/切换会话模式（被动响应或主动推进）', category: '聊天设置', roles: ['admin', 'owner'] });
-                cmds.push({ command: '/dispatch', args: '[mention|all]', description: '查看/切换群聊分发模式（仅@响应或广播响应）', category: '聊天设置', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/dispatch', args: '[mention|broadcast]', description: '查看/切换群聊分发模式（仅@响应或广播响应）', category: '聊天设置', roles: ['admin', 'owner'] });
             }
             // 交互
             cmds.push({ command: '/ask', args: '<选项>', description: '回答 Agent 的交互式问题', category: '运维', roles: ['guest', 'admin', 'owner'] });
@@ -1029,9 +1010,9 @@ export class CommandHandler {
                     return `  ${prefix} ${m.key} (${m.nameZh}) - ${m.description}${suffix}`;
                 }).join('\n');
                 if (isOwner) {
-                    return { kind: 'command.result', text: `🔐 当前权限模式: ${currentMode}\n\n${modeList}\n\n用法:\n  /perm <模式>              切换权限模式\n  /perm allow|always|deny   审批权限请求` };
+                    return { kind: 'command.result', text: `权限模式: ${currentMode}\n\n${modeList}\n\n用法: /perm <模式> 或 allow|always|deny` };
                 }
-                return { kind: 'command.result', text: `🔐 当前权限模式: ${currentMode}` };
+                return { kind: 'command.result', text: `当前权限模式: ${currentMode}` };
             }
             const parts = args.split(/\s+/);
             // /perm <mode> 或 /perm allow|always|deny：切换模式 / 快捷审批
@@ -1235,7 +1216,7 @@ export class CommandHandler {
                 const list = available.map(a => `${a === currentAgent ? ' ✓' : '  '} ${a}`).join('\n');
                 const canSwitchAgent = activeChatType === 'group' ? isOwner : isAdmin;
                 if (canSwitchAgent) {
-                    return { kind: 'command.result', text: `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n\n用法: /agent <name>` };
+                    return { kind: 'command.result', text: `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n用法: /agent <name>` };
                 }
                 return { kind: 'command.result', text: `当前 Agent: ${currentAgent}` };
             }
@@ -1373,7 +1354,7 @@ export class CommandHandler {
                     ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
                     : '';
                 if (isAdmin) {
-                    return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n${formatModelUsage(modelAgent, currentModel)}` };
+                    return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n用法: /model <模型>` };
                 }
                 return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}` };
             }
@@ -1494,12 +1475,11 @@ export class CommandHandler {
                 }
                 // 降级：文本
                 const effortDisplay = currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort;
-                const allItems = [...efforts, 'auto'];
-                const effortList = allItems.map(e => `  ${e === currentEffort ? '✓' : ' '} ${e}${e === 'auto' ? ' (SDK默认)' : ''}`).join('\n');
+                const effortOptions = [...efforts, 'auto'].join(' / ');
                 if (isAdmin) {
-                    return { kind: 'command.result', text: `⚡ 推理强度: ${effortDisplay}\n\n可选:\n${effortList}\n\n用法: /effort <level>` };
+                    return { kind: 'command.result', text: `推理强度: ${effortDisplay}  可选: ${effortOptions}  用法: /effort <level>` };
                 }
-                return { kind: 'command.result', text: `⚡ 推理强度: ${effortDisplay}` };
+                return { kind: 'command.result', text: `推理强度: ${effortDisplay}` };
             }
             // 带参（切换）需 admin+；无参查询已在上方返回
             if (!isAdmin)
@@ -1534,9 +1514,7 @@ export class CommandHandler {
                 return { kind: 'command.error', text: '❌ 无权限：此命令仅限 owner 使用' };
             // 无参数时返回用法说明
             if (normalizedContent === '/aid') {
-                return { kind: 'command.result', text: `🆔 AID 身份管理
-
-用法:
+                return { kind: 'command.result', text: `用法:
   /aid list              列出本地所有 AID
   /aid show <aid>        查看 AID 详情
   /aid new <aid>         创建新 AID
@@ -1546,27 +1524,16 @@ export class CommandHandler {
   /aid agentmd get <aid> 下载并验签 agent.md` };
             }
             if (normalizedContent === '/rpc') {
-                return { kind: 'command.result', text: `📡 AUN RPC 调用
-
-用法:
-  /rpc --as <aid> --params <json>
-
-参数格式:
-  单行 JSON    单次调用
-  多行 JSONL   逐行执行，失败即停
-
-示例:
-  /rpc --as myaid.agentid.pub --params {"method":"meta.ping","params":{}}` };
+                return { kind: 'command.result', text: `用法: /rpc --as <aid> --params <json>
+示例: /rpc --as myaid.agentid.pub --params {"method":"meta.ping","params":{}}` };
             }
             if (normalizedContent === '/storage') {
-                return { kind: 'command.result', text: `📦 文件存储
-
-用法:
-  /storage upload <aid> <file> <path> [--public]   上传文件
-  /storage download <aid> <url> [local-path]       下载文件
-  /storage ls <aid> [prefix]                       列文件
-  /storage rm <aid> <path>                         删文件
-  /storage quota <aid>                             查配额` };
+                return { kind: 'command.result', text: `用法:
+  /storage upload <aid> <file> <path> [--public]
+  /storage download <aid> <url> [local-path]
+  /storage ls <aid> [prefix]
+  /storage rm <aid> <path>
+  /storage quota <aid>` };
             }
             const cliArgs = normalizedContent.slice(1); // strip leading /
             try {
@@ -1644,9 +1611,9 @@ export class CommandHandler {
                     return `  ${prefix} ${m.key} — ${m.label}`;
                 }).join('\n');
                 if (isOwner) {
-                    return { kind: 'command.result', text: [`📋 中间输出模式: ${currentMode}`, '', modeList, '', '用法: /activity <all|dm|owner|none>'].join('\n') };
+                    return { kind: 'command.result', text: `中间输出: ${currentMode}  用法: /activity <all|dm|owner|none>` };
                 }
-                return { kind: 'command.result', text: `📋 中间输出模式: ${currentMode}` };
+                return { kind: 'command.result', text: `中间输出: ${currentMode}` };
             }
             const newMode = modeMap[activityArg];
             if (!newMode) {
@@ -1678,8 +1645,12 @@ export class CommandHandler {
             const arg = normalizedContent.slice(9).trim();
             const currentMode = chatmodeSession.sessionMode || 'interactive';
             const chatmodeChatType = chatmodeSession.chatType || activeChatType;
-            const canSwitch = chatmodeChatType !== 'group' || isAdmin;
+            const isGroup = chatmodeChatType === 'group';
+            const canSwitch = !isGroup;
             if (!arg) {
+                if (isGroup) {
+                    return { kind: 'command.result', text: `📋 会话模式: proactive（群聊强制）` };
+                }
                 // 尝试发送 CommandCard 卡片
                 if (canSwitch) {
                     const modes = [
@@ -1712,23 +1683,16 @@ export class CommandHandler {
                 }
                 // 降级：文本
                 if (canSwitch) {
-                    return { kind: 'command.result', text: [
-                            `📋 会话模式: ${currentMode}`,
-                            '',
-                            '模式说明：',
-                            '  • interactive — 交互模式：收到消息时才回复，回复直接显示',
-                            '  • proactive   — 主动模式：流式输出静默，由 Agent 自调 ctl send 发声',
-                            '',
-                            '用法: /chatmode <interactive|proactive>',
-                        ].join('\n') };
-                }
-                return { kind: 'command.result', text: `📋 会话模式: ${currentMode}` };
+                    return { kind: 'command.result', text: `会话模式: ${currentMode}  用法: /chatmode <interactive|proactive>` };
+                }
+                return { kind: 'command.result', text: `会话模式: ${currentMode}` };
             }
             if (arg !== 'interactive' && arg !== 'proactive') {
                 return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: interactive / proactive` };
             }
-            if ((chatmodeSession.chatType || activeChatType) === 'group' && !isAdmin) {
-                return { kind: 'command.error', text: '❌ 无权限：群聊中切换会话模式仅限管理员使用' };
+            // 群聊强制 proactive，不可切换
+            if ((chatmodeSession.chatType || activeChatType) === 'group') {
+                return { kind: 'command.error', text: '❌ 群聊强制 proactive 模式，不可切换' };
             }
             if (arg === currentMode) {
                 return { kind: 'command.result', text: `📋 当前会话模式已是 ${arg}` };
@@ -1750,7 +1714,7 @@ export class CommandHandler {
             this.eventBus.publish({ type: 'session:chat-mode-changed', sessionId: chatmodeSession.id, mode: arg, timestamp: Date.now() });
             return { kind: 'command.result', text: `✅ 会话模式已切换: ${arg}` };
         }
-        // /dispatch 命令：查看/切换群聊分发模式（mention | all）
+        // /dispatch 命令：查看/切换群聊分发模式（mention | broadcast）
         // 仅群聊可用；群聊中设置需管理员权限
         if (normalizedContent === '/dispatch' || normalizedContent.startsWith('/dispatch ')) {
             const dispatchResult = await this.ensureSession(channel, channelId, threadId, chatType);
@@ -1762,13 +1726,14 @@ export class CommandHandler {
                 return { kind: 'command.error', text: '❌ /dispatch 仅在群聊中可用' };
             }
             const arg = normalizedContent.slice(9).trim();
-            const currentMode = dispatchSession.metadata?.dispatchMode || 'mention';
+            const currentMode = dispatchSession.metadata?.dispatchMode;
             if (!arg) {
+                const displayMode = currentMode ?? '未设置（跟随群设置）';
                 // 尝试发送 CommandCard 卡片
                 if (isAdmin) {
                     const modes = [
                         { key: 'mention', name: '提及模式', desc: '仅当被 @ 提及（含 @all）时响应群消息' },
-                        { key: 'all', name: '广播模式', desc: '群内所有消息都触发响应' },
+                        { key: 'broadcast', name: '广播模式', desc: '群内所有消息都触发响应' },
                     ];
                     const interaction = {
                         type: 'interaction',
@@ -1795,31 +1760,24 @@ export class CommandHandler {
                     // 卡片降级：fall through 到下方文本输出
                 }
                 // 降级：文本
-                const lines = [];
-                lines.push(`📋 分发模式: ${currentMode}`);
-                lines.push('');
-                lines.push('模式说明：');
-                lines.push('  • mention — 提及模式：仅当被@提及时响应群消息(含@all)');
-                lines.push('  • all     — 广播模式：群内所有消息都触发响应');
                 if (isAdmin) {
-                    lines.push('');
-                    lines.push('用法: /dispatch <mention|all>');
+                    return { kind: 'command.result', text: `分发模式: ${displayMode}  用法: /dispatch <mention|broadcast>` };
                 }
-                return { kind: 'command.result', text: lines.join('\n') };
+                return { kind: 'command.result', text: `分发模式: ${displayMode}` };
             }
-            if (arg !== 'mention' && arg !== 'all') {
-                return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: mention / all\n用法: /dispatch <模式>` };
+            if (arg !== 'mention' && arg !== 'broadcast') {
+                return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: mention / broadcast\n用法: /dispatch <模式>` };
             }
             if (!isAdmin) {
                 return { kind: 'command.error', text: '❌ 无权限：群聊中切换分发模式仅限管理员使用' };
             }
             if (arg === currentMode) {
-                return { kind: 'command.result', text: `📋 当前已是 ${arg}` };
+                return { kind: 'command.result', text: `当前已是 ${arg}` };
             }
             const metadata = { ...(dispatchSession.metadata || {}), dispatchMode: arg };
             await this.sessionManager.updateSession(dispatchSession.id, { metadata });
             this.eventBus.publish({ type: 'session:dispatch-mode-changed', sessionId: dispatchSession.id, mode: arg, timestamp: Date.now() });
-            return { kind: 'command.result', text: `✅ 分发模式已切换: ${currentMode} → ${arg}` };
+            return { kind: 'command.result', text: `✅ 分发模式已切换: ${currentMode ?? '未设置'} → ${arg}` };
         }
         // /stop 命令：中断当前任务
         if (normalizedContent === '/stop') {
@@ -1970,7 +1928,7 @@ export class CommandHandler {
             }
             const lines = [];
             const sessionMode = session.sessionMode || 'interactive';
-            const dispatchMode = session.metadata?.dispatchMode || 'mention';
+            const dispatchMode = session.metadata?.dispatchMode ?? '未设置（跟随群设置）';
             const chatModeLine = `会话模式: ${sessionMode}`;
             const dispatchModeLine = session.chatType === 'group' ? `分发模式: ${dispatchMode}` : null;
             if (isAdmin) {
@@ -2218,6 +2176,23 @@ export class CommandHandler {
             await executeRestart();
             return { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' };
         }
+        // /upgrade 命令：检查版本更新，提示用户手动重启
+        if (normalizedContent === '/upgrade') {
+            if (!isAdmin)
+                return { kind: 'command.error', text: '❌ 无权限：升级检查仅限管理员使用' };
+            if (isLinkedInstall()) {
+                return { kind: 'command.result', text: '⏭ 开发模式，跳过升级检查' };
+            }
+            const localVer = getLocalVersion();
+            const remoteVer = await checkLatestVersion();
+            if (!remoteVer) {
+                return { kind: 'command.result', text: `⚠️ 无法连接 npm registry（当前版本 ${localVer}）` };
+            }
+            if (compareVersions(localVer, remoteVer) >= 0) {
+                return { kind: 'command.result', text: `✓ 已是最新版本 (${localVer})` };
+            }
+            return { kind: 'command.result', text: `📦 发现新版本 ${localVer} → ${remoteVer}\n执行 /restart 升级` };
+        }
         // /pwd 命令：显示当前项目路径
         if (normalizedContent === '/pwd') {
             // session 现在总是存在（上面已自动创建）
@@ -3093,6 +3068,45 @@ export class CommandHandler {
             this.eventBus.publish({ type: 'trigger:cancelled', triggerId: trigger.id, by: peerId });
             return `✅ 触发器已取消：**${trigger.name}**`;
         }
+        // /trigger update <name|id> [--参数...]
+        if (sub.startsWith('update ')) {
+            if (!manager || !scheduler)
+                return '⚠️ 触发器功能未启用';
+            const args = sub.slice('update '.length);
+            const result = parseTriggerUpdate(args);
+            if (!result.ok)
+                return `❌ ${result.error}`;
+            const { nameOrId, value: patch } = result;
+            // Find trigger: non-admin lookup is scoped
+            let trigger;
+            if (isAdmin) {
+                trigger = manager.getByName(nameOrId) ?? manager.getById(nameOrId);
+            }
+            else {
+                trigger = manager.getByNameScoped(nameOrId, peerId, channel)
+                    ?? manager.getByIdScoped(nameOrId, peerId, channel);
+            }
+            if (!trigger) {
+                return isAdmin
+                    ? `❌ 未找到触发器：${nameOrId}`
+                    : `❌ 未找到触发器 "${nameOrId}"，或无权限修改`;
+            }
+            // If schedule changed, recalculate nextFireAt
+            if (patch.scheduleType && patch.scheduleValue) {
+                const now = Date.now();
+                patch.nextFireAt = calcNextFireAt(patch.scheduleType, patch.scheduleValue, now);
+            }
+            let updated;
+            try {
+                updated = manager.update(trigger.id, patch);
+                scheduler.update(updated);
+            }
+            catch (err) {
+                return `❌ 更新失败：${err.message}`;
+            }
+            const nextStr = new Date(updated.nextFireAt).toLocaleString();
+            return `✅ 触发器已更新：**${updated.name}**\n下次触发：${nextStr}`;
+        }
         // /trigger set ...
         if (sub.startsWith('set ')) {
             if (!manager || !scheduler)
@@ -3137,7 +3151,7 @@ export class CommandHandler {
             const nextStr = new Date(nextFireAt).toLocaleString();
             return `✅ 触发器已注册：**${name}**\n下次触发：${nextStr}`;
         }
-        return `❌ 未知子命令。用法：\n/trigger — 查看活跃触发器\n/trigger list — 查看所有触发器\n/trigger set <参数> — 注册触发器\n/trigger cancel <名称> — 取消触发器`;
+        return `❌ 未知子命令。用法：\n/trigger — 查看活跃触发器\n/trigger list — 查看所有触发器\n/trigger set <参数> — 注册触发器\n/trigger update <名称|ID> <参数> — 修改触发器\n/trigger cancel <名称> — 取消触发器`;
     }
     // ── /rewind helpers ──
     async handleRewindList(session, agent) {
@@ -3256,7 +3270,8 @@ export class CommandHandler {
         '/help', '/status', '/check', '/pwd',
         '/model', '/effort', '/perm', '/agent',
         '/compact', '/file', '/send', '/restart', '/bind', '/aid', '/rpc', '/storage',
-        '/rename', '/name', '/evolagent',
+        '/rename', '/name', '/evolagent', '/trigger',
+        '/chatmode', '/dispatch', '/activity',
     ];
     /** ctl 中仅允许查询形态的指令；写形态（带参）一律拒绝 */
     static CTL_READONLY = new Set(['/agent']);
@@ -3278,6 +3293,8 @@ export class CommandHandler {
         const taskId = this.sessionManager.getActiveTaskId(session.id);
         const chatmode = session.sessionMode || 'interactive';
         const encrypted = this.sessionManager.getSessionEncrypt(session.id);
+        // 诊断日志：记录 task_id 解析结果
+        logger.info(`[CommandHandler] buildCtlReplyContext: sessionId=${session.id} taskId=${taskId ?? 'none'} chatmode=${chatmode} threadId=${ctx.threadId ?? 'none'}`);
         if (taskId || chatmode !== 'interactive' || encrypted != null) {
             ctx.metadata = {};
             if (taskId)
@@ -3294,6 +3311,7 @@ export class CommandHandler {
      * 复用现有 slash cmd 逻辑，权限继承 session 用户角色
      */
     async handleCtl(cmd, sessionId) {
+        logger.info(`[ctl] cmd="${cmd}" sessionId=${sessionId}`);
         // 1. 白名单检查
         const inputCmd = cmd.split(' ')[0];
         if (!CommandHandler.CTL_COMMANDS.includes(inputCmd)) {
@@ -3354,7 +3372,10 @@ export class CommandHandler {
         }
         // 4. /send 文本消息：直接通过 adapter 主动发送，不走 handle()
         if (cmd.startsWith('/send ') || cmd === '/send') {
-            const text = cmd.startsWith('/send ') ? cmd.slice(6).trim() : '';
+            // 解析 --encrypt 标志和消息文本
+            const raw = cmd.startsWith('/send ') ? cmd.slice(6).trim() : '';
+            const forceEncrypt = raw.startsWith('--encrypt ');
+            const text = forceEncrypt ? raw.slice(10).trim() : raw;
             if (!text)
                 return { ok: false, error: '消息内容不能为空' };
             const adapter = this.adapters.get(session.channel);
@@ -3362,8 +3383,15 @@ export class CommandHandler {
                 return { ok: false, error: `adapter 未找到: ${session.channel}` };
             try {
                 const replyContext = this.buildCtlReplyContext(session);
-                await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: session.channelId, replyContext: replyContext }), { kind: 'result.text', text, isFinal: true });
-                return { ok: true, result: '已发送' };
+                const taskId = replyContext?.metadata?.taskId;
+                const chatmode = replyContext?.metadata?.chatmode ?? 'interactive';
+                // --encrypt 覆盖 session 加密状态
+                const enrichedReplyContext = forceEncrypt
+                    ? { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), encrypted: true } }
+                    : replyContext;
+                await adapter.send(buildEnvelope({ taskId, channel: adapter.channelName, channelId: session.channelId, chatmode, replyContext: enrichedReplyContext }), { kind: 'result.text', text, isFinal: true });
+                // 出方向 jsonl 写入已下沉到 aun.ts:deliverTextEntry，message.send 成功后统一写入。
+                return { ok: true, result: 'ok' };
             }
             catch (err) {
                 return { ok: false, error: err.message || String(err) };