evolclaw 3.1.4 → 3.1.6

package/dist/core/command-handler.js

@@ -1,7 +1,6 @@
 import { DEFAULT_PERMISSION_MODE } from '../types.js';
 import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
 import { getCodexEfforts } from '../agents/codex-runner.js';
-import { resolveAnthropicConfig, resolveOpenaiConfig } from '../agents/resolve.js';
 import { renderCommandCardAsText } from './interaction-router.js';
 import { buildEnvelope, sendInteractionPayload } from './message/message-processor.js';
 import { resolvePaths, getPackageRoot } from '../paths.js';
@@ -13,8 +12,33 @@ import os from 'os';
 import { parseTriggerSet, parseTriggerUpdate } from './trigger/parser.js';
 import { calcNextFireAt } from './trigger/scheduler.js';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../utils/npm-ops.js';
+import { tryParseChannelKey } from './channel-loader.js';
 const allEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
 const nonMaxEfforts = allEfforts.filter(e => e !== 'max' && e !== 'xhigh');
+// ── CLI 透传（menu.action name=cli action=exec）─────────────────────────
+// 经消息通道的远程命令执行（RCE）：仅 owner、白名单内只读+配置命令、无 shell、超时+截断。
+// command → '*'(全部子命令放行) | Set(允许的子命令)。
+// 刻意排除破坏性/进程控制/数据面：restart stop start init dev mv rpc msg group net、
+//   agent set/new/delete/enable/disable/rename/reload、aid new/delete/agentmd、storage 写操作。
+const CLI_EXEC_WHITELIST = {
+    status: '*',
+    model: '*',
+    agent: new Set(['list', 'show', 'get']),
+    aid: new Set(['list', 'show', 'lookup']),
+    storage: new Set(['ls', 'quota']),
+};
+const CLI_EXEC_TIMEOUT_MS = 15_000;
+const CLI_EXEC_MAX_OUTPUT = 128 * 1024;
+/** 把命令行字符串分词为 argv，尊重单/双引号，不调用 shell。 */
+function tokenizeArgv(line) {
+    const out = [];
+    const re = /"([^"]*)"|'([^']*)'|(\S+)/g;
+    let m;
+    while ((m = re.exec(line)) !== null) {
+        out.push(m[1] ?? m[2] ?? m[3] ?? '');
+    }
+    return out;
+}
 function getAvailableEfforts(agent, model) {
     if (agent.name === 'claude') {
         return allEfforts;
@@ -27,33 +51,13 @@ function getAvailableEfforts(agent, model) {
 function formatModelUsage(_agent, _model) {
     return '用法: /model <模型>';
 }
-function getModelListSource(owning, agent) {
-    const codexConfig = owning?.config?.baseagents?.codex;
-    const claudeConfig = owning?.config?.baseagents?.claude;
-    if (agent.name === 'codex') {
-        let resolved = {};
-        try {
-            resolved = resolveOpenaiConfig({ agents: { codex: codexConfig } }, codexConfig);
-        }
-        catch { }
-        return {
-            apiBaseUrl: resolved.baseUrl,
-            apiKey: resolved.apiKey,
-            fallbackModels: agent.listModels?.() || [],
-            owner: 'openai',
-        };
-    }
-    let resolved = {};
-    try {
-        resolved = resolveAnthropicConfig({ agents: { claude: claudeConfig } }, claudeConfig);
-    }
-    catch { }
-    return {
-        apiBaseUrl: resolved.baseUrl,
-        apiKey: resolved.apiKey,
-        fallbackModels: ['claude-opus-4-7', 'claude-opus-4-6', 'claude-sonnet-4-6'],
-        owner: 'anthropic',
-    };
+/**
+ * 模型展示标签：短别名 + 实际完整 ID（如 "opus (claude-opus-4-8)"）。
+ * 仅用于展示；命令值/持久化仍使用短别名。完整 ID 不可用或与短名相同时只显示短名。
+ */
+function modelDisplayLabel(agent, model) {
+    const full = agent.resolveModelId?.(model);
+    return full && full !== model ? `${model} (${full})` : model;
 }
 /**
  * 写入用户级 ~/.claude/settings.json（与 Claude CLI 行为一致）
@@ -225,33 +229,6 @@ export class CommandHandler {
             return owning.projectPath;
         return process.cwd();
     }
-    /**
-     * 返回当前通道有效的 projects.list（从 owning agent 的 config 取）。
-     * 都没配 list 时回退到 defaultPath 单项目。
-     */
-    getEffectiveProjects(channel) {
-        const owning = this.getOwningAgent(channel);
-        if (owning) {
-            return owning.getProjects();
-        }
-        return this.projects;
-    }
-    /**
-     * 添加项目到当前通道范围（写到 owning agent 的 config.json）。
-     */
-    async addProjectInScope(channel, name, projectPath) {
-        const owning = this.getOwningAgent(channel);
-        if (!owning) {
-            return `⚠️ 找不到通道 "${channel}" 所属的 self-agent`;
-        }
-        try {
-            owning.addProject(name, projectPath);
-        }
-        catch (e) {
-            return `⚠️ 写入 agent config 失败: ${e?.message || e}`;
-        }
-        return undefined;
-    }
     /**
      * 持久化 baseagent.model：写到 agent config.json；找不到 owning agent 时
      * 退到用户级 ~/.claude/settings.json（Claude 专用）。
@@ -400,7 +377,7 @@ export class CommandHandler {
         return { matched: true, result: '✓ 已回答' };
     }
     /** 获取活跃会话，无会话时自动创建（话题除外） */
-    async ensureSession(channel, channelId, threadId, chatType) {
+    async ensureSession(channel, channelId, threadId, chatType, selfAID) {
         if (threadId) {
             // 话题会话：仅查询，不创建
             const session = await this.sessionManager.getThreadSession(channel, channelId, threadId);
@@ -411,8 +388,9 @@ export class CommandHandler {
         }
         const ct = chatType === 'group' ? 'group' : chatType === 'private' ? 'private' : undefined;
         const channelType = this.resolveChannelType(channel);
+        const sid = selfAID ?? this.resolveSelfAID(channel);
         const session = await this.sessionManager.getActiveSession(channel, channelId)
-            ?? await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, ct, undefined, undefined, channelType);
+            ?? await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, ct, undefined, sid, channelType);
         // 如果 session 已存在但 chatType 跟传入的不一致，更新
         if (ct && session.chatType !== ct) {
             await this.sessionManager.updateSession(session.id, { chatType: ct });
@@ -447,6 +425,14 @@ export class CommandHandler {
     resolveChannelType(channelName) {
         return this.channelTypeMap.get(channelName) || channelName;
     }
+    /**
+     * 从 channel key（<type>#<selfAID>#<name>）解析本地身份 AID。
+     * 非 evolagent 通道（裸 channelType，如 'feishu'）解析失败返回 undefined。
+     * aun 通道创建 session 时必须提供 selfAID，故所有 getOrCreateSession 调用都经此兜底。
+     */
+    resolveSelfAID(channel) {
+        return tryParseChannelKey(channel)?.selfAID;
+    }
     registerPolicy(channelName, policy) {
         this.policies.set(channelName, policy);
     }
@@ -619,13 +605,6 @@ export class CommandHandler {
             }
             return items;
         }
-        if (cmd === '/p') {
-            // Use agent-scoped project list: agent-owned channels see their agent.json's
-            // projects.list; default channel sees agent config's projects.list
-            const list = this.getEffectiveProjects(channel);
-            const currentPath = session?.projectPath;
-            return Object.entries(list).map(([name, p]) => ({ value: name, label: name, desc: p, selected: currentPath === p }));
-        }
         if (cmd === '/baseagent') {
             const currentAgent = session?.agentId;
             return this.getAvailableBaseagents(channel).map(name => ({ value: name, label: name, selected: name === currentAgent }));
@@ -636,7 +615,7 @@ export class CommandHandler {
                 const models = await agent.listModels() ?? [];
                 const currentModel = agent.getModel();
                 if (models.length > 0)
-                    return models.map((m) => ({ value: m, label: m, selected: m === currentModel }));
+                    return models.map((m) => ({ value: m, label: modelDisplayLabel(agent, m), selected: m === currentModel }));
             }
             return null;
         }
@@ -1044,7 +1023,7 @@ export class CommandHandler {
                     env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
                 }).unref();
                 this.eventBus.publish({ type: 'system:restart', channel, channelId });
-                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 500);
+                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
                 return { data: { action: 'restart', success: true } };
             }
             if (action === 'check') {
@@ -1057,8 +1036,96 @@ export class CommandHandler {
             }
             return { error: `不支持的 system action: ${action}`, code: 'NOT_SUPPORTED' };
         }
+        // ── /cli 透传 ──
+        if (cmdBase === '/cli') {
+            if (action !== 'exec')
+                return { error: `不支持的 cli action: ${action}`, code: 'NOT_SUPPORTED' };
+            if (identity.role !== 'owner')
+                return { error: '无权限：CLI 执行仅限 owner', code: 'NO_PERMISSION' };
+            const argv = Array.isArray(args?.argv) ? args.argv.map((x) => String(x))
+                : typeof args?.command === 'string' ? tokenizeArgv(args.command)
+                    : null;
+            if (!argv || argv.length === 0)
+                return { error: '缺少 argv 或 command', code: 'MISSING_VALUE' };
+            const allowed = CLI_EXEC_WHITELIST[argv[0]];
+            if (!allowed)
+                return { error: `命令不在白名单: ${argv[0]}`, code: 'NOT_ALLOWED' };
+            if (allowed !== '*' && !allowed.has(argv[1] ?? '')) {
+                return { error: `子命令不在白名单: ${argv[0]} ${argv[1] ?? ''}`, code: 'NOT_ALLOWED' };
+            }
+            return await this.execCliPassthrough(argv);
+        }
         return { error: `不支持 action: ${cmdBase}`, code: 'NOT_SUPPORTED' };
     }
+    /**
+     * CLI 透传执行：spawn `node dist/cli/index.js <argv>` 子进程，捕获输出回传。
+     * 不 in-process 调用（CLI handler 用 console.log + process.exit，spawn 行为与终端一致且隔离）。
+     * 调用方已完成 owner 校验与白名单过滤。
+     */
+    async execCliPassthrough(argv) {
+        const { spawn } = await import('child_process');
+        const cliEntry = path.join(getPackageRoot(), 'dist', 'cli', 'index.js');
+        const startedAt = Date.now();
+        return await new Promise((resolve) => {
+            let stdout = '';
+            let stderr = '';
+            let total = 0;
+            let truncated = false;
+            let settled = false;
+            const child = spawn('node', [cliEntry, ...argv], {
+                env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root },
+                windowsHide: true,
+            });
+            const append = (buf, sink) => {
+                if (truncated)
+                    return;
+                const remaining = CLI_EXEC_MAX_OUTPUT - total;
+                if (remaining <= 0) {
+                    truncated = true;
+                    return;
+                }
+                const chunk = buf.length > remaining ? buf.subarray(0, remaining) : buf;
+                total += chunk.length;
+                if (sink === 'out')
+                    stdout += chunk.toString('utf-8');
+                else
+                    stderr += chunk.toString('utf-8');
+                if (buf.length > remaining)
+                    truncated = true;
+            };
+            child.stdout?.on('data', (b) => append(b, 'out'));
+            child.stderr?.on('data', (b) => append(b, 'err'));
+            const timer = setTimeout(() => {
+                if (settled)
+                    return;
+                settled = true;
+                try {
+                    child.kill('SIGKILL');
+                }
+                catch { }
+                logger.warn(`[CommandHandler] cli exec timeout: ${argv.join(' ')}`);
+                resolve({ error: `执行超时（${CLI_EXEC_TIMEOUT_MS / 1000}s）：${argv[0]}`, code: 'TIMEOUT' });
+            }, CLI_EXEC_TIMEOUT_MS);
+            child.on('error', (e) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimeout(timer);
+                resolve({ error: e?.message || String(e), code: 'INTERNAL' });
+            });
+            child.on('close', (exitCode) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimeout(timer);
+                resolve({ data: {
+                        exitCode: exitCode ?? -1,
+                        stdout, stderr, truncated,
+                        durationMs: Date.now() - startedAt,
+                    } });
+            });
+        });
+    }
     /** 把 menu.action 委派给已有 slash 命令处理逻辑，把 OutboundPayload 包成结构化结果。 */
     async delegateAsAction(action, slashCmd, channel, channelId, userId, opts = {}) {
         try {
@@ -1093,16 +1160,16 @@ export class CommandHandler {
         }
     }
     isCommand(content) {
-        return content === '/p' || content === '/s' || quickCommandPrefixes.some(cmd => content.startsWith(cmd));
+        return content === '/s' || quickCommandPrefixes.some(cmd => content.startsWith(cmd));
     }
     /**
      * 主命令处理入口
      */
-    async handle(content, channel, channelId, sendMessage, userId, threadId, chatType, source) {
-        const result = await this._handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source);
+    async handle(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID) {
+        const result = await this._handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID);
         return result;
     }
