evolclaw 3.1.3 → 3.1.5

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/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,
@@ -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,7 +147,7 @@ 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,
@@ -162,7 +162,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,

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)) {