evolclaw 3.1.1 → 3.1.3

package/dist/core/evolagent-registry.js

@@ -51,7 +51,7 @@ export function detectDuplicates(agents) {
 export class EvolAgentRegistry {
     _agentsDir;
     agents = new Map();
-    /** channel key (`<aid>#<type>#<name>`) → agent aid */
+    /** channel key (`<type>#<selfPeerId>#<name>`) → agent aid */
     channelIndex = new Map();
     /** 启动期被 ConfigStore 跳过的目录（命名非法 / 缺 config.json / 校验失败等） */
     skipped = [];
@@ -199,6 +199,12 @@ export class EvolAgentRegistry {
             logger.warn(`[EvolAgentRegistry] loadNewAgent ${aid}: ${errs.join('; ')}`);
             return null;
         }
+        // Channel fingerprint 冲突检测（防止新 agent 复用已有 agent 的凭证）
+        const conflict = this.checkConflictForReload(raw, aid);
+        if (conflict) {
+            logger.warn(`[EvolAgentRegistry] loadNewAgent ${aid}: ${conflict}`);
+            return null;
+        }
         const defaults = loadDefaults();
         const merged = mergeForAgent(raw, defaults);
         const agent = new EvolAgent(raw, merged);
@@ -224,12 +230,47 @@ export class EvolAgentRegistry {
             throw new Error(`Invalid config after edit: ${errs.join('; ')}`);
         const defaults = loadDefaults();
         const merged = mergeForAgent(raw, defaults);
+        // ── disabled → enabled 转换：需要完整启动流程 ──
+        if (oldAgent.status === 'disabled' && raw.enabled !== false) {
+            oldAgent.swapConfig(raw, merged);
+            const hotLoad = globalThis.__evolclaw_hotLoadAgent;
+            if (!hotLoad)
+                throw new Error(`Cannot enable agent "${aidOrName}": hot-load handler not initialized`);
+            // 从 registry 中移除旧的 disabled 实例，hotLoad 会重新创建
+            this.agents.delete(oldAgent.aid);
+            this.channelIndex.clear();
+            this.buildChannelIndex();
+            await hotLoad(oldAgent.aid);
+            logger.info(`[Reload] Agent "${aidOrName}" transitioned from disabled → enabled (full startup)`);
+            return;
+        }
+        // ── enabled → disabled 转换：断开所有 channel ──
+        if (oldAgent.status !== 'disabled' && raw.enabled === false) {
+            for (const ch of oldAgent.channelInstanceNames()) {
+                try {
+                    await hooks.drainChannel(ch);
+                }
+                catch { }
+                try {
+                    await hooks.disconnectChannel(ch);
+                }
+                catch { }
+            }
+            oldAgent.swapConfig(raw, merged);
+            oldAgent.status = 'disabled';
+            this.channelIndex.clear();
+            this.buildChannelIndex();
+            logger.info(`[Reload] Agent "${aidOrName}" disabled`);
+            return;
+        }
         const conflict = this.checkConflictForReload(raw, oldAgent.aid);
         if (conflict)
             throw new Error(`Channel conflict: ${conflict}`);
         const oldChannels = new Set(oldAgent.channelInstanceNames());
-        // 计算新 channel keys（用 EvolAgent 的格式化）
-        const newChannels = new Set(raw.channels.map(c => oldAgent.effectiveChannelName(c.type, c.name)));
+        // 计算新 channel keys：隐式 AUN + 显式非 AUN channels（与 channelInstanceNames 逻辑一致）
+        const aunKey = oldAgent.effectiveChannelName('aun', 'main');
+        const otherKeys = raw.channels.filter(c => c.type !== 'aun').map(c => oldAgent.effectiveChannelName(c.type, c.name));
+        const newChannels = new Set([aunKey, ...otherKeys]);
         const toRemove = [...oldChannels].filter(c => !newChannels.has(c));
         const toAdd = [...newChannels].filter(c => !oldChannels.has(c));
         const kept = [...oldChannels].filter(c => newChannels.has(c));
@@ -264,12 +305,7 @@ export class EvolAgentRegistry {
                 addedSuccessfully.push(ch);
             }
             // truly kept 的 adapter 实例已经在 oldAgent.channels 里，无需迁移
-            if (oldAgent.status === 'error' || oldAgent.status === 'disabled') {
-                // 保持原态——swap 不改 status
-            }
-            else {
-                oldAgent.status = 'running';
-            }
+            oldAgent.status = 'running';
             // 重启触发器调度器（如果已初始化）
             if (oldAgent.triggerScheduler) {
                 oldAgent.triggerScheduler.stop();

package/dist/core/evolagent.js

@@ -62,11 +62,11 @@ export class EvolAgent {
     }
     // ── Channels ──────────────────────────────────────────────────────────
     /**
-     * effective channel key：`<aid>#<type>#<name>`。AUN 实例一个 agent 只有一条；
-     * 其它类型靠 name 区分。
+     * effective channel key：`<type>#<urlEncode(selfPeerId)>#<name>`。
+     * AUN channel 的 selfPeerId 是 agent.aid，name 固定为 'main'。
      */
     effectiveChannelName(type, rawName) {
-        return formatChannelKey({ aid: this.aid, type, name: rawName });
+        return formatChannelKey({ type, selfPeerId: this.aid, name: rawName });
     }
     channelInstanceNames() {
         // AUN channel 隐式存在（从 agent.aid 派生），不需要在 channels[] 里声明
@@ -97,7 +97,7 @@ export class EvolAgent {
      */
     isAunChannelKey(channelKey) {
         const parsed = tryParseChannelKey(channelKey);
-        return parsed?.type === 'aun' && parsed.aid === this.aid;
+        return parsed?.type === 'aun' && parsed.selfPeerId === this.aid;
     }
     getOwner(channelKey) {
         if (this.isAunChannelKey(channelKey)) {
@@ -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) {
@@ -201,10 +211,10 @@ export class IMRenderer {
             call_id: callId || this.synthCallId(),
             name,
             ok,
-            result,
-            error,
-            duration_ms: durationMs,
-            text: descText,
+            ...(result !== undefined && { result }),
+            ...(error !== undefined && { error }),
+            ...(durationMs !== undefined && { duration_ms: durationMs }),
+            ...(descText !== undefined && { text: descText }),
         });
         this.messageTimestamps.push(Date.now());
         if (this.diagEnabled)

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

@@ -3,6 +3,8 @@ import { logger } from '../../utils/logger.js';
 import { StreamDebouncer } from './stream-debouncer.js';
 import { appendMessageLog, buildInboundEntry } from './message-log.js';
 import { buildEnvelope } from './message-processor.js';
+import { chatDirPath } from '../session/session-fs-store.js';
+import { resolvePaths } from '../../paths.js';
 /**
  * MessageBridge — Channel 与 Core 之间的消息桥梁
  *
@@ -74,8 +76,31 @@ export class MessageBridge {
                 // 2. 命令快速路径（去除引用前缀后检查，兼容话题中引用上文的情况）
                 const contentForCmd = content.replace(/^(>[^\n]*\n)+\n?/, '').trim();
                 const cmdContent = contentForCmd || content;
-                if (this.cmdHandler.isCommand(cmdContent)) {
+                const isCmd = this.cmdHandler.isCommand(cmdContent);
+                if (isCmd) {
                     logger.debug(`[MessageBridge] Command detected: "${cmdContent}", routing to handler`);
+                    // 命令也要记录入方向 jsonl（不创建 session，直接用 chatDirPath 计算路径）
+                    try {
+                        const chatDir = chatDirPath(resolvePaths().sessionsDir, msg.channelType || effectiveChannelType, msg.channelId, msg.selfId);
+                        const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
+                        const inboundChatmode = msg.replyContext?.metadata?.chatmode;
+                        appendMessageLog(chatDir, buildInboundEntry({
+                            from: msg.peerId || 'unknown',
+                            to: msg.selfId || 'self',
+                            chatType: msg.chatType || 'private',
+                            groupId: msg.groupId ?? null,
+                            msgId: msg.messageId ?? null,
+                            content,
+                            replyTo: msg.replyContext?.replyToMessageId ?? null,
+                            permMode: null,
+                            timestamp: Date.now(),
+                            encrypt: inboundEncrypt,
+                            chatmode: inboundChatmode,
+                        }));
+                    }
+                    catch (e) {
+                        logger.debug(`[MessageBridge] Failed to log inbound command: ${e}`);
+                    }
                 }
                 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 } });
@@ -182,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 {
@@ -193,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);
         }
-        return false;
+    }
+    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);
+        }
+        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

@@ -2,7 +2,6 @@ import path from 'path';
 import fs from 'fs';
 import crypto from 'crypto';
 import { hasCompact } from '../../agents/claude-runner.js';
-import { appendMessageLog, buildOutboundEntry } from './message-log.js';
 import { IMRenderer } from './im-renderer.js';
 import { StreamIdleMonitor } from './stream-idle-monitor.js';
 import { logger } from '../../utils/logger.js';
@@ -13,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 —— 出站三件套的信封部分。
  *
@@ -184,7 +198,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) {
@@ -550,7 +564,7 @@ export class MessageProcessor {
                         venueUid: undefined,
                         project: path.basename(absoluteProjectPath),
                         sessionName: session.name || undefined,
-                        sessionMode: isProactive ? 'proactive' : 'interactive',
+                        chatmode: isProactive ? 'proactive' : 'interactive',
                         readonly: session.metadata?.permissionMode === 'readonly',
                         canSendFile: !isProactive && currentCanSend,
                         capabilities: capParts.length > 0 ? capParts.join('、') : undefined,
@@ -572,7 +586,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) {
@@ -592,7 +606,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();
@@ -602,7 +616,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');
@@ -616,7 +630,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));
@@ -628,7 +642,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');
@@ -639,7 +663,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]
             // 注意：始终扫描全部文本（含中间轮），因为文件标记可能出现在任意轮次
@@ -928,7 +952,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 { }
@@ -965,7 +989,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`);
@@ -991,7 +1015,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;
@@ -1161,29 +1185,8 @@ export class MessageProcessor {
                         }
                         // 记录完成状态 + 最后一轮回复文本（后续 complete 覆盖前序）
                         completeResult = { isError: !!event.isError, subtype: event.subtype, errors: event.errors, terminalReason: event.terminalReason, lastReplyText, fullText: event.result || '', hasReceivedText, numTurns: event.numTurns, usage: event.usage };
-                        // proactive 模式：每轮 LLM 调用完成后写一条 thought 到 messages.jsonl
-                        // 这样 thought 数 = LLM 调用轮数，而不是 chunk 数
-                        if (session.sessionMode === 'proactive' && lastReplyText) {
-                            try {
-                                const chatDir = this.sessionManager.getChatDir(session);
-                                const sessionEncrypt = this.sessionManager.getSessionEncrypt(session.id);
-                                appendMessageLog(chatDir, buildOutboundEntry({
-                                    from: session.selfId || 'self',
-                                    to: session.metadata?.peerId ?? session.channelId,
-                                    chatType: (session.chatType ?? 'private'),
-                                    groupId: session.metadata?.groupId ?? null,
-                                    msgId: `thought-${session.id}-${Date.now()}`,
-                                    content: lastReplyText,
-                                    agent: session.agentId || null,
-                                    model: null,
-                                    durationMs: null,
-                                    encrypt: sessionEncrypt ?? undefined,
-                                    chatmode: 'proactive',
-                                    msgType: 'thought',
-                                }));
-                            }
-                            catch { }
-                        }
+                        // thought jsonl 写入已下沉到 aun.ts:sendThought 成功后，
+                        // 由那里按 LLM 输出的每个 text item 单独写一条，此处不再写。
                         // 失败且无前置错误输出：显示 errors 摘要
                         // 但用户主动中断（新消息打断 或 /stop 命令）时不显示错误提示
                         // 上下文过长的错误留给外层 isPromptTooLong 触发 auto-compact，不在此处输出
@@ -1195,9 +1198,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/session/session-fs-store.js

@@ -146,6 +146,29 @@ export function scanChatDirs(sessionsDir) {
         if (!typeEntry.isDirectory())
             continue;
         const channelType = typeEntry.name;
+        // 包含 '#' 的目录是旧 channelKey 格式（如 'aun#dddd.agentid.pub#main'），
+        // 按通用 channel 布局扫描（sessionsDir/{channelKey}/{encodedChannelId}/），保持兼容
+        if (channelType.includes('#')) {
+            const typeDir = path.join(sessionsDir, channelType);
+            let chatEntries;
+            try {
+                chatEntries = fs.readdirSync(typeDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const chatEntry of chatEntries) {
+                if (!chatEntry.isDirectory())
+                    continue;
+                results.push({
+                    channelType,
+                    selfId: null,
+                    channelId: decodeSegment(chatEntry.name),
+                    dirPath: path.join(typeDir, chatEntry.name),
+                });
+            }
+            continue;
+        }
         const typeDir = path.join(sessionsDir, channelType);
         if (channelType === 'aun') {
             // aun 下还有一层 selfId