evolclaw 3.1.2 → 3.1.4

package/dist/core/evolagent.js

@@ -159,6 +159,15 @@ export class EvolAgent {
         this.persist();
     }
     // ── Baseagent 字段写入 ────────────────────────────────────────────────
+    /** 切换当前活跃 baseagent（写顶层 active_baseagent）。 */
+    setActiveBaseagent(value) {
+        if (value === undefined)
+            delete this.rawAgent.active_baseagent;
+        else
+            this.rawAgent.active_baseagent = value;
+        this.merged.active_baseagent = value;
+        this.persist();
+    }
     setBaseagentModel(value) {
         const ba = this.baseagent;
         if (!this.rawAgent.baseagents)
@@ -182,6 +191,28 @@ export class EvolAgent {
             block[fieldName] = value;
         this.persist();
     }
+    /** 设置私聊 chatmode（群聊/非 human 强制 proactive，无可写入项）。 */
+    setChatmodePrivate(value) {
+        if (!this.rawAgent.chatmode)
+            this.rawAgent.chatmode = {};
+        if (value === undefined)
+            delete this.rawAgent.chatmode.private;
+        else
+            this.rawAgent.chatmode.private = value;
+        if (!this.merged.chatmode)
+            this.merged.chatmode = {};
+        this.merged.chatmode.private = value;
+        this.persist();
+    }
+    /** 设置群聊 dispatch 默认值（mention | broadcast）。 */
+    setDispatch(value) {
+        if (value === undefined)
+            delete this.rawAgent.dispatch;
+        else
+            this.rawAgent.dispatch = value;
+        this.merged.dispatch = value;
+        this.persist();
+    }
     // ── Projects ──────────────────────────────────────────────────────────
     getProjects() {
         const list = this.merged.projects?.list;

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

@@ -142,6 +142,16 @@ export class IMRenderer {
             }
         }
     }
