evolclaw 3.2.0 → 3.3.0

package/dist/core/evolagent-registry.js

@@ -356,6 +356,7 @@ export class EvolAgentRegistry {
     toInfo(agent) {
         return {
             name: agent.name,
+            aid: agent.aid,
             status: agent.status,
             channels: agent.channelInstanceNames(),
             projectPath: agent.projectPath,

package/dist/core/evolagent.js

@@ -3,7 +3,7 @@ import { logger } from '../utils/logger.js';
 import { saveAgent } from '../config-store.js';
 import { formatChannelKey, tryParseChannelKey } from './channel-loader.js';
 import { agentPersonalDir } from '../paths.js';
-import { fileCache } from './cache/file-cache.js';
+import { fileCache } from './daemon-file-cache.js';
 /**
  * EvolAgent —— 一个 self-agent 的运行时表示。
  *

package/dist/core/interaction-router.js

@@ -68,6 +68,14 @@ export class InteractionRouter {
         const handler = this.handlers.get(response.id);
         if (!handler)
             return false;
+        // Initiator 校验（集中式 backstop）：非发起者的操作直接丢弃，不消费 handler、不解除等待，
+        // 让真正的发起者仍可继续操作。身份只信渠道传入的已认证 operatorId（来自消息信封，非 payload 自报）。
+        // 渠道层若已自行校验（如飞书的 reject toast），此处不会重复命中（operatorId 已匹配）。
+        if (handler.initiatorId && response.operatorId
+            && response.operatorId !== handler.initiatorId) {
+            logger.info(`[InteractionRouter] rejected non-initiator: operator=${response.operatorId} initiator=${handler.initiatorId} id=${response.id}`);
+            return false;
+        }
         if (handler.timer)
             clearTimeout(handler.timer);
         this.handlers.delete(response.id);

package/dist/core/message/command-handler-agent-control.js

@@ -1,7 +1,8 @@
-import { agentCreateNonInteractive, agentDelete, agentEnable, agentDisable, agentList, agentShow, agentSet, } from '../../cli/agent.js';
+import { agentCreateNonInteractive, agentDelete, agentEnable, agentDisable, agentList, agentShow, agentSet, agentReload, } from '../../cli/agent.js';
 import { logger } from '../../utils/logger.js';
 import { resolvePaths } from '../../paths.js';
 import path from 'path';
+import { loadAgent, saveAgent } from '../../config-store.js';
 import { CreateStatusWriter, readCreateStatus } from './create-status.js';
 /** 把 cli/agent.ts 的 error 字符串映射为结构化错误码 */
 function classifyError(error) {
@@ -116,8 +117,69 @@ export async function execAgentAction(action, args, peerId) {
             return { error: res.error, code: classifyError(res.error) };
         return { data: { aid: res.aid, enabled: res.enabled, reloaded: res.reloaded } };
     }
+    if (action === 'reload') {
+        if (!a.aid)
+            return { error: '缺少 aid', code: 'INVALID_ARGS' };
+        const res = await agentReload(a.aid);
+        if (!('ok' in res) || res.ok !== true)
+            return { error: res.error, code: classifyError(res.error) };
+        return { data: { aid: a.aid, reloaded: true } };
+    }
+    if (action === 'update') {
+        return await execAgentUpdate(a);
+    }
     return { error: `不支持的 action: ${action}`, code: 'INVALID_ARGS' };
 }
+/** name=agent 的 menu.action=update：仅落盘 config patch，不触发 reload。
+ *  直接 loadAgent + saveAgent（不走 agentSet，避免其内部自动 evolagent.reload）——
+ *  重载由用户在 Agents 页操作列手动触发（带任务执行检查）。
+ *  AUN 渠道绑定 agent 顶层 aid，不可通过 patch 编辑：拒绝改 aid、拒绝 channels 数组里出现 aun 条目。
+ *  可写字段：baseagents / projects / owners / chatmode / channels（非 aun）。 */
+export async function execAgentUpdate(args) {
+    const a = args ?? {};
+    if (!a.aid)
+        return { error: '缺少 aid', code: 'INVALID_ARGS' };
+    const p = a.patch ?? {};
+    if (p.aid !== undefined) {
+        return { error: 'aid 不可修改（AUN 身份绑定，如需换 AID 请删除后重建）', code: 'INVALID_ARGS' };
+    }
+    if (Array.isArray(p.channels) && p.channels.some((c) => c?.type === 'aun')) {
+        return { error: 'AUN 渠道不可通过 patch 编辑（由 agent aid 隐式管理）', code: 'INVALID_ARGS' };
+    }
+    const config = loadAgent(a.aid);
+    if (!config)
+        return { error: `Agent "${a.aid}" not found`, code: 'NOT_FOUND' };
+    let touched = false;
+    if (p.baseagents !== undefined) {
+        config.baseagents = p.baseagents;
+        touched = true;
+    }
+    if (p.projects !== undefined) {
+        config.projects = p.projects;
+        touched = true;
+    }
+    if (p.owners !== undefined) {
+        config.owners = p.owners;
+        touched = true;
+    }
+    if (p.chatmode !== undefined) {
+        config.chatmode = p.chatmode;
+        touched = true;
+    }
+    if (p.channels !== undefined) {
+        config.channels = p.channels;
+        touched = true;
+    }
+    if (!touched)
+        return { error: 'patch 为空，无可写字段', code: 'INVALID_ARGS' };
+    try {
+        saveAgent(config);
+    }
+    catch (e) {
+        return { error: e?.message || String(e), code: classifyError(e?.message || String(e)) };
+    }
+    return { data: { aid: a.aid, saved: true } };
+}
 /** project 兜底：显式值 > rootPath 合成 > defaultPath > undefined */
 export function resolveProjectPath(explicit, aid, defaults) {
     if (explicit && explicit.trim())

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

@@ -308,21 +308,24 @@ export class IMRenderer {
             clearTimeout(this.timer);
             this.timer = undefined;
         }
-        // 上下文错误短语过滤：剔除错误关键词本身，保留前后内容
-        const ctxErrPattern = /prompt is too long|input is too long|context too long|context limit|context_length_exceeded|上下文过长/gi;
-        const stripCtxErr = (s) => s.replace(ctxErrPattern, '').trim();
-        this.textBuffer = stripCtxErr(this.textBuffer);
-        this.allText = stripCtxErr(this.allText);
-        for (const item of this.itemsQueue) {
-            if (item.kind === 'text')
-                item.text = stripCtxErr(item.text);
-        }
-        // 文件标记过滤
-        if (this.opts.fileMarkerPattern) {
-            this.textBuffer = this.textBuffer.replace(this.opts.fileMarkerPattern, '').trim();
+        if (isFinal) {
+            // 上下文错误短语过滤：剔除错误关键词本身，保留前后内容。
+            // 只在最终 flush 清理，避免中间定时 flush trim 掉 Markdown 块级换行。
+            const ctxErrPattern = /prompt is too long|input is too long|context too long|context limit|context_length_exceeded|上下文过长/gi;
+            const stripCtxErr = (s) => s.replace(ctxErrPattern, '').trim();
+            this.textBuffer = stripCtxErr(this.textBuffer);
+            this.allText = stripCtxErr(this.allText);
             for (const item of this.itemsQueue) {
                 if (item.kind === 'text')
-                    item.text = item.text.replace(this.opts.fileMarkerPattern, '');
+                    item.text = stripCtxErr(item.text);
+            }
+            // 文件标记过滤
+            if (this.opts.fileMarkerPattern) {
+                this.textBuffer = this.textBuffer.replace(this.opts.fileMarkerPattern, '').trim();
+                for (const item of this.itemsQueue) {
+                    if (item.kind === 'text')
+                        item.text = item.text.replace(this.opts.fileMarkerPattern, '');
+                }
             }
         }
         // 清掉空 text items
@@ -356,6 +359,25 @@ export class IMRenderer {
             this.lastFlush = Date.now();
             this.flushCount++;
         }
+        // 1.5 非最终定时 flush：把已累积的文本块作为独立 result.text 发出。
+        //   每个 text 事件本身是完整语义块（runner 已合并流式 delta），工具调用前的
+        //   文本一向作为独立气泡发送（见 message-processor 的 flushText 调用）。
+        //   这里补上「文本块后面没有紧跟 tool_use」的情况——例如 readonly 拒绝写文件时
+        //   SDK 直接拒绝、不产生 tool_use 事件，文本会一直滞留 buffer，直到下一个
+        //   tool_use 才被 flushText 带出，并与其后的文本合并成一条（用户侧表现为：
+        //   第一条文本等待一分多钟后才和第二条凑成一条发出）。定时器到期即发，根除滞留。
+        if (!isFinal && this.textBuffer.length > 0) {
+            const text = this.textBuffer;
+            this.textBuffer = '';
+            const payload = { kind: 'result.text', text, isFinal: false };
+            this.sentContent = true;
+            this.sendChain = this.sendChain
+                .then(() => this.opts.send(payload))
+                .catch(e => logger.warn('[IMRenderer] timed result.text send failed:', e));
+            await this.sendChain;
+            this.lastFlush = Date.now();
+            this.flushCount++;
+        }
         // 2. isFinal=true 时单独发最终回复文本
         if (isFinal && finalText.length > 0) {
             const payload = { kind: 'result.text', text: finalText, isFinal: true };

package/dist/core/message/items-formatter.js

@@ -34,7 +34,7 @@ function formatItem(item) {
         case 'tool_result': {
             if (!item.ok) {
                 const errMsg = item.error || (typeof item.result === 'string' ? item.result : '执行失败');
-                return `⚠️ ${item.name}: ${errMsg}`;
+                return `⚠️ ${item.name}: ${capLines(errMsg, 5)}`;
             }
             return item.text ? `✓ ${item.name}: ${item.text}` : `✓ ${item.name}`;
         }
@@ -48,6 +48,14 @@ function formatItem(item) {
             return '';
     }
 }
+/** 把多行文本截断到最多 maxLines 行，超出部分用省略提示替代。用于工具报错输出，避免刷屏。 */
+function capLines(text, maxLines) {
+    const lines = text.split('\n');
+    if (lines.length <= maxLines)
+        return text;
+    const omitted = lines.length - maxLines;
+    return lines.slice(0, maxLines).join('\n') + `\n…(省略 ${omitted} 行)`;
+}
 function summarizeArgs(args) {
     if (!args || typeof args !== 'object')
         return '';

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

@@ -109,6 +109,10 @@ export class MessageBridge {
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
+                if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
+                    await sendReply(msg.channelId, '群聊中无权限创建话题', msg.replyContext);
+                    return;
+                }
                 const metadata = {};
                 // 话题会话创建时写入 replyContext（用于 threadId 路由）；主会话不写（避免群聊覆盖）
                 if (msg.threadId && msg.replyContext)
@@ -134,7 +138,7 @@ export class MessageBridge {
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelName);
                 const effectiveProjectPath = owningAgent?.projectPath
                     ?? this.defaultProjectPath;
-                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType, undefined, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType);
+                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, this.extractTopicName(msg), msg.peerId, chatType, undefined, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType);
                 // 4. 群聊发送者标注由消息渲染层（message-renderer）逐条承担，不再在此硬编码前缀，
                 //    消息日志因此保存干净原文。policy.messagePrefix 暂保留（未来清理）。
                 // 5. 构造完整消息（channel 字段存实例名，用于 session 精确匹配）
@@ -143,6 +147,7 @@ export class MessageBridge {
                     channelType: msg.channelType || effectiveChannelType,
                     channelId: msg.channelId, content,
                     selfAID: msg.selfAID,
+                    agentId: session.agentId,
                     chatType,
                     images: msg.images, timestamp: Date.now(),
                     peerId: msg.peerId, peerName: msg.peerName,
@@ -152,25 +157,30 @@ export class MessageBridge {
                     sameEgressIp: msg.sameEgressIp,
                     messageId: msg.messageId,
                     mentions: msg.mentions, mentionAids: msg.mentionAids, threadId: msg.threadId,
+                    topicName: this.extractTopicName(msg),
                     replyContext: msg.replyContext,
+                    source: msg.source,
+                    dispatchMode: msg.dispatchMode,
                 };
-                // 5.5 写入消息记录（入方向）
-                const chatDir = this.sessionManager.getChatDir(session);
-                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.selfAID || 'self',
-                    chatType,
-                    groupId: msg.groupId ?? null,
-                    msgId: msg.messageId ?? null,
-                    content,
-                    replyTo: msg.replyContext?.replyToMessageId ?? null,
-                    permMode: session.identity?.role ?? null,
-                    timestamp: fullMessage.timestamp,
-                    encrypt: inboundEncrypt,
-                    chatmode: inboundChatmode,
-                }));
+                // 5.5 写入消息记录（入方向）。
+                {
+                    const chatDir = this.sessionManager.getChatDir(session);
+                    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.selfAID || 'self',
+                        chatType,
+                        groupId: msg.groupId ?? null,
+                        msgId: msg.messageId ?? null,
+                        content,
+                        replyTo: msg.replyContext?.replyToMessageId ?? null,
+                        permMode: session.identity?.role ?? null,
+                        timestamp: fullMessage.timestamp,
+                        encrypt: inboundEncrypt,
+                        chatmode: inboundChatmode,
+                    }));
+                }
                 // 6. ACK + debounce/enqueue
                 //    ACK 在到达时立即做（每条独立 ACK），不等合并
                 //    Interrupt 模式（单聊）→ 入队前 debounce 合并
