evolclaw 3.1.5 → 3.1.7

package/dist/core/command-handler.js

@@ -12,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;
@@ -204,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 专用）。
@@ -379,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);
@@ -390,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 });
@@ -426,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);
     }
@@ -598,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 }));
@@ -1036,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 {
@@ -1072,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')
@@ -1421,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}` };
                     }
                 }
@@ -1600,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 格式的模型列表（供程序解析）
@@ -1613,7 +1705,7 @@ export class CommandHandler {
             const efforts = getAvailableEfforts(setmodelAgent, currentModel);
             const currentEffort = setmodelAgent.getEffort?.() || 'auto';
             const now = Math.floor(Date.now() / 1000);
-            const modelIds = hasModelSwitcher(setmodelAgent) ? setmodelAgent.listModels() : [];
+            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' })),
@@ -1634,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);
@@ -1758,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 命令：查看或切换推理强度
@@ -1832,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 输入拒绝
@@ -1918,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）
@@ -1998,6 +2096,8 @@ export class CommandHandler {
             }
             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）
@@ -2063,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 命令：中断当前任务
@@ -2157,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') {
@@ -2372,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 = {
@@ -2645,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);
@@ -2823,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) {
@@ -2838,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 命令：重命名当前会话
@@ -3024,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);
@@ -3172,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.

package/dist/core/evolagent.js

@@ -213,24 +213,6 @@ export class EvolAgent {
         this.merged.dispatch = value;
         this.persist();
     }
-    // ── Projects ──────────────────────────────────────────────────────────
-    getProjects() {
-        const list = this.merged.projects?.list;
-        if (list && Object.keys(list).length > 0)
-            return { ...list };
-        const dp = this.merged.projects?.defaultPath;
-        if (dp)
-            return { [path.basename(dp)]: dp };
-        return {};
-    }
-    addProject(name, projectPath) {
-        if (!this.rawAgent.projects)
-            this.rawAgent.projects = { defaultPath: projectPath, list: {} };
-        if (!this.rawAgent.projects.list)
-            this.rawAgent.projects.list = {};
-        this.rawAgent.projects.list[name] = projectPath;
-        this.persist();
-    }
     // ── Personal layer ────────────────────────────────────────────────────
     _personaCache = undefined;
     /**

package/dist/core/message/im-renderer.js

@@ -132,26 +132,6 @@ export class IMRenderer {
     getRemainingText() {
         return this.textBuffer;
     }
-    /** 从 buffer 中移除指定 pattern（用于文件标记预处理） */
-    stripFromBuffer(pattern) {
-        this.textBuffer = this.textBuffer.replace(pattern, '').trim();
-        // itemsQueue 中的 text items 也同步过滤
-        for (const item of this.itemsQueue) {
-            if (item.kind === 'text') {
-                item.text = item.text.replace(pattern, '');
-            }
-        }
-    }
-    /** 清除上下文过长错误文本（从 buffer + allText 中移除） */
-    stripContextError(pattern) {
-        this.textBuffer = this.textBuffer.replace(pattern, '').trim();
-        this.allText = this.allText.replace(pattern, '').trim();
-        for (const item of this.itemsQueue) {
-            if (item.kind === 'text') {
-                item.text = item.text.replace(pattern, '');
-            }
-        }
-    }
     // ── 文本/活动注入（替代 StreamFlusher.addText/addActivity）──
     /** 添加文本片段（流式 text） */
     addText(text, outputTokens, turn) {
@@ -328,6 +308,15 @@ export class IMRenderer {
             clearTimeout(this.timer);
             this.timer = undefined;
         }
+        // 上下文错误短语过滤：剔除错误关键词本身，保留前后内容
+        const ctxErrPattern = /prompt is too long|input is too long|context too long|context limit|context_length_exceeded|上下文过长/gi;
+        const stripCtxErr = (s) => s.replace(ctxErrPattern, '').trim();
+        this.textBuffer = stripCtxErr(this.textBuffer);
+        this.allText = stripCtxErr(this.allText);
+        for (const item of this.itemsQueue) {
+            if (item.kind === 'text')
+                item.text = stripCtxErr(item.text);
+        }
         // 文件标记过滤
         if (this.opts.fileMarkerPattern) {
             this.textBuffer = this.textBuffer.replace(this.opts.fileMarkerPattern, '').trim();

package/dist/core/message/message-bridge.js

@@ -105,7 +105,7 @@ export class MessageBridge {
                 if (await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
                     logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId: `cmd-${msg.messageId || Date.now()}`, payload: { kind: 'command.result', text } });
                     return sendReply(msg.channelId, text, msg.replyContext);
-                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext))
+                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID))
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
@@ -135,13 +135,8 @@ export class MessageBridge {
                 const effectiveProjectPath = owningAgent?.projectPath
                     ?? this.defaultProjectPath;
                 const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType, undefined, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType);
-                // 4. 消息前缀（由 policy 决定）
-                const channelInfo = this.processor.getChannelInfo?.(channelName);
-                if (channelInfo?.policy) {
-                    const prefix = channelInfo.policy.messagePrefix(chatType, msg.peerName);
-                    if (prefix)
-                        content = prefix + content;
-                }
+                // 4. 群聊发送者标注由消息渲染层（message-renderer）逐条承担，不再在此硬编码前缀，
+                //    消息日志因此保存干净原文。policy.messagePrefix 暂保留（未来清理）。
                 // 5. 构造完整消息（channel 字段存实例名，用于 session 精确匹配）
                 const fullMessage = {
                     channel: channelName,
@@ -152,6 +147,9 @@ export class MessageBridge {
                     images: msg.images, timestamp: Date.now(),
                     peerId: msg.peerId, peerName: msg.peerName,
                     peerType: msg.peerType,
+                    sameDevice: msg.sameDevice,
+                    sameNetwork: msg.sameNetwork,
+                    sameEgressIp: msg.sameEgressIp,
                     messageId: msg.messageId,
                     mentions: msg.mentions, threadId: msg.threadId,
                     replyContext: msg.replyContext,
@@ -219,6 +217,7 @@ export class MessageBridge {
         permission: '/perm',
         activity: '/activity',
         system: '/system',
+        cli: '/cli',
     };
     resolveCmd(name, cmd) {
         if (cmd)
@@ -374,11 +373,11 @@ export class MessageBridge {
         }
     }
     /** 命令快速路径：返回 true 表示已处理 */
-    async handleCommand(content, channel, channelId, sendReply, userId, threadId, chatType, source, replyContext) {
+    async handleCommand(content, channel, channelId, sendReply, userId, threadId, chatType, source, replyContext, messageId, selfAID) {
         if (!this.cmdHandler.isCommand(content))
             return false;
         logger.info(`[${channel}] ${channelId}: ${content}${source === 'card-trigger' ? ' [card]' : ''}`);
-        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source);
+        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source, messageId, selfAID);
         logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}`);
         if (cmdResult === undefined)
             return false;