+    /** 清除上下文过长错误文本（从 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) {

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

@@ -207,7 +207,28 @@ export class MessageBridge {
             }
         });
     }
-    /** 自定义消息快速路径：拦截 menu.query 等自定义 payload，返回 true 表示已处理 */
+    // ── Menu Protocol ──
+    static MENU_NAME_MAP = {
+        pwd: '/pwd',
+        session: '/session',
+        baseagent: '/baseagent',
+        model: '/model',
+        effort: '/effort',
+        chatmode: '/chatmode',
+        dispatch: '/dispatch',
+        permission: '/perm',
+        activity: '/activity',
+        system: '/system',
+    };
+    resolveCmd(name, cmd) {
+        if (cmd)
+            return cmd;
+        const mapped = MessageBridge.MENU_NAME_MAP[name];
+        if (!mapped)
+            throw { code: 'UNKNOWN_NAME', message: `未知操作: ${name}` };
+        return mapped;
+    }
+    /** 自定义消息快速路径：拦截 menu.* 协议 */
     async handleCustomPayload(content, channel, msg, sendReply, adapter) {
         let parsed;
         try {
@@ -218,30 +239,108 @@ export class MessageBridge {
         }
         if (!parsed || typeof parsed !== 'object' || !parsed.type)
             return false;
-        if (parsed.type === 'menu.query') {
-            if (parsed.cmd && (parsed.mode === 'query' || parsed.mode === 'update')) {
-                // exec 模式：查询状态或执行命令
-                const result = await this.cmdHandler.execMenu(parsed.cmd, parsed.mode, channel, msg.channelId, msg.peerId);
-                const base = { type: 'menu.response', cmd: parsed.cmd };
-                const response = JSON.stringify('error' in result ? { ...base, error: result.error } : { ...base, data: result.data });
-                await this.sendCustomResponse(adapter, channel, msg.channelId, response, sendReply);
-            }
-            else if (parsed.cmd) {
-                // 动态子菜单查询
-                const items = await this.cmdHandler.getSubMenuItems(parsed.cmd, channel, msg.channelId, msg.peerId);
-                const response = JSON.stringify({ type: 'menu.response', cmd: parsed.cmd, items: items ?? [] });
-                await this.sendCustomResponse(adapter, channel, msg.channelId, response, sendReply);
-            }
-            else {
-                // 全量菜单
-                const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
-                const items = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
-                const response = JSON.stringify({ type: 'menu.response', items });
-                await this.sendCustomResponse(adapter, channel, msg.channelId, response, sendReply);
-            }
-            return true;
+        switch (parsed.type) {
+            case 'menu.list':
+                await this.handleMenuList(parsed, channel, msg, adapter, sendReply);
+                return true;
+            case 'menu.query':
+                await this.handleMenuQuery(parsed, channel, msg, adapter, sendReply);
+                return true;
+            case 'menu.options':
+                await this.handleMenuOptions(parsed, channel, msg, adapter, sendReply);
+                return true;
+            case 'menu.update':
+                await this.handleMenuUpdate(parsed, channel, msg, adapter, sendReply);
+                return true;
+            case 'menu.action':
+                await this.handleMenuAction(parsed, channel, msg, adapter, sendReply);
+                return true;
+            default:
+                return false;
+        }
+    }
+    async handleMenuList(req, channel, msg, adapter, sendReply) {
+        const { id } = req;
+        try {
+            const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
+            const data = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
+            await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, data }, sendReply);
+        }
+        catch (err) {
+            await this.sendMenuResponse(adapter, channel, msg.channelId, {
+                type: 'menu.response', id,
+                error: { code: err?.code || 'INTERNAL', message: err?.message || String(err) }
+            }, sendReply);
+        }
+    }
+    async handleMenuQuery(req, channel, msg, adapter, sendReply) {
+        const { id, name, cmd } = req;
+        try {
+            const resolvedCmd = this.resolveCmd(name, cmd);
+            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId);
+            if ('error' in result)
+                throw { code: result.code || 'EXEC_FAILED', message: result.error };
+            await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data: result.data }, sendReply);
+        }
+        catch (err) {
+            await this.sendMenuResponse(adapter, channel, msg.channelId, {
+                type: 'menu.response', id, name,
+                error: { code: err?.code || 'INTERNAL', message: err?.message || String(err) }
+            }, sendReply);
+        }
+    }
+    async handleMenuOptions(req, channel, msg, adapter, sendReply) {
+        const { id, name, cmd } = req;
+        try {
+            const resolvedCmd = this.resolveCmd(name, cmd);
+            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId) ?? [];
+            await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data }, sendReply);
+        }
+        catch (err) {
+            await this.sendMenuResponse(adapter, channel, msg.channelId, {
+                type: 'menu.response', id, name,
+                error: { code: err?.code || 'INTERNAL', message: err?.message || String(err) }
+            }, sendReply);
+        }
+    }
+    async handleMenuUpdate(req, channel, msg, adapter, sendReply) {
+        const { id, name, cmd, value } = req;
+        try {
+            if (!value)
+                throw { code: 'MISSING_VALUE', message: '缺少 value 参数' };
+            const resolvedCmd = this.resolveCmd(name, cmd);
+            const result = await this.cmdHandler.execMenuUpdate(resolvedCmd, value, channel, msg.channelId, msg.peerId);
+            if ('error' in result)
+                throw { code: result.code || 'EXEC_FAILED', message: result.error };
+            await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data: result.data }, sendReply);
+        }
+        catch (err) {
+            await this.sendMenuResponse(adapter, channel, msg.channelId, {
+                type: 'menu.response', id, name,
+                error: { code: err?.code || 'INTERNAL', message: err?.message || String(err) }
+            }, sendReply);
+        }
+    }
+    async handleMenuAction(req, channel, msg, adapter, sendReply) {
+        const { id, name, cmd, action, args } = req;
+        try {
+            if (!action)
+                throw { code: 'MISSING_VALUE', message: '缺少 action 参数' };
+            const resolvedCmd = this.resolveCmd(name, cmd);
+            const result = await this.cmdHandler.execMenuAction(resolvedCmd, action, args, channel, msg.channelId, msg.peerId);
+            if ('error' in result)
+                throw { code: result.code || 'EXEC_FAILED', message: result.error };
+            await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data: result.data }, sendReply);
         }