-    async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source) {
+    async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID) {
         // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
         // 不应覆盖 session 中已有的正确值
         if (source === 'card-trigger')
@@ -1161,12 +1228,12 @@ export class CommandHandler {
         }
         // 空闲检查：某些命令需要等待当前会话空闲
         // 原则：仅对"写/破坏性"形态拦截，纯读/用法提示的无参形态始终放行
-        // - 始终需要 idle（无参即写）：/new /clear /compact /repair /fork
+        // - 始终需要 idle（无参即写）：/clear /compact /repair /fork /new
         // - 仅带参时需要 idle（无参是列表/用法）：/session /baseagent /rewind
         // - /chatmode：在 handler 内部自行做写操作的 idle 检查
         // - /dispatch：在 handler 内部自行做写操作的 idle 检查
         // - /safe：已禁用 no-op，不再要求 idle
-        const idleAlways = ['/new', '/clear', '/compact', '/repair', '/fork'];
+        const idleAlways = ['/clear', '/compact', '/repair', '/fork', '/new'];
         const idleWhenArg = ['/session', '/baseagent', '/rewind'];
         const needsIdle = idleAlways.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' ')) ||
             idleWhenArg.some(cmd => normalizedContent.startsWith(cmd + ' '));
@@ -1176,13 +1243,19 @@ export class CommandHandler {
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                 if (threadSession) {
                     const threadAgent = this.getAgent(channel, threadSession.agentId);
-                    if (threadAgent.hasActiveStream(threadSession.id)) {
+                    const isBusy = threadAgent.hasActiveStream(threadSession.id) ||
+                        this.messageQueue?.isProcessing(threadSession.id);
+                    if (isBusy) {
                         return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
                     }
                 }
             }
-            else if (activeSession && agent.hasActiveStream(activeSession.id)) {
-                return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
+            else if (activeSession) {
+                const isBusy = agent.hasActiveStream(activeSession.id) ||
+                    this.messageQueue?.isProcessing(activeSession.id);
+                if (isBusy) {
+                    return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
+                }
             }
         }
         // 检查是否以 / 开头（可能是命令）
@@ -1436,6 +1509,8 @@ export class CommandHandler {
                         const metadata = permSession.metadata || {};
                         metadata.permissionMode = arg;
                         await this.sessionManager.updateSession(permSession.id, { metadata });
+                        if (source === 'card-trigger')
+                            return null;
                         return { kind: 'command.result', text: `✓ 权限模式已切换为: ${matched.key} (${matched.nameZh})\n${matched.description}` };
                     }
                 }