@@ -209,6 +219,7 @@ export class MessageBridge {
     static MENU_NAME_MAP = {
         pwd: '/pwd',
         session: '/session',
+        topic: '/topic',
         baseagent: '/baseagent',
         model: '/model',
         effort: '/effort',
@@ -221,6 +232,23 @@ export class MessageBridge {
         agent: '/agent',
         trigger: '/trigger',
     };
+    extractTopicName(msg) {
+        const raw = msg.topicName
+            ?? msg.replyContext?.title
+            ?? msg.replyContext?.metadata?.topicName
+            ?? msg.replyContext?.metadata?.title;
+        const name = typeof raw === 'string' ? raw.trim() : '';
+        return name || undefined;
+    }
+    async canCreateThreadSession(channel, msg, chatType) {
+        if (chatType !== 'group' || !msg.threadId)
+            return true;
+        const existing = await this.sessionManager.getThreadSession(channel, msg.channelId, msg.threadId);
+        if (existing)
+            return true;
+        const role = this.sessionManager.resolveIdentity(channel, msg.peerId).role;
+        return role === 'owner' || role === 'admin';
+    }
     resolveCmd(name, cmd) {
         if (cmd)
             return cmd;
@@ -278,7 +306,7 @@ export class MessageBridge {
         const { id, name, cmd } = req;
         try {
             const resolvedCmd = this.resolveCmd(name, cmd);
-            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId, req.args);
+            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, msg.chatType);
             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);
@@ -294,7 +322,7 @@ export class MessageBridge {
         const { id, name, cmd } = req;
         try {
             const resolvedCmd = this.resolveCmd(name, cmd);
-            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId, req.args) ?? [];
+            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, undefined, msg.chatType) ?? [];
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data }, sendReply);
         }
         catch (err) {
@@ -328,7 +356,7 @@ export class MessageBridge {
             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);
+            const result = await this.cmdHandler.execMenuAction(resolvedCmd, action, args, channel, msg.channelId, msg.peerId, undefined, msg.chatType);
             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);

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

@@ -68,6 +68,7 @@ export function buildInboundEntry(opts) {
         durationMs: null,
         encrypt: opts.encrypt,
         chatmode: opts.chatmode,
+        source: opts.source,
     };
 }
 export function buildOutboundEntry(opts) {