-        return false;
+        catch (err) {
+            await this.sendMenuResponse(adapter, channel, msg.channelId, {
+                type: 'menu.response', id, name,
+                error: { code: err?.code || 'INTERNAL', message: err?.message || String(err) }
+            }, sendReply);
+        }
+    }
+    async sendMenuResponse(adapter, channel, channelId, response, sendReply) {
+        await this.sendCustomResponse(adapter, channel, channelId, JSON.stringify(response), sendReply);
     }
     /** menu.query 响应：优先走 adapter.send(custom)，降级 sendReply */
     async sendCustomResponse(adapter, channel, channelId, response, sendReply) {

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

@@ -12,6 +12,21 @@ import { getPackageRoot, resolveRoot } from '../../paths.js';
 import { renderKitSections } from '../../agents/kit-renderer.js';
 import { normalizeBaseagent } from '../../agents/baseagent-normalize.js';
 import { renderActionAsText, renderCommandCardAsText } from '../interaction-router.js';
+function getContextTooLongHint(agent) {
+    if (canCompactAgent(agent)) {
+        return '上下文过长，请精简提问或使用 /compact 压缩上下文';
+    }
+    return '上下文过长，请精简提问，或使用 /new 新建会话后继续';
+}
+function getContextCompactFailedHint(agent) {
+    if (canCompactAgent(agent)) {
+        return '上下文过长，自动压缩失败，请手动输入 /compact 重试';
+    }
+    return '上下文过长，请精简提问，或使用 /new 新建会话后继续';
+}
+function canCompactAgent(agent) {
+    return hasCompact(agent) && agent.capabilities?.compact !== false;
+}
 /**
  * 构造 OutboundEnvelope —— 出站三件套的信封部分。
  *
@@ -80,10 +95,11 @@ export class MessageProcessor {
         return [...this.agentMap.keys()];
     }
     /** 判断是否为后台会话（仅主会话参与判断，话题会话独立） */
-    async isBackgroundSession(session, channel, channelId) {
+    isBackgroundSession(session, _channel, _channelId) {
         if (session.threadId)
             return false;
-        const active = await this.sessionManager.getActiveSession(channel, channelId);
+        // 使用 session 自身的 channelType 精确定位 active.json，避免扫描误匹配
+        const active = this.sessionManager.getActiveSessionSync(session.channel, session.channelId, session.channelType, session.selfId);
         return active ? session.id !== active.id : false;
     }
     constructor(agentRunnerOrMap, sessionManager, globalSettings, messageCache, eventBus, commandHandler, primaryRunnerKey) {
@@ -183,7 +199,7 @@ export class MessageProcessor {
         '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork',
         '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check',
         '/p ', '/s ', '/name ', '/rewind', '/rw', '/rw ', '/activity', '/chatmode',
-        '/aid', '/agentmd', '/upgrade',
+        '/aid', '/upgrade', '/evolagent',
     ];
     /** 判断消息内容是否为已知命令 */
     isKnownCommand(content) {
@@ -230,7 +246,7 @@ export class MessageProcessor {
             monitor?.recordEvent(eventType || 'unknown', toolName);
         };
         // Cache background status to avoid async call inside setInterval
-        const isBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
+        const isBackground = this.isBackgroundSession(session, message.channel, message.channelId);
         const timeoutPromise = new Promise((_, reject) => {
             rejectFn = reject;
             if (!monitorEnabled)
@@ -367,7 +383,7 @@ export class MessageProcessor {
             replyContext: taskReplyContext(),
         });
         try {
-            const isBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
+            const isBackground = this.isBackgroundSession(session, message.channel, message.channelId);
             // 记录收到消息
             logger.message({
                 msgId: messageId,
@@ -424,7 +440,7 @@ export class MessageProcessor {
                     // （不支持 thought 的 channel 静默丢弃，避免降级为普通消息）
                     if (isProactive && payload.kind === 'activity.batch' && !adapter.capabilities?.thought)
                         return;
-                    const isCurrentlyBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
+                    const isCurrentlyBackground = this.isBackgroundSession(session, message.channel, message.channelId);
                     if (isCurrentlyBackground)
                         return;
                     const opts = {};
@@ -501,18 +517,13 @@ export class MessageProcessor {
                 const selfAid = typeof adapterAny._selfAid === 'function' ? adapterAny._selfAid() : undefined;
                 const selfName = typeof adapterAny._selfName === 'function' ? adapterAny._selfName() : undefined;
                 const peerName = message.peerName || session.metadata?.peerName;
-                // 文件发送能力
-                let currentCanSend = false;
-                if (!isProactive) {
-                    currentCanSend = !!(channelInfo.adapter.capabilities?.file);
-                }
                 // 通道能力
                 const capParts = [];
                 if (options?.supportsImages)
                     capParts.push('图片输入');
                 if (channelInfo.adapter.capabilities?.image)
                     capParts.push('图片输出');
-                if (channelInfo.adapter.capabilities?.file)
+                if (!isProactive && channelInfo.adapter.capabilities?.file)
                     capParts.push('文件发送');
                 // Personal layer
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelKey);
@@ -528,6 +539,7 @@ export class MessageProcessor {
                     ? `${currentChannelType}#${encodeURIComponent(peerIdRaw)}`
                     : undefined;
                 const normalizedBaseagent = normalizeBaseagent(agent.name);
+                const agentModel = (typeof agent.getModel === 'function') ? agent.getModel() : undefined;
                 // Kit renderer: 组装上下文
                 const kitCtx = {
                     vars: {
@@ -542,19 +554,23 @@ export class MessageProcessor {
                         peerKey,
                         peerName: peerName || undefined,
                         peerRole: session.identity?.role || 'unknown',
+                        peerType: message.peerType || undefined,
                         groupId: session.metadata?.groupId || undefined,
-                        scene: session.chatType ? (session.chatType === 'group' ? 'group' : 'private') : 'coding',
                         chatType: session.chatType || null,
                         channel: currentChannelType || null,
                         venueUid: undefined,
+                        capabilities: capParts.length > 0 ? capParts.join('、') : undefined,
                         project: path.basename(absoluteProjectPath),
+                        sessionId: session.id,
                         sessionName: session.name || undefined,
-                        sessionMode: isProactive ? 'proactive' : 'interactive',
+                        sessionCreatedAt: session.createdAt ? new Date(session.createdAt).toISOString() : undefined,
+                        threadId: session.threadId || undefined,
+                        chatMode: isProactive ? 'proactive' : 'interactive',
                         readonly: session.metadata?.permissionMode === 'readonly',
-                        canSendFile: !isProactive && currentCanSend,
-                        capabilities: capParts.length > 0 ? capParts.join('、') : undefined,
                         baseAgent: normalizedBaseagent.canonical,
                         baseAgentName: normalizedBaseagent.displayName,
+                        baseAgentModel: agentModel || undefined,
+                        agentSessionId: session.agentSessionId || undefined,
                     },
                     sessionId: session.id,
                 };
@@ -571,7 +587,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, renderer, resetTimer, shouldSuppress);
+                        streamResult = await this.processEventStream(stream, session, agent, renderer, resetTimer, shouldSuppress);
                         break; // 成功，跳出重试循环
                     }
                     catch (retryError) {
@@ -591,7 +607,7 @@ export class MessageProcessor {
                 }
             }
             catch (error) {
-                if (classifyError(error) === ErrorType.CONTEXT_TOO_LONG && session.agentSessionId && hasCompact(agent)) {
+                if (classifyError(error) === ErrorType.CONTEXT_TOO_LONG && session.agentSessionId && canCompactAgent(agent)) {
                     // 尝试 compact 压缩会话
                     renderer.addNotice('上下文过长，正在压缩会话...', 'warn', 'compact-trigger', true);
                     await renderer.flush();
@@ -601,7 +617,7 @@ export class MessageProcessor {
                         renderer.addNotice('✅ 压缩完成，继续处理...', 'info', 'compact-retry', true);
                         const retryStream = await agent.runQuery(session.id, '上下文已自动压缩，请继续之前未完成的任务。', absoluteProjectPath, session.agentSessionId, undefined, effectiveSystemPrompt, this.sessionManager);
                         agent.registerStream(streamKey, retryStream);
-                        streamResult = await this.processEventStream(retryStream, session, renderer, resetTimer, shouldSuppress);
+                        streamResult = await this.processEventStream(retryStream, session, agent, renderer, resetTimer, shouldSuppress);
                     }
                     else {
                         throw new Error('CONTEXT_COMPACT_FAILED');
@@ -615,7 +631,7 @@ export class MessageProcessor {
             // 检测条件：terminalReason 明确为 prompt_too_long，或文本/errors 包含相关错误文本
             const contextTooLongPattern = /prompt is too long|input is too long|上下文过长/i;
             const errorsText = streamResult.errors?.join(' ') || '';
-            const isPromptTooLong = streamResult.isError && session.agentSessionId && hasCompact(agent) && (streamResult.terminalReason === 'prompt_too_long' ||
+            const isPromptTooLong = streamResult.isError && session.agentSessionId && canCompactAgent(agent) && (streamResult.terminalReason === 'prompt_too_long' ||
                 contextTooLongPattern.test(streamResult.lastReplyText) ||
                 contextTooLongPattern.test(errorsText) ||
                 contextTooLongPattern.test(streamResult.fullText));
@@ -627,7 +643,17 @@ export class MessageProcessor {
                     renderer.addNotice('✅ 压缩完成，继续处理...', 'info', 'compact-retry', true);
                     const retryStream = await agent.runQuery(session.id, '上下文已自动压缩，请继续之前未完成的任务。', absoluteProjectPath, session.agentSessionId, undefined, effectiveSystemPrompt, this.sessionManager);
                     agent.registerStream(streamKey, retryStream);
-                    streamResult = await this.processEventStream(retryStream, session, renderer, resetTimer, shouldSuppress);
+                    streamResult = await this.processEventStream(retryStream, session, agent, renderer, resetTimer, shouldSuppress);
+                    // 重试后仍然 prompt_too_long：清理 renderer 中可能混入的错误文本，显示友好提示
+                    const retryErrorsText = streamResult.errors?.join(' ') || '';
+                    const retryStillTooLong = streamResult.isError && (streamResult.terminalReason === 'prompt_too_long' ||
+                        contextTooLongPattern.test(streamResult.lastReplyText) ||
+                        contextTooLongPattern.test(retryErrorsText) ||
+                        contextTooLongPattern.test(streamResult.fullText));
+                    if (retryStillTooLong) {
+                        renderer.stripContextError(contextTooLongPattern);
+                        renderer.addNotice(getContextTooLongHint(agent), 'warn', 'context-too-long', true);
+                    }
                 }
                 else {
                     throw new Error('CONTEXT_COMPACT_FAILED');
@@ -638,7 +664,7 @@ export class MessageProcessor {
                 contextTooLongPattern.test(errorsText) ||
                 contextTooLongPattern.test(streamResult.fullText))) {
                 // 上下文过长但无法 auto-compact（无 session ID 或 agent 不支持），显示友好提示
-                renderer.addNotice('上下文过长，请精简提问或使用 /compact 压缩上下文', 'warn', 'context-too-long', true);
+                renderer.addNotice(getContextTooLongHint(agent), 'warn', 'context-too-long', true);
             }
             // 处理文件标记 - 支持 [SEND_FILE:path] 和 [SEND_FILE:channel:path]
             // 注意：始终扫描全部文本（含中间轮），因为文件标记可能出现在任意轮次
@@ -727,7 +753,7 @@ export class MessageProcessor {
             if (finalReplyText) {
                 if (isProactive && !streamResult.hasReceivedText && /^Unknown skill:\s+\S+/i.test(finalReplyText.trim())) {
                     // Proactive 模式 + SDK 本地兜底：直接发送绕过 silent renderer
-                    const isCurrentlyBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
+                    const isCurrentlyBackground = this.isBackgroundSession(session, message.channel, message.channelId);
                     if (!isCurrentlyBackground) {
                         await adapter.send({ ...envelope, replyContext: capturedReplyContext }, { kind: 'result.text', text: finalReplyText, isFinal: true });
                         logger.info(`[MessageProcessor] proactive SDK fallback replied task=${taskId} text="${finalReplyText.slice(0, 60)}"`);
@@ -843,7 +869,7 @@ export class MessageProcessor {
                 // 写入消息记录（出方向）已下沉到 aun.ts:deliverTextEntry，
                 // 所有 message.send 成功后统一写入 messages.jsonl，此处不再重复写入。
             }
-            const isFinallyBackground = await this.isBackgroundSession(session, message.channel, message.channelId);
+            const isFinallyBackground = this.isBackgroundSession(session, message.channel, message.channelId);
             if (isFinallyBackground && session.sessionMode !== 'autonomous') {
                 const projectName = path.basename(session.projectPath);
                 const count = this.messageCache.getCount(session.id);
@@ -927,7 +953,7 @@ export class MessageProcessor {
                 // 获取 session 用于话题回复（如果 resolveSession 已执行）
                 let sendOpts;
                 try {
-                    await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.agentRegistry?.resolveByChannel(message.channel)?.projectPath || process.cwd(), message.threadId);
+                    await this.sessionManager.getOrCreateSession(message.channel, message.channelId, this.agentRegistry?.resolveByChannel(message.channel)?.projectPath || process.cwd(), message.threadId, undefined, undefined, message.peerId, message.chatType, undefined, message.selfId, message.channelType, message.peerType);
                     sendOpts = this.getReplyContext(message);
                 }
                 catch { }
@@ -964,7 +990,7 @@ export class MessageProcessor {
                 : path.resolve(process.cwd(), session.projectPath);
             return { session, absoluteProjectPath };
         }
-        const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, projectPath, message.threadId, metadata, undefined, message.peerId, undefined, undefined, undefined, undefined, message.peerType);
+        const session = await this.sessionManager.getOrCreateSession(message.channel, message.channelId, projectPath, message.threadId, metadata, undefined, message.peerId, message.chatType, undefined, message.selfId, message.channelType, message.peerType);
         // 兜底纠正1：群聊强制 proactive
         if (message.chatType === 'group' && session.sessionMode !== 'proactive') {
             logger.info(`[MessageProcessor] group proactive upgrade: sessionId=${session.id} ${session.sessionMode} -> proactive`);
@@ -990,7 +1016,7 @@ export class MessageProcessor {
      * 此方法只消费标准 AgentEvent 类型，不引用任何 SDK 特有事件。
      * SDK 事件 → AgentEvent 的转换在 AgentRunner.transformStream() 中完成。
      */
-    async processEventStream(stream, session, renderer, resetTimer, shouldSuppress) {
+    async processEventStream(stream, session, agent, renderer, resetTimer, shouldSuppress) {
         // Per-session agent name for stats bucketing
         const agentNameForStats = this.agentRegistry?.resolveByChannel(session.metadata?.channelName || session.channel)?.name ?? '<unknown>';
         let hasReceivedText = false;
@@ -1058,7 +1084,7 @@ export class MessageProcessor {
                     });
                     continue;
                 }
-                const isCurrentlyBackground = await this.isBackgroundSession(session, session.channel, session.channelId);
+                const isCurrentlyBackground = this.isBackgroundSession(session, session.channel, session.channelId);
                 // === 前台任务：正常处理所有事件 ===
                 if (!isCurrentlyBackground) {
                     // 流式文本
@@ -1173,9 +1199,13 @@ export class MessageProcessor {
                         if (event.isError && !hasErrorResult && !shouldSuppress() && !isUserInterrupt && !isContextTooLong) {
                             const errorSummary = event.errors?.join('; ') || '任务执行失败';
                             // 使用 terminalReason 提供更友好的错误提示（不带 emoji，由 formatter 统一加）
-                            const userFriendlyMessage = event.terminalReason
-                                ? getErrorMessage(null, event.terminalReason, false)
-                                : errorSummary;
+                            const userFriendlyMessage = event.terminalReason === 'prompt_too_long'
+                                ? getContextTooLongHint(agent)
+                                : event.terminalReason === 'context_compact_failed'
+                                    ? getContextCompactFailedHint(agent)
+                                    : event.terminalReason
+                                        ? getErrorMessage(null, event.terminalReason, false)
+                                        : errorSummary;
                             renderer.addNotice(userFriendlyMessage, 'warn', 'task-error', true);
                         }
                         // 中间 complete：flush 掉已有 activities（不带 isFinal），让中间结果及时显示

package/dist/core/relation/peer-identity.js

@@ -2,11 +2,11 @@
  * PeerIdentityCache - 对端身份缓存管理
  *
  * 职责：
- * 1. 从对端的 agent.md 确定身份（human / agent）
- * 2. 缓存到关系层文件（30天时效）
+ * 1. 通过 agentmdSync 标准流程获取对端 agent.md（check → fetch if changed）
+ * 2. 仅在 agent.md 内容变化时重写 peer-identity.json
  * 3. 支持入站和出站消息的身份查询
  *
- * 信源：对端的 agent.md（通过 AUN SDK 下载并验签）
+ * 信源：对端的 agent.md（通过 AUN SDK checkAgentMd + fetchAgentMd）
  * 判定规则：type !== 'human' → agent
  * 缓存位置：$AGENT_DIR/relations/<channel>#<urlEncode(peerId)>/peer-identity.json
  */
@@ -14,6 +14,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as crypto from 'crypto';
 import { logger } from '../../utils/logger.js';
+import { agentMdPath } from '../../paths.js';
 /**
  * 对端身份缓存管理器
  */
@@ -54,29 +55,26 @@ export class PeerIdentityCache {
     }
     /**
      * 从 agent.md 更新身份信息
-     * @param agentMd 已验签的 agent.md 内容
      */
     static updateFromAgentMd(channel, peerId, agentDir, agentMd, verifiedAt) {
-        // 解析 type 和 name
         const typeMatch = agentMd.match(/^type:\s*["']?(\w+)["']?/m);
         const nameMatch = agentMd.match(/^name:\s*["']?(.+?)["']?\s*$/m);
         const type = typeMatch?.[1] || 'unknown';
         const isAgent = type !== 'human';
         const name = nameMatch?.[1]?.trim();
-        // 计算 hash
         const agentMdHash = 'sha256:' + crypto.createHash('sha256').update(agentMd, 'utf-8').digest('hex');
-        // 构建身份信息
+        const now = Date.now();
         const identity = {
             aid: peerId,
             type,
             isAgent,
             name,
             agentMdHash,
+            agentMdUpdatedAt: now,
             verifiedAt,
-            lastCheckedAt: Date.now(),
+            lastCheckedAt: now,
             source: 'agentmd',
         };
-        // 写入文件
         const filePath = this.getFilePath(channel, peerId, agentDir);
         try {
             fs.mkdirSync(path.dirname(filePath), { recursive: true });
@@ -88,6 +86,18 @@ export class PeerIdentityCache {
         }
         return identity;
     }
+    /**
+     * 仅更新 lastCheckedAt（内容未变时的轻量操作）
+     */
+    static touchLastChecked(channel, peerId, agentDir, cached) {
+        const updated = { ...cached, lastCheckedAt: Date.now() };
+        const filePath = this.getFilePath(channel, peerId, agentDir);
+        try {
+            fs.writeFileSync(filePath, JSON.stringify(updated, null, 2), 'utf-8');
+        }
+        catch { /* ignore */ }
+        return updated;
+    }
     /**
      * 标记为 unknown（验签失败或无 agent.md）
      */
@@ -95,8 +105,9 @@ export class PeerIdentityCache {
         const identity = {
             aid: peerId,
             type: 'unknown',
-            isAgent: true, // 验签失败 → 当做 agent（安全策略）
+            isAgent: true,
             agentMdHash: '',
+            agentMdUpdatedAt: 0,
             verifiedAt: 0,
             lastCheckedAt: Date.now(),
             source: 'unknown',
@@ -113,17 +124,17 @@ export class PeerIdentityCache {
         return identity;
     }
     /**
-     * 完整流程：检查缓存 → 需要刷新则下载 agent.md → 更新缓存
+     * 完整流程：缓存检查 → agentmdSync（check+fetch）→ 按 changed 决定是否重写
      *
      * @param channel 渠道类型（如 'aun'）
      * @param peerId 对端 ID（AUN 是 AID）
      * @param agentDir agent 数据根目录
-     * @param aunClient AUN SDK client（需要有 fetchAgentMd 方法）
+     * @param aunClient AUN SDK client（需要有 checkAgentMd / fetchAgentMd 方法）
      * @param forceRefresh 强制刷新（忽略缓存时效）
      * @returns PeerIdentity
      */
     static async resolve(channel, peerId, agentDir, aunClient, forceRefresh = false) {
-        // 1. 检查缓存
+        // 1. 缓存检查
         if (!forceRefresh && !this.needsRefresh(channel, peerId, agentDir)) {
             const cached = this.get(channel, peerId, agentDir);
             if (cached) {
@@ -131,17 +142,49 @@ export class PeerIdentityCache {
                 return cached;
             }
         }
-        // 2. 下载并验签 agent.md（SDK 自动验签）
+        // 2. 标准流程：checkAgentMd → fetchAgentMd（如果有变化）
         try {
-            logger.debug(`[PeerIdentityCache] Fetching agent.md: ${channel}#${peerId}`);
-            const result = await aunClient.fetchAgentMd(peerId);
-            const agentMd = result.content;
-            // 3. 更新缓存
-            return this.updateFromAgentMd(channel, peerId, agentDir, agentMd, Date.now());
+            logger.debug(`[PeerIdentityCache] Syncing agent.md: ${channel}#${peerId}`);
+            const state = await aunClient.checkAgentMd(peerId, 30);
+            let content;
+            if (state.in_sync && state.local_found) {
+                // 本地已是最新，读本地文件
+                const localPath = agentMdPath(peerId);
+                try {
+                    content = fs.readFileSync(localPath, 'utf-8');
+                }
+                catch { /* ignore */ }
+            }
+            if (!content) {
+                // 需要下载（不同步或本地不存在）
+                const info = await aunClient.fetchAgentMd(peerId);
+                content = info.content;
+            }
+            // 3. 比较 hash，仅在变化时重写 peer-identity.json
+            const newHash = 'sha256:' + crypto.createHash('sha256').update(content, 'utf-8').digest('hex');
+            const cached = this.get(channel, peerId, agentDir);
+            if (cached && cached.agentMdHash === newHash && cached.source === 'agentmd') {
+                return this.touchLastChecked(channel, peerId, agentDir, cached);
+            }
+            return this.updateFromAgentMd(channel, peerId, agentDir, content, Date.now());
         }
         catch (err) {
-            // 验签失败或下载失败 → 标记为 unknown，当做 agent
-            logger.warn(`[PeerIdentityCache] Failed to fetch agent.md: ${channel}#${peerId} err=${err instanceof Error ? err.message : String(err)}`);
+            // 4. 网络失败，fallback 本地文件
+            const localPath = agentMdPath(peerId);
+            try {
+                if (fs.existsSync(localPath)) {
+                    const localContent = fs.readFileSync(localPath, 'utf-8');
+                    logger.info(`[PeerIdentityCache] Network failed, using local agent.md for ${peerId}`);
+                    const localHash = 'sha256:' + crypto.createHash('sha256').update(localContent, 'utf-8').digest('hex');
+                    const cached = this.get(channel, peerId, agentDir);
+                    if (cached && cached.agentMdHash === localHash && cached.source === 'agentmd') {
+                        return this.touchLastChecked(channel, peerId, agentDir, cached);
+                    }
+                    return this.updateFromAgentMd(channel, peerId, agentDir, localContent, cached?.verifiedAt ?? 0);
+                }
+            }
+            catch { /* ignore fs errors */ }
+            logger.warn(`[PeerIdentityCache] Failed to resolve: ${channel}#${peerId} err=${err instanceof Error ? err.message : String(err)}`);
             return this.markUnknown(channel, peerId, agentDir);
         }
     }