@@ -1615,6 +1690,8 @@ export class CommandHandler {
             const hasExistingSession = newSession.agentSessionId ? '（恢复已有会话）' : '（新建会话）';
             const projectName = this.getProjectName(session.projectPath);
             let agentSwitchResponse = `✓ 已切换 Agent: ${args}\n  项目: ${projectName}\n  会话: ${newSession.name || '(未命名)'}\n  ${hasExistingSession}`;
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: agentSwitchResponse };
         }
         // /setmodel 命令：返回 JSON 格式的模型列表（供程序解析）
@@ -1627,37 +1704,12 @@ export class CommandHandler {
             const currentModel = hasModelSwitcher(setmodelAgent) ? setmodelAgent.getModel() : setmodelAgent.name;
             const efforts = getAvailableEfforts(setmodelAgent, currentModel);
             const currentEffort = setmodelAgent.getEffort?.() || 'auto';
-            const modelListSource = getModelListSource(this.getOwningAgent(channel), setmodelAgent);
-            let modelListData = null;
-            if (modelListSource.apiBaseUrl) {
-                try {
-                    const modelsUrl = modelListSource.apiBaseUrl.replace(/\/+$/, '') + '/v1/models';
-                    const controller = new AbortController();
-                    const timeout = setTimeout(() => controller.abort(), 5000);
-                    const resp = await fetch(modelsUrl, {
-                        signal: controller.signal,
-                        headers: { 'Authorization': `Bearer ${modelListSource.apiKey || ''}` },
-                    });
-                    clearTimeout(timeout);
-                    if (resp.ok) {
-                        modelListData = await resp.json();
-                    }
-                }
-                catch { }
-            }
-            // 兜底模型列表
-            if (!modelListData || !modelListData.data || modelListData.data.length === 0) {
-                const now = Math.floor(Date.now() / 1000);
-                modelListData = {
-                    object: 'list',
-                    data: modelListSource.fallbackModels.map(id => ({
-                        id,
-                        object: 'model',
-                        created: now,
-                        owned_by: modelListSource.owner,
-                    })),
-                };
-            }
+            const now = Math.floor(Date.now() / 1000);
+            const modelIds = hasModelSwitcher(setmodelAgent) ? await setmodelAgent.listModels() : [];
+            const modelListData = {
+                object: 'list',
+                data: modelIds.map(id => ({ id, object: 'model', created: now, owned_by: setmodelAgent.name === 'codex' ? 'openai' : 'anthropic' })),
+            };
             return { kind: 'command.result', text: JSON.stringify({
                     current_model: currentModel,
                     current_effort: currentEffort,
@@ -1674,7 +1726,7 @@ export class CommandHandler {
                 return { kind: 'command.result', text: modelResult.error };
             const { session: modelSession } = modelResult;
             const modelAgent = this.getAgent(channel, modelSession.agentId);
-            const models = hasModelSwitcher(modelAgent) ? modelAgent.listModels() : [];
+            const models = hasModelSwitcher(modelAgent) ? await modelAgent.listModels() : [];
             if (!args) {
                 const currentModel = hasModelSwitcher(modelAgent) ? modelAgent.getModel() : modelAgent.name;
                 const efforts = getAvailableEfforts(modelAgent, currentModel);
@@ -1690,12 +1742,15 @@ export class CommandHandler {
                         kind: {
                             kind: 'command-card',
                             title: '🤖 切换模型',
-                            buttons: models.map((m) => ({
-                                label: m === currentModel ? `✓ ${m}` : m,
-                                command: `/model ${m}`,
-                                style: (m === currentModel ? 'primary' : 'default'),
-                                disabled: m === currentModel,
-                            })),
+                            buttons: models.map((m) => {
+                                const display = modelDisplayLabel(modelAgent, m);
+                                return {
+                                    label: m === currentModel ? `✓ ${display}` : display,
+                                    command: `/model ${m}`,
+                                    style: (m === currentModel ? 'primary' : 'default'),
+                                    disabled: m === currentModel,
+                                };
+                            }),
                         },
                     };
                     const replyCtx = this.getReplyContext(modelSession);
@@ -1705,14 +1760,14 @@ export class CommandHandler {
                     return { kind: 'command.result', text: cardResult };
                 }
                 // 降级：文本
-                const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${m}`).join('\n');
+                const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${modelDisplayLabel(modelAgent, m)}`).join('\n');
                 const effortHint = efforts.length > 0
                     ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
                     : '';
                 if (isAdmin) {
-                    return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n用法: /model <模型>` };
+                    return { kind: 'command.result', text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}\n\n可用模型：\n${modelList}\n\n用法: /model <模型>` };
                 }
-                return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}` };
+                return { kind: 'command.result', text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}` };
             }
             // 带参（切换/调整）需 admin+；无参查询已在上方返回
             if (!isAdmin)
@@ -1732,20 +1787,29 @@ export class CommandHandler {
                 else if (allEfforts.includes(arg)) {
                     return { kind: 'command.error', text: `⚠️ 请使用 /effort ${arg} 调整推理强度` };
                 }
-                else if (models.includes(arg)) {
-                    newModel = arg;
-                }
                 else {
-                    const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${m}`).join('\n');
-                    const effortHint = efforts.length > 0 ? `\n\n推理强度请使用 /effort 命令` : '';
-                    return { kind: 'command.error', text: `❌ 无效参数: ${arg}\n\n可用模型：\n${modelList}${effortHint}` };
+                    const resolvedArg = hasModelSwitcher(modelAgent) ? (modelAgent.resolveModelId?.(arg) ?? arg) : arg;
+                    if (models.includes(resolvedArg)) {
+                        newModel = resolvedArg;
+                    }
+                    else if (models.includes(arg)) {
+                        newModel = arg;
+                    }
+                    else {
+                        const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${modelDisplayLabel(modelAgent, m)}`).join('\n');
+                        const effortHint = efforts.length > 0 ? `\n\n推理强度请使用 /effort 命令` : '';
+                        return { kind: 'command.error', text: `❌ 无效参数: ${arg}\n\n可用模型：\n${modelList}${effortHint}` };
+                    }
                 }
             }
             else {
                 // 双参数：model effort
-                const [modelArg, effortArg] = parts;
+                const [modelArgRaw, effortArg] = parts;
+                const modelArg = hasModelSwitcher(modelAgent)
+                    ? (models.includes(modelArgRaw) ? modelArgRaw : (modelAgent.resolveModelId?.(modelArgRaw) ?? modelArgRaw))
+                    : modelArgRaw;
                 if (!models.includes(modelArg)) {
-                    return { kind: 'command.error', text: `❌ 无效的模型ID: ${modelArg}` };
+                    return { kind: 'command.error', text: `❌ 无效的模型ID: ${modelArgRaw}` };
                 }
                 const targetEfforts = getAvailableEfforts(modelAgent, modelArg);
                 if (targetEfforts.length === 0) {
@@ -1786,6 +1850,8 @@ export class CommandHandler {
                 if (err)
                     return { kind: 'command.result', text: `${err}\n已更新运行时配置，但未持久化` };
             }
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: `✓ 已切换\n  ${changes.join('\n  ')}` };
         }
         // /effort 命令：查看或切换推理强度
