evolclaw 3.1.4 → 3.1.6

package/dist/core/evolagent-registry.js

@@ -51,7 +51,7 @@ export function detectDuplicates(agents) {
 export class EvolAgentRegistry {
     _agentsDir;
     agents = new Map();
-    /** channel key (`<type>#<selfPeerId>#<name>`) → agent aid */
+    /** channel key (`<type>#<selfAID>#<name>`) → agent aid */
     channelIndex = new Map();
     /** 启动期被 ConfigStore 跳过的目录（命名非法 / 缺 config.json / 校验失败等） */
     skipped = [];

package/dist/core/evolagent.js

@@ -62,11 +62,11 @@ export class EvolAgent {
     }
     // ── Channels ──────────────────────────────────────────────────────────
     /**
-     * effective channel key：`<type>#<urlEncode(selfPeerId)>#<name>`。
-     * AUN channel 的 selfPeerId 是 agent.aid，name 固定为 'main'。
+     * effective channel key：`<type>#<selfAID>#<name>`。
+     * AUN channel 的 selfAID 是 agent.aid，name 固定为 'main'。
      */
     effectiveChannelName(type, rawName) {
-        return formatChannelKey({ type, selfPeerId: this.aid, name: rawName });
+        return formatChannelKey({ type, selfAID: 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.selfPeerId === this.aid;
+        return parsed?.type === 'aun' && parsed.selfAID === this.aid;
     }
     getOwner(channelKey) {
         if (this.isAunChannelKey(channelKey)) {
@@ -213,24 +213,6 @@ export class EvolAgent {
         this.merged.dispatch = value;
         this.persist();
     }
-    // ── Projects ──────────────────────────────────────────────────────────
-    getProjects() {
-        const list = this.merged.projects?.list;
-        if (list && Object.keys(list).length > 0)
-            return { ...list };
-        const dp = this.merged.projects?.defaultPath;
-        if (dp)
-            return { [path.basename(dp)]: dp };
-        return {};
-    }
-    addProject(name, projectPath) {
-        if (!this.rawAgent.projects)
-            this.rawAgent.projects = { defaultPath: projectPath, list: {} };
-        if (!this.rawAgent.projects.list)
-            this.rawAgent.projects.list = {};
-        this.rawAgent.projects.list[name] = projectPath;
-        this.persist();
-    }
     // ── Personal layer ────────────────────────────────────────────────────
     _personaCache = undefined;
     /**

package/dist/core/interaction-router.js

@@ -1,14 +1,55 @@
 import { logger } from '../utils/logger.js';
 export class InteractionRouter {
     handlers = new Map();
+    /** sessionId → 该会话当前待应答的交互数量，用于触发 wait 生命周期钩子 */
+    pendingBySession = new Map();
+    waitHooks;
+    setWaitHooks(hooks) {
+        this.waitHooks = hooks;
+    }
+    /**
+     * 在 register() 之前提前标记 session 为等待状态（适用于发卡片有异步延迟的场景）。
+     * 必须与 unmarkWaiting() 配对使用，或后续 register() 会接管计数。
+     */
+    markWaiting(sessionId) {
+        this.incPending(sessionId);
+    }
+    /** 取消 markWaiting() 的占位（后续若有 register() 接管则不需调用此方法） */
+    unmarkWaiting(sessionId) {
+        this.decPending(sessionId);
+    }
+    /** 登记一个待应答交互；session 计数 0→1 时触发 onWaitStart */
+    incPending(sessionId) {
+        const next = (this.pendingBySession.get(sessionId) ?? 0) + 1;
+        this.pendingBySession.set(sessionId, next);
+        if (next === 1)
+            this.waitHooks?.onWaitStart(sessionId);
+    }
+    /** 注销一个待应答交互；session 计数 1→0 时触发 onWaitEnd */
+    decPending(sessionId) {
+        const cur = this.pendingBySession.get(sessionId) ?? 0;
+        if (cur <= 0)
+            return;
+        const next = cur - 1;
+        if (next === 0) {
+            this.pendingBySession.delete(sessionId);
+            this.waitHooks?.onWaitEnd(sessionId);
+        }
+        else {
+            this.pendingBySession.set(sessionId, next);
+        }
+    }
     register(id, sessionId, callback, opts) {
+        // 同 id 替换：槽位本就占用，计数不变，不触发 wait 钩子
         const existing = this.handlers.get(id);
         if (existing?.timer)
             clearTimeout(existing.timer);
+        const isReplacement = !!existing;
         let timer;
         if (opts?.timeoutMs && opts.timeoutMs > 0) {
             timer = setTimeout(() => {
                 this.handlers.delete(id);
+                this.decPending(sessionId);
                 logger.debug(`[InteractionRouter] Timeout for interaction: ${id}`);
                 opts.onTimeout?.();
             }, opts.timeoutMs);
@@ -20,6 +61,8 @@ export class InteractionRouter {
             initiatorId: opts?.initiatorId,
             fallbackCommand: opts?.fallbackCommand,
         });
+        if (!isReplacement)
+            this.incPending(sessionId);
     }
     handle(response) {
         const handler = this.handlers.get(response.id);
@@ -28,6 +71,7 @@ export class InteractionRouter {
         if (handler.timer)
             clearTimeout(handler.timer);
         this.handlers.delete(response.id);
+        this.decPending(handler.sessionId);
         try {
             const result = handler.callback(response.action, response.values, response.operatorId);
             if (result && typeof result.catch === 'function') {
@@ -47,6 +91,7 @@ export class InteractionRouter {
                 if (handler.timer)
                     clearTimeout(handler.timer);
                 this.handlers.delete(id);
+                this.decPending(handler.sessionId);
             }
         }
     }
@@ -56,6 +101,7 @@ export class InteractionRouter {
             if (handler.timer)
                 clearTimeout(handler.timer);
             this.handlers.delete(id);
+            this.decPending(handler.sessionId);
         }
     }
     getPending(sessionId) {
@@ -100,6 +146,16 @@ export function renderActionAsText(req) {
     const lines = [action.title];
     if (action.body)
         lines.push(action.body);
+    // checkers 多选：渲染选项列表
+    if (action.checkers?.length) {
+        lines.push('');
+        action.checkers.forEach((chk, idx) => {
+            const desc = chk.description ? ` — ${chk.description}` : '';
+            lines.push(`  ${idx + 1}. ${chk.label}${desc}`);
+        });
+        lines.push('', '回复选项编号（多选用逗号分隔），或输入自定义内容');
+        return lines.join('\n');
+    }
     if (!fb) {
         return lines.join('\n');
     }
@@ -111,5 +167,8 @@ export function renderActionAsText(req) {
     if (fb.acceptFreeText && fb.freeTextHint) {
         lines.push(`  ${fb.freeTextHint}`);
     }
+    if (action.allowCustomInput) {
+        lines.push(`  或直接输入自定义内容`);
+    }
     return lines.join('\n');
 }

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

@@ -132,26 +132,6 @@ export class IMRenderer {
     getRemainingText() {
         return this.textBuffer;
     }
-    /** 从 buffer 中移除指定 pattern（用于文件标记预处理） */
-    stripFromBuffer(pattern) {
-        this.textBuffer = this.textBuffer.replace(pattern, '').trim();
-        // itemsQueue 中的 text items 也同步过滤
-        for (const item of this.itemsQueue) {
-            if (item.kind === 'text') {
-                item.text = item.text.replace(pattern, '');
-            }
-        }
-    }
-    /** 清除上下文过长错误文本（从 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) {
@@ -328,6 +308,15 @@ 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();

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

@@ -81,12 +81,12 @@ export class MessageBridge {
                     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 chatDir = chatDirPath(resolvePaths().sessionsDir, msg.channelType || effectiveChannelType, msg.channelId, msg.selfAID || '');
                         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',
+                            to: msg.selfAID || 'self',
                             chatType: msg.chatType || 'private',
                             groupId: msg.groupId ?? null,
                             msgId: msg.messageId ?? null,
@@ -105,7 +105,7 @@ export class MessageBridge {
                 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 } });
                     return sendReply(msg.channelId, text, msg.replyContext);
-                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext))
+                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID))
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
@@ -114,7 +114,7 @@ export class MessageBridge {
                 if (msg.threadId && msg.replyContext)
                     metadata.replyContext = msg.replyContext;
                 // 写入实例名（审计 + 精确出站路由）
-                metadata.channelName = channelName;
+                metadata.channelKey = channelName;
                 if (chatType === 'private' && msg.peerId) {
                     metadata.peerId = msg.peerId;
                     if (msg.peerName)
@@ -134,7 +134,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.selfId, msg.channelType || effectiveChannelType, msg.peerType);
+                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);
                 // 4. 消息前缀（由 policy 决定）
                 const channelInfo = this.processor.getChannelInfo?.(channelName);
                 if (channelInfo?.policy) {
@@ -147,11 +147,14 @@ export class MessageBridge {
                     channel: channelName,
                     channelType: msg.channelType || effectiveChannelType,
                     channelId: msg.channelId, content,
-                    selfId: msg.selfId,
+                    selfAID: msg.selfAID,
                     chatType,
                     images: msg.images, timestamp: Date.now(),
                     peerId: msg.peerId, peerName: msg.peerName,
                     peerType: msg.peerType,
+                    sameDevice: msg.sameDevice,
+                    sameNetwork: msg.sameNetwork,
+                    sameEgressIp: msg.sameEgressIp,
                     messageId: msg.messageId,
                     mentions: msg.mentions, threadId: msg.threadId,
                     replyContext: msg.replyContext,
@@ -162,7 +165,7 @@ export class MessageBridge {
                 const inboundChatmode = msg.replyContext?.metadata?.chatmode;
                 appendMessageLog(chatDir, buildInboundEntry({
                     from: msg.peerId || 'unknown',
-                    to: msg.selfId || 'self',
+                    to: msg.selfAID || 'self',
                     chatType,
                     groupId: msg.groupId ?? null,
                     msgId: msg.messageId ?? null,
@@ -219,6 +222,7 @@ export class MessageBridge {
         permission: '/perm',
         activity: '/activity',
         system: '/system',
+        cli: '/cli',
     };
     resolveCmd(name, cmd) {
         if (cmd)
@@ -374,11 +378,11 @@ export class MessageBridge {
         }
     }
     /** 命令快速路径：返回 true 表示已处理 */
-    async handleCommand(content, channel, channelId, sendReply, userId, threadId, chatType, source, replyContext) {
+    async handleCommand(content, channel, channelId, sendReply, userId, threadId, chatType, source, replyContext, messageId, selfAID) {
         if (!this.cmdHandler.isCommand(content))
             return false;
         logger.info(`[${channel}] ${channelId}: ${content}${source === 'card-trigger' ? ' [card]' : ''}`);
-        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source);
+        const cmdResult = await this.cmdHandler.handle(content, channel, channelId, (_cid, text, opts) => sendReply(text), userId, threadId, chatType, source, messageId, selfAID);
         logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}`);
         if (cmdResult === undefined)
             return false;

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

@@ -31,8 +31,8 @@ function formatTimestampMs(epochMs) {
 export function messageLogPath(chatDir) {
     return path.join(chatDir, MESSAGE_LOG_FILE);
 }
-export function resolveChatDir(sessionsDir, channelType, channelId, selfId) {
-    return chatDirPath(sessionsDir, channelType, channelId, selfId);
+export function resolveChatDir(sessionsDir, channelType, channelId, selfAID) {
+    return chatDirPath(sessionsDir, channelType, channelId, selfAID);
 }
 export function appendMessageLog(chatDir, entry) {
     if (entry.dir === 'in' && isDuplicate(entry.msgId)) {