evolclaw 3.3.0 → 3.4.0

package/dist/core/evolagent-registry.js

@@ -1,5 +1,7 @@
+import fs from 'fs';
 import { EvolAgent } from './evolagent.js';
 import { logger } from '../utils/logger.js';
+import { agentMdPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, mergeForAgent, ensureAgentDirSkeleton, loadAgent, validateAgentConfig, } from '../config-store.js';
 // ── Channel Fingerprint ────────────────────────────────────────────────────
 // 用于检测多 agent 之间复用同一外部凭证的冲突（appId、aid、token 等）。
@@ -333,6 +335,44 @@ export class EvolAgentRegistry {
             throw err;
         }
     }
+    // ── Stop / Start（运行时断连/重连，不改 config.enabled）──────────────────
+    async stopAgent(aidOrName, hooks) {
+        const agent = this.agents.get(aidOrName);
+        if (!agent)
+            throw new Error(`Agent "${aidOrName}" not found`);
+        if (agent.status === 'disabled')
+            throw new Error(`Agent is disabled; use enable/disable instead`);
+        if (agent.status === 'stopped')
+            return;
+        // 先断开 AID 连接（下线），让未送达的消息保留在云端；
+        // 然后中断正在执行的大模型调用（不等它跑完）。
+        for (const ch of agent.channelInstanceNames()) {
+            try {
+                await hooks.disconnectChannel(ch);
+            }
+            catch { }
+        }
+        agent.status = 'stopped';
+        this.channelIndex.clear();
+        this.buildChannelIndex();
+        logger.info(`[Registry] Stopped agent ${aidOrName}`);
+    }
+    async startAgent(aidOrName, hooks) {
+        const agent = this.agents.get(aidOrName);
+        if (!agent)
+            throw new Error(`Agent "${aidOrName}" not found`);
+        if (agent.status === 'disabled')
+            throw new Error(`Agent is disabled; use enable instead`);
+        if (agent.status === 'running')
+            return;
+        for (const ch of agent.channelInstanceNames()) {
+            await hooks.startChannel(agent, ch);
+        }
+        agent.status = 'running';
+        this.channelIndex.clear();
+        this.buildChannelIndex();
+        logger.info(`[Registry] Started agent ${aidOrName}`);
+    }
     checkConflictForReload(newRaw, excludeAid) {
         const newFps = new Set();
         for (const inst of newRaw.channels) {
@@ -353,9 +393,50 @@ export class EvolAgentRegistry {
         }
         return null;
     }
+    // ── 友好名缓存（从本地 agent.md 解析，缺失时异步从网络拉取）──
+    displayNameCache = new Map();
+    displayNamePending = new Set();
+    resolveDisplayName(aid) {
+        const cached = this.displayNameCache.get(aid);
+        if (cached)
+            return cached;
+        try {
+            const mdPath = agentMdPath(aid);
+            if (fs.existsSync(mdPath)) {
+                const content = fs.readFileSync(mdPath, 'utf-8');
+                const fm = content.match(/^---\n([\s\S]*?)\n---/);
+                if (fm) {
+                    const nm = fm[1].match(/^name:\s*["']?(.+?)["']?\s*$/m);
+                    if (nm?.[1]) {
+                        this.displayNameCache.set(aid, nm[1]);
+                        return nm[1];
+                    }
+                }
+            }
+        }
+        catch { /* ignore */ }
+        // 异步从网络拉取（仅一次，不阻塞）
+        if (!this.displayNamePending.has(aid)) {
+            this.displayNamePending.add(aid);
+            import('../aun/aid/index.js').then(({ agentmdGet }) => {
+                agentmdGet(aid).then(content => {
+                    if (typeof content === 'string') {
+                        const fm = content.match(/^---\n([\s\S]*?)\n---/);
+                        if (fm) {
+                            const nm = fm[1].match(/^name:\s*["']?(.+?)["']?\s*$/m);
+                            if (nm?.[1])
+                                this.displayNameCache.set(aid, nm[1]);
+                        }
+                    }
+                }).catch(() => { }).finally(() => this.displayNamePending.delete(aid));
+            }).catch(() => { this.displayNamePending.delete(aid); });
+        }
+        return undefined;
+    }
     toInfo(agent) {
         return {
             name: agent.name,
+            displayName: this.resolveDisplayName(agent.aid),
             aid: agent.aid,
             status: agent.status,
             channels: agent.channelInstanceNames(),

package/dist/core/evolagent.js

@@ -177,6 +177,14 @@ export class EvolAgent {
             delete block.model;
         else
             block.model = value;
+        // sync merged so getter reflects the change immediately
+        if (!this.merged.baseagents)
+            this.merged.baseagents = {};
+        const mBlock = ((this.merged.baseagents)[ba] ??= {});
+        if (value === undefined)
+            delete mBlock.model;
+        else
+            mBlock.model = value;
         this.persist();
     }
     setBaseagentEffort(value) {
@@ -189,6 +197,14 @@ export class EvolAgent {
             delete block[fieldName];
         else
             block[fieldName] = value;
+        // sync merged so getter reflects the change immediately
+        if (!this.merged.baseagents)
+            this.merged.baseagents = {};
+        const mBlock = ((this.merged.baseagents)[ba] ??= {});
+        if (value === undefined)
+            delete mBlock[fieldName];
+        else
+            mBlock[fieldName] = value;
         this.persist();
     }
     /** 设置私聊 chatmode（群聊/非 human 强制 proactive，无可写入项）。 */

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

@@ -1,23 +1,9 @@
 import { logger } from '../../utils/logger.js';
 import { summarizeToolInput } from '../permission.js';
+import { CONTEXT_TOO_LONG_PATTERN, isContextTooLongText } from '../../utils/error-utils.js';
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../../paths.js';
-/**
- * 检测是否为上下文过长错误
- * 统一的检测逻辑，覆盖所有已知的错误文本模式
- */
-function isContextTooLongError(text) {
-    if (!text)
-        return false;
-    const lower = text.toLowerCase();
-    return (lower.includes('prompt is too long') ||
-        lower.includes('input is too long') ||
-        lower.includes('context too long') ||
-        lower.includes('context limit') ||
-        lower.includes('context_length_exceeded') ||
-        text.includes('上下文过长'));
-}
 let diagStream = null;
 function getDiagStream() {
     if (!diagStream) {
@@ -107,11 +93,16 @@ export class IMRenderer {
             clearTimeout(this.timer);
             this.timer = undefined;
         }
-        const text = this.textBuffer;
+        // 文件标记过滤：tool_use 前的文本块也不能把 marker 暴露给用户
+        const rawText = this.opts.fileMarkerPattern
+            ? this.textBuffer.replace(this.opts.fileMarkerPattern, '')
+            : this.textBuffer;
         this.textBuffer = '';
+        if (!rawText)
+            return;
         // 清掉 itemsQueue 中的 text items（已发出）
         this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
-        const payload = { kind: 'result.text', text, isFinal: false };
+        const payload = { kind: 'result.text', text: rawText, isFinal: false };
         this.sentContent = true;
         this.sendChain = this.sendChain
             .then(() => this.opts.send(payload))
@@ -135,9 +126,9 @@ export class IMRenderer {
     // ── 文本/活动注入（替代 StreamFlusher.addText/addActivity）──
     /** 添加文本片段（流式 text） */
     addText(text, outputTokens, turn) {
-        this.emitProgress('text', outputTokens, turn);
         if (this.opts.envelope.chatmode === 'proactive')
             return;
+        this.emitProgress('text', outputTokens, turn);
         if (!text)
             return;
         // 同一窗口内连续 text delta 合并到最后一个 text item
@@ -162,9 +153,9 @@ export class IMRenderer {
     }
     /** 添加工具调用 */
     addToolCall(name, input, callId, descText, turn, outputTokens) {
-        this.emitProgress('tool_call', outputTokens, turn, { toolName: name, callId });
         if (this.opts.envelope.chatmode === 'proactive')
             return;
+        this.emitProgress('tool_call', outputTokens, turn, { toolName: name, callId });
         if (this.opts.suppressActivities)
             return;
         this.itemsQueue.push({
@@ -181,9 +172,9 @@ export class IMRenderer {
     }
     /** 添加工具结果 */
     addToolResult(name, ok, result, error, callId, durationMs, descText) {
-        this.emitProgress('tool_result', undefined, undefined, { toolName: name, callId, ok, durationMs });
         if (this.opts.envelope.chatmode === 'proactive')
             return;
+        this.emitProgress('tool_result', undefined, undefined, { toolName: name, callId, ok, durationMs });
         if (this.opts.suppressActivities)
             return;
         this.itemsQueue.push({
@@ -207,20 +198,35 @@ export class IMRenderer {
             return;
         if (this.opts.suppressActivities)
             return;
-        this.itemsQueue.push({
-            kind: 'progress',
+        this.emitProgress('progress', undefined, undefined, {
             text,
             state: opts.state,
-            tool_uses: opts.toolUses,
-            duration_ms: opts.durationMs,
+            toolUses: opts.toolUses,
+            durationMs: opts.durationMs,
         });
-        this.messageTimestamps.push(Date.now());
-        this.scheduleFlush();
     }
+    /**
+     * proactive 下放行为 thought 的 notice subtype 白名单——仅"真·终态错误"：
+     * - context-too-long：上下文超限且无法 auto-compact，任务到此终止
+     * - process-exit：Agent 子进程异常崩溃（无 complete 事件，emit 完全覆盖不到）
+     * 二者都是用户必须知道、否则会困惑"任务为什么停了"的终态信号。
+     *
+     * 其余 subtype 一律不发：
+     * - compact / runtime-error / task-error：emit() 路径（mapEventToItem）已投影，重复
+     * - compact-start / compact-trigger / compact-retry / retry：内部机务噪音（压缩中/
+     *   重试中/压缩完成），proactive 下用户要的是工作产出而非流水账，压缩后 thought 会
+     *   继续输出，过程本身无需播报。
+     */
+    static PROACTIVE_NOTICE_ALLOW = new Set(['context-too-long', 'process-exit']);
     /** 添加系统提示 / 通知。force=true 时绕过 suppressActivities（用于 compact/retry/error 等操作反馈） */
     addNotice(text, severity, subtype, force = false) {
-        if (this.opts.envelope.chatmode === 'proactive')
+        // proactive 模式：只放行真·终态错误，机务噪音（压缩/重试）和 emit 已覆盖的 subtype 均不发。
+        if (this.opts.envelope.chatmode === 'proactive') {
+            if (subtype == null || !IMRenderer.PROACTIVE_NOTICE_ALLOW.has(subtype))
+                return;
+            this.emitProactiveItem({ kind: 'notice', text, severity, subtype });
             return;
+        }
         if (this.opts.suppressActivities && !force)
             return;
         this.itemsQueue.push({ kind: 'notice', text, severity, subtype });
@@ -308,10 +314,25 @@ export class IMRenderer {
             clearTimeout(this.timer);
             this.timer = undefined;
         }
+        // 文件标记过滤：marker 任何时候都不该出现在用户文本里，必须在 *每次* flush
+        // （含非最终的定时 flush）执行。否则文本块若滞留 buffer 后被定时器触发，会走
+        // 下方非-final 的 result.text 路径，把 [SEND_FILE:...] 原样发给用户。
+        // 非最终 flush 不做 trim，避免 trim 掉 Markdown 块级换行。
+        if (this.opts.fileMarkerPattern) {
+            const strip = (s) => {
+                const replaced = s.replace(this.opts.fileMarkerPattern, '');
+                return isFinal ? replaced.trim() : replaced;
+            };
+            this.textBuffer = strip(this.textBuffer);
+            for (const item of this.itemsQueue) {
+                if (item.kind === 'text')
+                    item.text = item.text.replace(this.opts.fileMarkerPattern, '');
+            }
+        }
         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 ctxErrPattern = new RegExp(CONTEXT_TOO_LONG_PATTERN.source, 'gi');
             const stripCtxErr = (s) => s.replace(ctxErrPattern, '').trim();
             this.textBuffer = stripCtxErr(this.textBuffer);
             this.allText = stripCtxErr(this.allText);
@@ -319,14 +340,6 @@ export class IMRenderer {
                 if (item.kind === 'text')
                     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
         const items = this.itemsQueue.filter(it => {
@@ -402,6 +415,9 @@ export class IMRenderer {
                 ...(extra?.callId != null && { callId: extra.callId }),
                 ...(extra?.ok != null && { ok: extra.ok }),
                 ...(extra?.durationMs != null && { durationMs: extra.durationMs }),
+                ...(extra?.text != null && { text: extra.text }),
+                ...(extra?.state != null && { state: extra.state }),
+                ...(extra?.toolUses != null && { toolUses: extra.toolUses }),
             },
         };
         this.opts.send(payload).catch(() => { });
@@ -422,17 +438,19 @@ export class IMRenderer {
             this.hasEmittedText = true;
             this.allText += item.text;
         }
-        const outputTokens = event.outputTokens;
-        const turn = event.turn;
-        const activityType = item.kind === 'text' ? 'text' : item.kind === 'tool_call' ? 'tool_call' : 'tool_result';
-        const extra = item.kind === 'tool_call'
-            ? { toolName: item.name, callId: item.call_id }
-            : item.kind === 'tool_result'
-                ? { toolName: item.name, callId: item.call_id, ok: item.ok, durationMs: item.duration_ms }
-                : undefined;
-        this.emitProgress(activityType, outputTokens, turn, extra);
+        // proactive 模式：status.progress 是 interactive 的处理状态指示器，proactive 下
+        // 过程由 thought（activity.batch）表达，不再发 status.progress（与 addProgress 在
+        // proactive 下的拦截保持一致）。progress-kind item 若进 activity.batch 会被 aun 侧
+        // 回转成 status.progress（见 aun.ts 'activity.batch' 分支），故直接丢弃。
+        // 终态 status（started/completed/interrupted/error）由 message-processor 发送，不受影响。
+        if (item.kind === 'progress') {
+            return;
+        }
+        this.emitProactiveItem(item);
+    }
+    /** proactive 模式逐条投影：单个 ThoughtItem 包成 activity.batch[1] 发出（fire-and-forget）。 */
+    emitProactiveItem(item) {
         const payload = { kind: 'activity.batch', items: [item] };
-        // fire-and-forget
         this.opts.send(payload).catch(err => {
             logger.debug(`[IMRenderer] proactive send failed: ${err.message}`);
         });
@@ -496,15 +514,15 @@ export class IMRenderer {
             }
             case 'error': {
                 // 上下文过长错误不输出（留给外层 auto-compact 处理）
-                if (isContextTooLongError(event.error || ''))
+                if (isContextTooLongText(event.error || ''))
                     return null;
                 return { kind: 'notice', text: event.error, severity: 'warn' };
             }
             case 'complete': {
                 // 上下文过长错误不输出（留给外层 auto-compact 处理）
                 const hasContextError = event.terminalReason === 'prompt_too_long'
-                    || isContextTooLongError(event.errors?.join(' ') || '')
-                    || isContextTooLongError(event.result || '');
+                    || isContextTooLongText(event.errors?.join(' ') || '')
+                    || isContextTooLongText(event.result || '');
                 if (event.isError && hasContextError) {
                     return null;
                 }

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

@@ -110,7 +110,11 @@ export class MessageBridge {
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
                 if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
-                    await sendReply(msg.channelId, '群聊中无权限创建话题', msg.replyContext);
+                    // 静默丢弃：绝不向群里注入回复。
+                    // 拒绝消息本身会带原 thread_id（AUN replyContext 透传），变成一条新群消息；
+                    // 若发送者也是 agent，该拒绝消息又会 @ 回对方 → A 拒绝→B 收到→B 拒绝→A 收到 的无限循环。
+                    // AUN 自主模式下「不响应」是合法的，因此无权限创建话题时只记日志、直接 return。
+                    logger.info(`[MessageBridge] Thread creation denied (silent drop): channel=${channelName} channelId=${msg.channelId} thread=${msg.threadId} sender=${msg.peerId}`);
                     return;
                 }
                 const metadata = {};
@@ -231,6 +235,7 @@ export class MessageBridge {
         cli: '/cli',
         agent: '/agent',
         trigger: '/trigger',
+        file: '/file',
     };
     extractTopicName(msg) {
         const raw = msg.topicName
@@ -246,8 +251,16 @@ export class MessageBridge {
         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';
+        // 群话题创建权限只看「发送者在该群里的角色」（AUN 经 group.get_admins 实时查询，权威源）。
+        // 仅群 owner/admin 可建话题；member / 非成员 / 查询失败（undefined）一律 fail-closed 拒绝。
+        // 这与 bot 的 owner/admin 无关——不引入 resolveIdentity 兜底。
+        // 不暴露群角色的渠道（adapter 无 getGroupMemberRole）不受此守卫约束，放行。
+        const adapter = this.processor?.getChannelInfo?.(channel)?.adapter;
+        if (adapter?.getGroupMemberRole) {
+            const groupRole = await adapter.getGroupMemberRole(msg.channelId, msg.peerId);
+            return groupRole === 'owner' || groupRole === 'admin';
+        }
+        return true;
     }
     resolveCmd(name, cmd) {
         if (cmd)
@@ -292,7 +305,7 @@ export class MessageBridge {
         const { id } = req;
         try {
             const identity = this.sessionManager.resolveIdentity(channel, msg.peerId);
-            const data = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private');
+            const data = this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private', msg.isControlChannel ? 'control' : 'agent');
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, data }, sendReply);
         }
         catch (err) {
@@ -306,7 +319,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, msg.chatType);
+            const result = await this.cmdHandler.execMenuQuery(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, msg.chatType, msg.isControlChannel ?? false);
             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);
@@ -322,7 +335,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, undefined, msg.chatType) ?? [];
+            const data = await this.cmdHandler.getSubMenuItems(resolvedCmd, channel, msg.channelId, msg.peerId, req.args, undefined, msg.chatType, msg.isControlChannel ?? false) ?? [];
             await this.sendMenuResponse(adapter, channel, msg.channelId, { type: 'menu.response', id, name, data }, sendReply);
         }
         catch (err) {
@@ -333,12 +346,12 @@ export class MessageBridge {
         }
     }
     async handleMenuUpdate(req, channel, msg, adapter, sendReply) {
-        const { id, name, cmd, value } = req;
+        const { id, name, cmd, value, args } = 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);
+            const result = await this.cmdHandler.execMenuUpdate(resolvedCmd, value, channel, msg.channelId, msg.peerId, undefined, msg.isControlChannel ?? false, args);
             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);
@@ -356,7 +369,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, undefined, msg.chatType);
+            const result = await this.cmdHandler.execMenuAction(resolvedCmd, action, args, channel, msg.channelId, msg.peerId, undefined, msg.chatType, id, msg.isControlChannel ?? false);
             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);
@@ -473,4 +486,12 @@ export class MessageBridge {
             d.dispose();
         this.debouncers.clear();
     }
+    /** 注销单个渠道的 debouncer（热重载断开渠道时调用） */
+    removeChannel(channelName) {
+        const d = this.debouncers.get(channelName);
+        if (d) {
+            d.dispose();
+            this.debouncers.delete(channelName);
+        }
+    }
 }