@@ -1860,6 +1926,8 @@ export class CommandHandler {
             const err = this.persistBaseagentEffort(channel, effortAgent.name, newEffort);
             if (err)
                 return { kind: 'command.result', text: `${err}\n已更新运行时配置，但未持久化` };
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: `✓ 推理强度: ${newEffort}` };
         }
         // /agent, /aid, /rpc, /storage — 仅限 ctl 调用，slash 输入拒绝
@@ -1946,6 +2014,8 @@ export class CommandHandler {
             else {
                 return { kind: 'command.error', text: `⚠️ 找不到通道 "${channel}" 所属的 self-agent，无法持久化` };
             }
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: `✅ 中间输出模式: ${activityArg}（${label}）` };
         }
         // /chatmode 命令：查看/切换 session 会话模式（interactive | proactive）
@@ -2016,16 +2086,18 @@ export class CommandHandler {
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                 if (threadSession) {
                     const threadAgent = this.getAgent(channel, threadSession.agentId);
-                    if (threadAgent.hasActiveStream(threadSession.id)) {
+                    if (threadAgent.hasActiveStream(threadSession.id) || this.messageQueue?.isProcessing(threadSession.id)) {
                         return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
                     }
                 }
             }
-            else if (agent.hasActiveStream(chatmodeSession.id)) {
+            else if (agent.hasActiveStream(chatmodeSession.id) || this.messageQueue?.isProcessing(chatmodeSession.id)) {
                 return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
             }
             await this.sessionManager.updateSession(chatmodeSession.id, { sessionMode: arg });
             this.eventBus.publish({ type: 'session:chat-mode-changed', sessionId: chatmodeSession.id, mode: arg, timestamp: Date.now() });
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: `✅ 会话模式已切换: ${arg}` };
         }
         // /dispatch 命令：查看/切换群聊分发模式（mention | broadcast）
