evolclaw 2.6.0 → 2.6.2

package/dist/core/command-handler.js

@@ -103,7 +103,7 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/agentmd', '/chatmode'];
+const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/aid', '/agentmd', '/chatmode'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -127,6 +127,7 @@ export class CommandHandler {
     permissionGateway;
     interactionRouter;
     statsCollector;
+    hotLoadChannel;
     agentMap;
     defaultAgentId;
     /** 按 agentId 获取 agent，回退到默认 */
@@ -266,6 +267,9 @@ export class CommandHandler {
     setMessageQueue(messageQueue) {
         this.messageQueue = messageQueue;
     }
+    setHotLoadChannel(fn) {
+        this.hotLoadChannel = fn;
+    }
     setPermissionGateway(gateway) {
         this.permissionGateway = gateway;
     }
@@ -407,6 +411,10 @@ export class CommandHandler {
                     ] : []),
                     ...(isOwner ? [
                         { cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
+                        { cmd: '/aid', label: 'AID 管理', desc: '创建新 AID 并上线新 Agent 实例', next: { type: 'select', items: [
+                                    { value: 'list', label: '列表', desc: '列出所有 AUN 实例及连接状态' },
+                                    { value: 'new', label: '创建', desc: '创建新 AID 并热加载上线', next: { type: 'text' } },
+                                ] } },
                         { cmd: '/agentmd', label: '管理 agent.md', desc: '查看或更新 AUN 网络上的 agent.md 身份文件', next: { type: 'select', items: [
                                     { value: 'put', label: '上传当前', desc: '将本地 agent.md 上传到 AUN 网络' },
                                     { value: 'set', label: '直接设置', desc: '输入内容直接更新 agent.md', next: { type: 'text' } },
@@ -517,10 +525,10 @@ export class CommandHandler {
         const isAdmin = identity.role === 'owner' || identity.role === 'admin';
         const activeChatType = activeSession?.chatType || 'private';
         if (normalizedContent.startsWith('/')) {
-            const guestGroupCommands = ['/status', '/help', '/check'];
+            const guestGroupCommands = ['/status', '/help', '/check', '/chatmode'];
             const userCommands = activeChatType === 'group' && !isAdmin
                 ? guestGroupCommands
-                : ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s ', '/check'];
+                : ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s ', '/check', '/chatmode'];
             const isUserCommand = userCommands.some(cmd => normalizedContent === cmd.trimEnd() || normalizedContent.startsWith(cmd));
             if (!isUserCommand && !isAdmin) {
                 return activeChatType === 'group'
@@ -634,6 +642,7 @@ export class CommandHandler {
                 ...(isOwner ? [
                     '  /restart - 重启服务',
                     '  /file [channel] <path> - 发送项目内文件',
+                    '  /aid [list|new <aid>] - AID 管理',
                     '  /agentmd [put|set <内容>] - 管理 agent.md',
                 ] : []),
                 '',
@@ -1139,6 +1148,94 @@ export class CommandHandler {
             }
             return `✓ 推理强度: ${newEffort}`;
         }
+        // /aid 命令：AID 管理（list / new）
+        if (normalizedContent === '/aid' || normalizedContent === '/aid list' || normalizedContent.startsWith('/aid ')) {
+            if (!isOwner)
+                return '❌ 无权限：此命令仅限 owner 使用';
+            const adapter = this.adapters.get(channel);
+            const channelType = this.channelTypeMap.get(channel);
+            if (channelType !== 'aun')
+                return '❌ 此命令仅在 AUN 通道中可用';
+            const arg = normalizedContent.slice(4).trim();
+            // /aid 或 /aid list — 列出所有 AUN 实例
+            if (!arg || arg === 'list') {
+                const { normalizeChannelInstances } = await import('../config.js');
+                const instances = normalizeChannelInstances(this.config.channels?.aun, 'aun');
+                if (instances.length === 0)
+                    return '暂无 AUN 实例';
+                const lines = ['AUN 实例:'];
+                for (const inst of instances) {
+                    if (inst.enabled === false || !inst.aid)
+                        continue;
+                    const channelObj = this.channelObjects.get(inst.name);
+                    const status = channelObj?.getStatus?.();
+                    const connected = status?.connected ?? false;
+                    const icon = connected ? '✓' : '✗';
+                    const state = connected ? '已连接' : '未连接';
+                    lines.push(`  ${icon} ${inst.name}  ${inst.aid}  ${state}`);
+                }
+                return lines.join('\n');
+            }
+            // /aid new <aid> — 创建新 AID 并热加载
+            if (arg.startsWith('new ')) {
+                const rawName = arg.slice(4).trim();
+                if (!rawName)
+                    return '用法: /aid new <aid>\n例: /aid new reviewer';
+                if (!this.hotLoadChannel)
+                    return '❌ 热加载未就绪';
+                // Derive full AID: if no dots, append domain from current AID
+                const selfAid = typeof adapter._selfAid === 'function' ? adapter._selfAid() : '';
+                let fullAid = rawName;
+                if (!rawName.includes('.')) {
+                    const domain = selfAid.split('.').slice(1).join('.');
+                    if (!domain)
+                        return '❌ 无法推导 AID 域（当前实例未连接）';
+                    fullAid = `${rawName}.${domain}`;
+                }
+                // Validate AID format
+                const { isValidAid } = await import('../utils/init-channel.js');
+                if (!isValidAid(fullAid))
+                    return `❌ 无效 AID 格式: ${fullAid}`;
+                // Check instance name conflict
+                const instName = rawName.includes('.') ? rawName.split('.')[0] : rawName;
+                const { normalizeChannelInstances } = await import('../config.js');
+                const existing = normalizeChannelInstances(this.config.channels?.aun, 'aun');
+                if (existing.some(e => e.name === instName)) {
+                    return `❌ 实例名 "${instName}" 已存在`;
+                }
+                if (existing.some(e => e.aid === fullAid)) {
+                    return `❌ AID ${fullAid} 已在配置中`;
+                }
+                // Create AID (reuse init-channel.ts silent logic)
+                try {
+                    const { createAidSilent, appendAunInstance } = await import('../utils/init-channel.js');
+                    const createResult = await createAidSilent({ aid: fullAid, owner: selfAid });
+                    // Resolve owner from current AUN instance config
+                    const owner = this.config.channels?.aun
+                        ? (Array.isArray(this.config.channels.aun)
+                            ? this.config.channels.aun.find((a) => a.aid === selfAid)?.owner
+                            : this.config.channels.aun.owner)
+                        : undefined;
+                    // Hot-load: build and register new channel instance BEFORE writing config
+                    const { AUNChannelPlugin } = await import('../channels/aun.js');
+                    const plugin = new AUNChannelPlugin();
+                    const tempConfig = JSON.parse(JSON.stringify(this.config));
+                    tempConfig.channels.aun = [{ name: instName, enabled: true, aid: fullAid, owner }];
+                    const newInstances = await plugin.createChannels(tempConfig);
+                    if (newInstances.length === 0)
+                        return '❌ 通道实例创建失败';
+                    await this.hotLoadChannel(newInstances[0]);
+                    // Write config only after successful hot-load
+                    appendAunInstance(this.config, { name: instName, aid: fullAid, owner });
+                    const verb = createResult.alreadyExisted ? '已存在，现已上线' : '已创建并上线';
+                    return `✓ ${fullAid} ${verb}\n  实例名: ${instName}\n  可在 AUN 中搜索该 AID 开始对话`;
+                }
+                catch (e) {
+                    return `❌ 创建失败: ${String(e.message || e).slice(0, 200)}`;
+                }
+            }
+            return '用法: /aid [list|new <aid>]';
+        }
         // /activity 命令：控制中间输出显示模式
         if (normalizedContent === '/agentmd' || normalizedContent.startsWith('/agentmd ')) {
             if (!isOwner)
@@ -1289,9 +1386,9 @@ export class CommandHandler {
             return `✅ 中间输出模式: ${activityArg}（${label}）`;
         }
         // /chatmode 命令：查看/切换 session 会话模式（interactive | proactive）
+        // - 查看：所有人可用
+        // - 设置：单聊任何角色可设置；群聊仅管理员可设置
         if (normalizedContent === '/chatmode' || normalizedContent.startsWith('/chatmode ')) {
-            if (!isAdmin)
-                return '❌ 无权限：此命令仅限管理员使用';
             if (!activeSession)
                 return '❌ 当前无活跃会话';
             const lockedMode = getChannelSessionMode(this.config, channel);
@@ -1304,6 +1401,9 @@ export class CommandHandler {
             if (arg !== 'interactive' && arg !== 'proactive') {
                 return `❌ 无效模式: ${arg}\n可选: interactive / proactive`;
             }
+            if (activeChatType === 'group' && !isAdmin) {
+                return '❌ 无权限：群聊中切换会话模式仅限管理员使用';
+            }
             if (lockedMode) {
                 return `❌ 会话模式由通道配置锁定为 ${lockedMode}，无法切换`;
             }
@@ -1454,15 +1554,18 @@ export class CommandHandler {
                 }
             }
             const lines = [];
+            const sessionMode = session.sessionMode || 'interactive';
+            const lockedMode = getChannelSessionMode(this.config, channel);
+            const chatModeLine = `会话模式: ${sessionMode}${lockedMode ? '（通道锁定）' : ''}`;
             if (isAdmin) {
-                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, `会话轮数: ${sessionTurns}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, chatModeLine, `会话轮数: ${sessionTurns}`);
                 if (health.consecutiveErrors > 0) {
                     lines.push(`异常计数: ${health.consecutiveErrors}`);
                 }
                 lines.push(`最后成功: ${timeStr}`, `${session.agentId}会话: ${session.agentSessionId || '(未初始化)'}`, `创建时间: ${new Date(session.createdAt).toLocaleString('zh-CN')}`, `更新时间: ${new Date(session.updatedAt).toLocaleString('zh-CN')}`);
             }
             else {
-                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${channel} / 项目: ${projectName} / ${session.agentId}会话`, `状态: ${sessionStatus}`, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${channel} / 项目: ${projectName} / ${session.agentId}会话`, `状态: ${sessionStatus}`, chatModeLine, `会话轮数: ${sessionTurns}`, `最后活跃: ${timeStr}`);
             }
             if (health.lastError) {
                 lines.push('');
@@ -2601,7 +2704,7 @@ export class CommandHandler {
     static CTL_COMMANDS = [
         '/help', '/status', '/check',
         '/model', '/effort', '/perm',
-        '/compact', '/activity', '/file', '/send', '/chatmode', '/restart', '/agentmd',
+        '/compact', '/activity', '/file', '/send', '/chatmode', '/restart', '/agentmd', '/bind', '/aid',
     ];
     /**
      * 从 session 恢复 ReplyContext，用于 ctl send 主动发送文本时的路由

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

@@ -1,7 +1,9 @@
 import path from 'path';
 import fs from 'fs';
+import crypto from 'crypto';
 import { hasCompact } from '../../agents/claude-runner.js';
 import { StreamFlusher } from './stream-flusher.js';
+import { ThoughtEmitter } from './thought-emitter.js';
 import { StreamIdleMonitor } from './stream-idle-monitor.js';
 import { logger } from '../../utils/logger.js';
 import { getErrorMessage, classifyError, ErrorType, ERROR_PREFIX, isInfraError, prefixErrorType, isRetryableError } from '../../utils/error-utils.js';
@@ -27,7 +29,6 @@ export class MessageProcessor {
     interruptedSessions = new Map(); // sessionId → reason ('new_message' | 'stop' | ...)
     interactionRouter;
     messageQueue;
-    skillsHintDesc = undefined; // undefined=未加载, null=无模板, string=缓存描述
     skillsEnsured = false; // 全局 SKILLS.md 是否已确保
     /** 按 agentId 获取 agent，回退到默认 */
     getAgent(agentId) {
@@ -279,6 +280,8 @@ export class MessageProcessor {
         const { adapter, options } = channelInfo;
         const agent = this.getAgent(session.agentId);
         const streamKey = session.id;
+        // 为本次任务处理生成唯一 task_id（客户端生成，格式 task-{10hex}）
+        const taskId = `task-${crypto.randomUUID().replace(/-/g, '').slice(0, 10)}`;
         try {
             const isBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
             // 记录收到消息
@@ -302,7 +305,7 @@ export class MessageProcessor {
             logger.info(`[MessageProcessor] session=${session.id} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
             // 记录开始处理
             this.eventBus.publish({ type: 'message:processing', sessionId: session.id });
-            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, this.getReplyContext(message));
+            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, taskId, this.getReplyContext(message));
             logger.message({
                 msgId: messageId,
                 sessionId: session.id,
@@ -338,6 +341,12 @@ export class MessageProcessor {
             }, (options?.flushDelay ?? this.config.flushDelay ?? 3) * 1000, options?.fileMarkerPattern, this.config.debug?.flusherDiag, isProactive);
             // 保存当前 flusher，用于 compact 事件
             this.currentFlusher = flusher;
+            // Proactive 模式可观测：创建 ThoughtEmitter，将静默的流式事件转发为 thought
+            // selector: context = { type: 'task', id: taskId }
+            let thoughtEmitter = null;
+            if (isProactive && adapter.putThought) {
+                thoughtEmitter = new ThoughtEmitter(adapter, message.channelId, taskId);
+            }
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
             // 捕获当前消息的上下文（闭包），避免后续消息处理时串台
             const capturedChannelId = message.channelId;
@@ -380,15 +389,28 @@ export class MessageProcessor {
                 const peerLabel = session.identity?.role || 'unknown';
                 const peerName = message.peerName || session.metadata?.peerName;
                 const peerType = message.peerType;
+                const peerId = message.peerId;
+                const adapterAny = channelInfo.adapter;
+                const selfAid = typeof adapterAny._selfAid === 'function' ? adapterAny._selfAid() : undefined;
+                const selfName = typeof adapterAny._selfName === 'function' ? adapterAny._selfName() : undefined;
+                const formatIdentity = (name, id) => {
+                    if (name && id)
+                        return `${name} (${id})`;
+                    return name || id || undefined;
+                };
+                const selfIdentity = formatIdentity(selfName, selfAid);
+                const peerIdentity = formatIdentity(peerName, peerId);
                 const envParts = [
                     `会话通道: ${currentChannelType}`,
                     `当前项目: ${path.basename(absoluteProjectPath)}`,
                 ];
                 if (session.name)
                     envParts.push(`会话名称: ${session.name}`);
+                if (selfIdentity)
+                    envParts.push(`当前名称: ${selfIdentity}`);
                 envParts.push(`对端身份: ${peerLabel}`);
-                if (peerName)
-                    envParts.push(`对端名称: ${peerName}`);
+                if (peerIdentity)
+                    envParts.push(`对端名称: ${peerIdentity}`);
                 if (peerType && peerType !== 'unknown')
                     envParts.push(`对端类型: ${peerType}`);
                 if (session.chatType)
@@ -439,14 +461,16 @@ export class MessageProcessor {
                     contextParts.push(`[群聊回复规则] 回复时必须在开头添加 @${message.peerId} 来通知对方`);
                 }
                 // 5. Agent ctl 自管理指令提示 + SKILLS.md 生成
-                if (!this.skillsEnsured) {
-                    this.ensureSkillsFile();
-                    this.skillsEnsured = true;
-                }
-                const skillsHint = this.getSkillsHint();
-                if (skillsHint) {
-                    contextParts.push(`[EvolClaw 自管理] ${skillsHint}`);
-                }
+                // 暂时注释：排查 proactive 模式下 agent 未调用 Bash 工具的问题，
+                // 怀疑此段与 [Proactive 模式] 语义重合稀释了后者的权重
+                // if (!this.skillsEnsured) {
+                //   this.ensureSkillsFile();
+                //   this.skillsEnsured = true;
+                // }
+                // const skillsHint = this.getSkillsHint();
+                // if (skillsHint) {
+                //   contextParts.push(`[EvolClaw 自管理] ${skillsHint}`);
+                // }
                 // 6. Proactive 模式提示词：agent 的输出不会自动发送，必须主动调用 ctl send/file
                 if (isProactive) {
                     contextParts.push('[Proactive 模式] 本次对话中你的流式输出不会自动发送给用户，必须通过以下命令主动发送：\n' +
@@ -463,7 +487,7 @@ export class MessageProcessor {
                         const stream = await agent.runQuery(session.id, effectivePrompt, absoluteProjectPath, session.agentSessionId, message.images, effectiveSystemPrompt, this.sessionManager);
                         agent.registerStream(streamKey, stream);
                         streamRegistered = true;
-                        streamResult = await this.processEventStream(stream, session, flusher, resetTimer, shouldSuppress);
+                        streamResult = await this.processEventStream(stream, session, flusher, resetTimer, shouldSuppress, thoughtEmitter);
                         break; // 成功，跳出重试循环
                     }
                     catch (retryError) {
@@ -493,7 +517,7 @@ export class MessageProcessor {
                         flusher.addActivity('\u2705 压缩完成，正在重试...');
                         const retryStream = await agent.runQuery(session.id, '上下文已自动压缩，请继续之前未完成的任务。', absoluteProjectPath, session.agentSessionId, undefined, options?.systemPromptAppend, this.sessionManager);
                         agent.registerStream(streamKey, retryStream);
-                        streamResult = await this.processEventStream(retryStream, session, flusher, resetTimer, shouldSuppress);
+                        streamResult = await this.processEventStream(retryStream, session, flusher, resetTimer, shouldSuppress, thoughtEmitter);
                     }
                     else {
                         throw new Error('CONTEXT_COMPACT_FAILED');
@@ -607,7 +631,7 @@ export class MessageProcessor {
                 const errorSummary = streamResult.errors?.join('; ') || '任务执行失败';
                 const rawSubtype = streamResult.subtype || 'agent_error';
                 const errorType = prefixErrorType(ERROR_PREFIX.AGENT, rawSubtype);
-                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, this.getReplyContext(message));
+                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, taskId, this.getReplyContext(message));
                 this.eventBus.publish({
                     type: 'message:error',
                     sessionId: session.id,
@@ -635,7 +659,7 @@ export class MessageProcessor {
             }
             else {
                 // 真正的成功
-                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, this.getReplyContext(message));
+                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, taskId, this.getReplyContext(message));
                 await this.sessionManager.recordSuccess(session.id);
                 this.eventBus.publish({
                     type: 'message:completed',
@@ -688,7 +712,7 @@ export class MessageProcessor {
             // 用户主动中断（新消息打断 或 /stop 命令）时静默，不发送中断/错误提示
             if (!isUserInterrupt) {
                 try {
-                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, this.getReplyContext(message));
+                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, taskId, this.getReplyContext(message));
                 }
                 catch { }
             }
@@ -764,7 +788,7 @@ export class MessageProcessor {
      * 此方法只消费标准 AgentEvent 类型，不引用任何 SDK 特有事件。
      * SDK 事件 → AgentEvent 的转换在 AgentRunner.transformStream() 中完成。
      */
-    async processEventStream(stream, session, flusher, resetTimer, shouldSuppress) {
+    async processEventStream(stream, session, flusher, resetTimer, shouldSuppress, thoughtEmitter) {
         let hasReceivedText = false;
         let hasErrorResult = false; // 是否已有 tool_result/error 事件输出过错误
         let completeResult = { isError: false, lastReplyText: '', fullText: '', hasReceivedText: false };
@@ -777,6 +801,10 @@ export class MessageProcessor {
                 resetTimer(event.type, toolName);
                 // 记录所有事件类型
                 logger.info(`[MessageProcessor] Event: type=${event.type}`);
+                // Proactive 可观测：将事件实时透传为 thought（fire-and-forget）
+                if (thoughtEmitter) {
+                    thoughtEmitter.emit(event).catch(() => { });
+                }
                 // session_id 已在 AgentRunner.transformStream 中处理，此处仅记录
                 if (event.type === 'session_id') {
                     logger.info(`[MessageProcessor] Session ID updated: ${event.sessionId} for session: ${session.id}`);
@@ -1077,42 +1105,28 @@ export class MessageProcessor {
         return 0;
     }
     /**
-     * 从模板 frontmatter 缓存提示（懒加载，整个进程只读一次模板文件）
+     * 从 data/SKILLS.md 读取 frontmatter 并生成提示。
+     * 不缓存：每次读取保证用户编辑立即生效。
+     * 调用前应确保 ensureSkillsFile() 已执行过（首次落盘）。
      */
     getSkillsHint() {
-        if (this.skillsHintDesc === undefined) {
-            this.skillsHintDesc = this.loadSkillsHint();
-        }
-        return this.skillsHintDesc;
-    }
-    /**
-     * 从包模板源读取 frontmatter 并生成提示（仅执行一次）
-     */
-    loadSkillsHint() {
         try {
-            const candidates = [
-                path.join(getPackageRoot(), 'src', 'templates', 'skills.md'),
-                path.join(getPackageRoot(), 'dist', 'templates', 'skills.md'),
+            const skillsPath = path.join(resolveRoot(), 'data', 'SKILLS.md');
+            if (!fs.existsSync(skillsPath))
+                return null;
+            const content = fs.readFileSync(skillsPath, 'utf-8');
+            const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
+            if (!frontmatterMatch)
+                return null;
+            const fm = frontmatterMatch[1];
+            const desc = fm.match(/^description:\s*(.+)$/m)?.[1]?.trim() || 'EvolClaw 运行时管理指令';
+            const trigger = fm.match(/^trigger:\s*(.+)$/m)?.[1]?.trim() || '';
+            const parts = [
+                `可通过 Bash 指令管理运行时，${desc}。`,
+                trigger ? `触发时机：${trigger}。` : '',
+                `完整文档见 ${skillsPath}`,
             ];
-            for (const templatePath of candidates) {
-                if (!fs.existsSync(templatePath))
-                    continue;
-                const content = fs.readFileSync(templatePath, 'utf-8');
-                const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
-                if (!frontmatterMatch)
-                    continue;
-                const fm = frontmatterMatch[1];
-                const desc = fm.match(/^description:\s*(.+)$/m)?.[1]?.trim() || 'EvolClaw 运行时管理指令';
-                const trigger = fm.match(/^trigger:\s*(.+)$/m)?.[1]?.trim() || '';
-                const skillsPath = path.join(resolveRoot(), 'data', 'SKILLS.md');
-                const parts = [
-                    `可通过 Bash 执行 \`evolclaw ctl <cmd>\` 管理运行时：${desc}`,
-                    trigger ? `触发时机：${trigger}` : '',
-                    `完整文档见 ${skillsPath}`,
-                ];
-                return parts.filter(Boolean).join('\n');
-            }
-            return null;
+            return parts.filter(Boolean).join('');
         }
         catch {
             return null;

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

@@ -169,7 +169,7 @@ export class MessageQueue {
      * 合并多条同 peerId 消息：
      * - content: \n 连接
      * - images / mentions: 扁平合并
-     * - messageId: 置空（合并后不代表某一条具体消息）
+     * - messageId: 取最新一条的 messageId（用于 thought 锚定与中断追踪）
      * - replyContext / peerName / 其余字段: 取最后一条
      */
     mergeItems(items) {
@@ -185,12 +185,20 @@ export class MessageQueue {
                 allMentions.push(...m.mentions);
         }
         const last = items[items.length - 1];
+        // 保留最新一条的 messageId（若最后一条无 ID 则回退到前面已有的 ID）
+        let latestMessageId;
+        for (let i = items.length - 1; i >= 0; i--) {
+            if (items[i].message.messageId) {
+                latestMessageId = items[i].message.messageId;
+                break;
+            }
+        }
         const merged = {
             ...last.message,
             content: contents.join('\n'),
             images: allImages.length > 0 ? allImages : undefined,
             mentions: allMentions.length > 0 ? allMentions : undefined,
-            messageId: undefined,
+            messageId: latestMessageId,
         };
         return {
             message: merged,

package/dist/core/message/stream-debouncer.js

@@ -95,13 +95,21 @@ export class StreamDebouncer {
                 allMentions.push(...e.mentions);
         }
         const last = entries[entries.length - 1];
+        // 合并后保留最新一条的 messageId（用于 thought 锚定与中断追踪）
+        let latestMessageId;
+        for (let i = entries.length - 1; i >= 0; i--) {
+            if (entries[i].messageId) {
+                latestMessageId = entries[i].messageId;
+                break;
+            }
+        }
         const merged = {
             ...last.rest,
             content: contents.join('\n'),
             images: allImages.length > 0 ? allImages : undefined,
             mentions: allMentions.length > 0 ? allMentions : undefined,
             replyContext: last.replyContext,
-            messageId: entries.length > 1 ? undefined : last.messageId,
+            messageId: latestMessageId,
         };
         const resolves = entries.map(e => e.resolve);
         const rejects = entries.map(e => e.reject);

package/dist/core/message/thought-emitter.js

@@ -0,0 +1,153 @@
+import { logger } from '../../utils/logger.js';
+/**
+ * ThoughtEmitter — 将 Proactive 模式下的流式 AgentEvent 实时发送为 thought
+ *
+ * 设计特点：
+ * - 不做聚合/batching，逐事件调用 adapter.putThought()
+ * - 不感知 group vs P2P，通道差异由 adapter 内部处理
+ * - taskId 映射为 context: { type: 'task', id: taskId }（协议 selector）
+ * - fire-and-forget：调用方不 await emit()，错误被内部捕获
+ */
+export class ThoughtEmitter {
+    adapter;
+    channelId;
+    taskId;
+    hasEmittedText = false;
+    constructor(adapter, channelId, taskId) {
+        if (!taskId) {
+            throw new Error('[ThoughtEmitter] taskId is required at construction');
+        }
+        this.adapter = adapter;
+        this.channelId = channelId;
+        this.taskId = taskId;
+    }
+    async emit(event) {
+        // 对齐 interactive 的 dedup：流式 text 已推过时，complete.result 不再重复发 summary
+        if (event.type === 'complete' &&
+            !event.isError &&
+            event.result &&
+            this.hasEmittedText) {
+            return;
+        }
+        const payload = this.mapEventToPayload(event);
+        if (!payload)
+            return;
+        if (!this.adapter.putThought)
+            return;
+        if (payload.stage === 'thinking') {
+            this.hasEmittedText = true;
+        }
+        try {
+            await this.adapter.putThought(this.channelId, this.taskId, payload);
+        }
+        catch (err) {
+            logger.debug(`[ThoughtEmitter] putThought failed: ${err.message}`);
+        }
+    }
+    mapEventToPayload(event) {
+        switch (event.type) {
+            case 'text':
+                if (!event.text)
+                    return null;
+                return { type: 'thought', text: event.text, stage: 'thinking' };
+            case 'tool_use': {
+                const desc = this.summarizeInput(event.input, event.name);
+                return {
+                    type: 'thought',
+                    text: desc ? `🔧 ${event.name}: ${desc}` : `🔧 ${event.name}`,
+                    stage: 'tool',
+                    metadata: { tool: event.name, input: desc },
+                };
+            }
+            case 'tool_result':
+                if (event.isError) {
+                    return {
+                        type: 'thought',
+                        text: `⚠️ ${event.name}: ${event.error || '执行失败'}`,
+                        stage: 'tool',
+                        metadata: { tool: event.name, ok: false },
+                    };
+                }
+                {
+                    const resultText = this.truncate(this.stringifyResult(event.result), 200);
+                    return {
+                        type: 'thought',
+                        text: resultText ? `✅ ${event.name}: ${resultText}` : `✅ ${event.name}`,
+                        stage: 'tool',
+                        metadata: { tool: event.name, ok: true },
+                    };
+                }
+            case 'compact':
+                return {
+                    type: 'thought',
+                    text: `💡 会话压缩完成 (压缩前 tokens: ${event.preTokens})`,
+                    stage: 'system',
+                };
+            case 'task_progress': {
+                const stats = this.formatTaskStats(event);
+                const text = event.summary
+                    ? `⏳ 子任务: ${event.summary}${stats ? ` (${stats})` : ''}`
+                    : `⏳ 子任务进行中${stats ? `: ${stats}` : ''}`;
+                return { type: 'thought', text, stage: 'planning' };
+            }
+            case 'error':
+                return { type: 'thought', text: `❌ ${event.error}`, stage: 'error' };
+            case 'complete':
+                if (event.isError) {
+                    const errText = event.errors?.join('; ') || event.result || '任务失败';
+                    return { type: 'thought', text: `❌ ${errText}`, stage: 'error' };
+                }
+                if (event.result) {
+                    return { type: 'thought', text: event.result, stage: 'summary' };
+                }
+                return null;
+            case 'session_id':
+            case 'state_changed':
+            case 'status':
+                return null;
+            default:
+                return null;
+        }
+    }
+    summarizeInput(input, toolName) {
+        if (!input || typeof input !== 'object')
+            return '';
+        // Bash + ctl send/file: 显示完整命令内容（含发送的消息正文）
+        if (toolName === 'Bash' && typeof input.command === 'string') {
+            const cmd = input.command;
+            if (cmd.includes('evolclaw ctl send') || cmd.includes('evolclaw ctl file')) {
+                return cmd;
+            }
+        }
+        return (input.description ||
+            input.file_path ||
+            input.pattern ||
+            (typeof input.command === 'string' ? input.command.substring(0, 80) : '') ||
+            (typeof input.prompt === 'string' ? input.prompt.substring(0, 80) : '') ||
+            (typeof input.query === 'string' ? input.query.substring(0, 80) : '') ||
+            '');
+    }
+    stringifyResult(result) {
+        if (result === null || result === undefined)
+            return '';
+        if (typeof result === 'string')
+            return result;
+        try {
+            return JSON.stringify(result);
+        }
+        catch {
+            return String(result);
+        }
+    }
+    truncate(text, maxLen) {
+        return text.length > maxLen ? text.substring(0, maxLen) + '...' : text;
+    }
+    formatTaskStats(event) {
+        const parts = [];
+        if (event.toolUses)
+            parts.push(`${event.toolUses} tools`);
+        if (event.durationMs)
+            parts.push(`${Math.round(event.durationMs / 1000)}s`);
+        return parts.join(', ');
+    }
+}