@@ -2091,6 +2163,8 @@ export class CommandHandler {
             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() });
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: `✅ 分发模式已切换: ${currentMode ?? '未设置'} → ${arg}` };
         }
         // /stop 命令：中断当前任务
@@ -2185,15 +2259,16 @@ export class CommandHandler {
         }
         // 尝试获取活跃会话（话题时直接查找话题 session）
         let session;
+        const resolvedSelfAID = selfAID ?? this.resolveSelfAID(channel);
         if (threadId) {
-            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId, undefined, undefined, undefined, chatType, undefined, undefined, this.resolveChannelType(channel));
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId, undefined, undefined, undefined, chatType, undefined, resolvedSelfAID, this.resolveChannelType(channel));
         }
         else {
             session = await this.sessionManager.getActiveSession(channel, channelId);
         }
         // 如果没有会话，自动创建（所有后续命令都需要 session）
         if (!session) {
-            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, chatType, undefined, undefined, this.resolveChannelType(channel));
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, chatType, undefined, resolvedSelfAID, this.resolveChannelType(channel));
         }
         // /status 命令：显示会话状态
         if (normalizedContent === '/status') {
@@ -2400,7 +2475,7 @@ export class CommandHandler {
             const executeRestart = async () => {
                 let replyContext;
                 if (threadId) {
-                    const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId);
+                    const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId, undefined, undefined, undefined, undefined, undefined, selfAID ?? this.resolveSelfAID(channel), this.resolveChannelType(channel));
                     replyContext = this.getReplyContext(threadSession);
                 }
                 const restartInfo = {
@@ -2417,6 +2492,27 @@ export class CommandHandler {
                     env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
                 }).unref();
                 this.eventBus.publish({ type: 'system:restart', channel, channelId });
+                // 先发送重启反馈消息，等待发送完成后再 kill 进程
+                // 避免消息还没发出去进程就退出了
+                const adapter = this.adapters.get(channel);
+                if (adapter) {
+                    try {
+                        const envelope = buildEnvelope({
+                            taskId: `restart-${Date.now()}`,
+                            channel,
+                            channelId,
+                            agentName: 'system',
+                            chatmode: 'interactive',
+                            replyContext,
+                        });
+                        await adapter.send(envelope, { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' });
+                        // 等待消息发送完成后再延迟 kill
+                        await new Promise(resolve => setTimeout(resolve, 500));
+                    }
+                    catch (err) {
+                        logger.error('[System] Failed to send restart notification:', err);
+                    }
+                }
                 // 发 SIGTERM 而非直接 process.exit(0)，让 index.ts 的 shutdown() 先
                 // 正常关闭所有 channel（包括 Feishu WebSocket close frame），
                 // 避免 Feishu 服务端因连接异常断开而重推未 ack 的消息给新进程。
@@ -2447,7 +2543,8 @@ export class CommandHandler {
                 }
             }
             await executeRestart();
-            return { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' };
+            // executeRestart 内部已经发送了反馈消息，这里返回 null 避免重复发送
+            return null;
         }
         // /upgrade 命令：检查版本更新，提示用户手动重启
         if (normalizedContent === '/upgrade') {
@@ -2651,7 +2748,7 @@ export class CommandHandler {
             }
             // /slist — 仅显示 EvolClaw 会话
             const sessions = await this.sessionManager.listSessions(channel, channelId);
-            const currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId);
+            const currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId && !s.threadId?.startsWith('trigger-'));
             // 从 SDK 同步会话名称（发现 CLI 改名）
             try {
                 const sdkSessions = await this.sessionManager.listSdkSessions(session.projectPath, session.agentId);
@@ -2829,6 +2926,8 @@ export class CommandHandler {
                 if (!switched) {
                     return { kind: 'command.error', text: `❌ 切换会话失败` };
                 }
+                if (source === 'card-trigger')
+                    return null;
                 return { kind: 'command.result', text: `✓ 已切换到会话: ${targetSession.name || sessionName}\n  项目: ${path.basename(targetSession.projectPath)}${lastInputLine}` };
             }
             if (targetSession.id === session.id) {
@@ -2844,6 +2943,8 @@ export class CommandHandler {
             }
             this.eventBus.publish({ type: 'session:switched', sessionId: targetSession.id, fromSessionId: session.id, toSessionId: targetSession.id });
             const continueHint = lastInput ? '\n  将继续之前的对话历史' : '\n  当前会话未有发言';
+            if (source === 'card-trigger')
+                return null;
             return { kind: 'command.result', text: `✓ 已切换到会话: ${targetSession.name || sessionName}${continueHint}${lastInputLine}` };
         }
         // /rename 或 /name 命令：重命名当前会话
@@ -3030,12 +3131,12 @@ export class CommandHandler {
         }
         // /trigger 命令
         if (normalizedContent === '/trigger' || normalizedContent.startsWith('/trigger ')) {
-            const text = this.handleTrigger(normalizedContent, channel, channelId, userId ?? '', isAdmin);
+            const text = await this.handleTrigger(normalizedContent, channel, channelId, userId ?? '', isAdmin, messageId);
             return { kind: 'command.result', text };
         }
         return null;
     }
-    handleTrigger(content, channel, channelId, peerId, isAdmin) {
+    async handleTrigger(content, channel, channelId, peerId, isAdmin, messageId) {
         // Resolve trigger manager/scheduler from the owning agent of this channel
         const owningAgent = this.getOwningAgent(channel);
         const scheduler = (owningAgent?.triggerScheduler ?? this.triggerScheduler);
@@ -3166,6 +3267,7 @@ export class CommandHandler {
                 nextFireAt,
                 targetChannel: parsed.targetChannel ?? channel,
                 targetChannelId: parsed.targetChannelId ?? channelId,
+                targetChannelType: this.resolveChannelType(parsed.targetChannel ?? channel),
                 targetThreadId: parsed.targetThreadId,
                 targetSessionStrategy: parsed.targetSessionStrategy,
                 agentId: parsed.agentId,
@@ -3177,6 +3279,32 @@ export class CommandHandler {
                 updatedAt: now,
             };
             try {
+                // Strategy-based session binding
+                if (parsed.targetSessionStrategy === 'current') {
+                    const active = await this.sessionManager.getActiveSession(channel, channelId);
+                    if (!active)
+                        return '❌ 当前没有活跃会话，改用 --session latest 或 thread';
+                    trigger.boundSessionId = active.id;
+                }
+                else if (parsed.targetSessionStrategy === 'thread') {
+                    const targetAdapterName = parsed.targetChannel ?? channel;
+                    const adapter = this.adapters.get(targetAdapterName);
+                    if (!adapter?.capabilities.thread)
+                        return '❌ 目标渠道不支持 thread 会话';
+                    const channelType = adapter.channelKey.split('#')[0];
+                    trigger.targetChannelType = channelType;
+                    if (channelType === 'aun') {
+                        trigger.threadKind = 'aun';
+                        trigger.targetThreadId = `trigger-${trigger.id}`;
+                    }
+                    else {
+                        if (!messageId)
+                            return '❌ 飞书 thread 模式需要消息 ID，请重新发送命令';
+                        trigger.threadKind = 'feishu';
+                        trigger.rootMessageId = messageId;
+                        trigger.pendingThread = true;
+                    }
+                }
                 // Validate name uniqueness before persisting (manager.register writes to disk)
                 // scheduler.register is in-memory only and cannot fail, so order is safe here.
                 // If manager.register throws (duplicate name/ID), nothing is persisted.