evolclaw 2.6.2 → 2.6.4

package/dist/agents/claude-runner.js

@@ -130,6 +130,8 @@ export class AgentRunner {
         return this.permissionMode;
     }
     listModes() {
+        // readonly 模式暂时禁用：与 proactive 模式系统提示词存在语义冲突，
+        // 且 READONLY_WRITE_PATTERNS 未覆盖 evolclaw ctl send/file，契约不稳固
         return [
             { key: 'auto', nameZh: '自动', description: 'AI 分类器自动判断', available: true },
             { key: 'bypass', nameZh: '放行', description: '全部自动放行', available: true },
@@ -137,7 +139,6 @@ export class AgentRunner {
             { key: 'edit', nameZh: '编辑', description: '自动接受编辑，其他询问', available: true },
             { key: 'plan', nameZh: '规划', description: '只规划不执行', available: true },
             { key: 'noask', nameZh: '静默', description: '未批准则拒绝', available: true },
-            { key: 'readonly', nameZh: '只读', description: '禁止修改项目文件，可在临时目录生成文件', available: true },
         ];
     }
     setPermissionGateway(gateway) {

package/dist/agents/codex-runner.js

@@ -77,7 +77,6 @@ export class CodexRunner {
             { key: 'bypass', nameZh: '放行', description: '全部自动（受 sandbox 约束）', available: true },
             { key: 'request', nameZh: '审批', description: '需要审批时询问', available: true },
             { key: 'noask', nameZh: '静默', description: '只执行已知安全操作', available: true },
-            { key: 'readonly', nameZh: '只读', description: '禁止修改项目文件，可在临时目录生成文件', available: true },
         ];
     }
     setSendPrompt(_fn) { }

package/dist/agents/gemini-runner.js

@@ -70,7 +70,6 @@ export class GeminiRunner {
             { key: 'edit', nameZh: '编辑', description: '仅 Claude 支持', available: false, unavailableReason: 'Gemini CLI 不支持此模式' },
             { key: 'plan', nameZh: '规划', description: 'Gemini 规划模式', available: true },
             { key: 'noask', nameZh: '静默', description: '仅 Claude 支持', available: false, unavailableReason: 'Gemini CLI 不支持此模式' },
-            { key: 'readonly', nameZh: '只读', description: '禁止修改项目文件，可在临时目录生成文件', available: true },
         ];
     }
     setSendPrompt(_fn) { }
@@ -121,6 +120,9 @@ export class GeminiRunner {
         if (this.currentMode === 'plan') {
             args.push('--approval-mode=plan');
         }
+        else if (this.currentMode === 'noask') {
+            args.push('--approval-mode=default');
+        }
         else {
             args.push('--yolo');
         }

package/dist/channels/aun.js

@@ -1,4 +1,4 @@
-import { AUNClient, GatewayDiscovery } from '@agentunion/fastaun';
+import { AUNClient, GatewayDiscovery, E2EEError } from '@agentunion/fastaun';
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
@@ -120,6 +120,16 @@ export class AUNChannel {
         if (messageId)
             this.messageSeqMap.delete(messageId);
     }
+    shouldEncrypt(peerId) {
+        const cached = this.peerE2ee.get(peerId);
+        if (!cached)
+            return true;
+        if (Date.now() - cached.ts > AUNChannel.E2EE_PROBE_TTL) {
+            this.peerE2ee.delete(peerId);
+            return true;
+        }
+        return cached.ok;
+    }
     _aid;
     _selfName; // 本地 agent.md 中的 name，首次 connect 时读取
     _chatId = ''; // aid:device_id:slot_id — 多实例回声过滤
@@ -127,6 +137,9 @@ export class AUNChannel {
     peerInfoCache = new Map();
     messageSeqMap = new Map(); // messageId → seq (for ack)
     sentCount = new Map(); // channelId → 已发消息计数（用于判断最终回复）
+    peerE2ee = new Map();
+    static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
+    plaintextRecv = 0;
     // Reconnect state (TS-layer fallback, on top of SDK auto_reconnect)
     intentionalDisconnect = false;
     reconnectAttempt = 0;
@@ -161,7 +174,7 @@ export class AUNChannel {
             this.client = null;
         }
         this.connected = false;
-        const aunPath = this.config.keystorePath || `${process.env.HOME || '~'}/.aun`;
+        const aunPath = this.config.keystorePath || path.join(os.homedir(), '.aun');
         const aidName = this.config.aid;
         const encryptionSeed = this.config.encryptionSeed || process.env.AUN_ENCRYPTION_SEED || undefined;
         // Gateway URL 解析：优先用配置的 gatewayUrl，否则通过 well-known 自动发现
@@ -185,12 +198,12 @@ export class AUNChannel {
         logger.info(`[AUN] Initializing: aid=${aidName}, gateway=${gateway}, aun_path=${aunPath}`);
         // Create client with FileSecretStore (AES-256-GCM)
         // 不传 encryption_seed 时，SDK 自动从 {aun_path}/.seed 文件派生密钥（与 aun_cli.py 对齐）
-        const rootCaPath = `${aunPath}/CA/root/root.crt`;
+        const rootCaPath = path.join(aunPath, 'CA', 'root', 'root.crt');
         this.client = new AUNClient({
             aun_path: aunPath,
             root_ca_path: rootCaPath,
             ...(encryptionSeed && { encryption_seed: encryptionSeed }),
-        });
+        }, this.config.aunSdkLog ?? true);
         // Set gateway URL (internal property, same as Python SDK)
         this.client._gatewayUrl = gateway;
         // Register event handlers before connecting
@@ -226,6 +239,16 @@ export class AUNChannel {
                 }
             }
         });
+        this.client.on('message.undecryptable', (data) => {
+            this.trace('IN', 'message.undecryptable', data);
+            const d = data;
+            logger.warn(`[AUN] Message undecryptable: from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
+        });
+        this.client.on('group.message_undecryptable', (data) => {
+            this.trace('IN', 'group.message_undecryptable', data);
+            const d = data;
+            logger.warn(`[AUN] Group message undecryptable: group=${d.group_id} from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
+        });
         // Authenticate
         // Workaround: SDK 0.3.x _loadIdentityOrRaise doesn't set identity.aid from requested aid,
         // causing gateway "missing aid" error. Patch to backfill aid on loaded identity.
@@ -494,6 +517,16 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.acknowledgeImmediately(messageId, seq);
             return;
         }
+        // E2EE 能力探测：收到加密消息则标记对端支持，明文则计数审计
+        const msgEncrypted = !!(msg.e2ee);
+        if (fromAid) {
+            if (msgEncrypted) {
+                this.peerE2ee.set(fromAid, { ok: true, ts: Date.now() });
+            }
+            else {
+                this.plaintextRecv++;
+            }
+        }
         // Detect @mentions
         const mentions = [];
         if (this._aid && text.includes(`@${this._aid}`)) {
@@ -566,6 +599,16 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.acknowledgeImmediately(messageId, seq);
             return;
         }
+        // E2EE 能力探测：收到加密群消息则标记发送者支持
+        const msgEncrypted = !!(msg.e2ee);
+        if (senderAid) {
+            if (msgEncrypted) {
+                this.peerE2ee.set(senderAid, { ok: true, ts: Date.now() });
+            }
+            else {
+                this.plaintextRecv++;
+            }
+        }
         // dispatch_mode from server tells agent how to work in this group
         const dispatchMode = msg.dispatch_mode ?? payload?.dispatch_mode ?? 'mention';
         const mentionedSelf = this._aid
@@ -748,29 +791,68 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const payload = { type: 'text', text: finalText };
         if (context?.threadId)
             payload.thread_id = context.threadId;
+        if (context?.metadata?.taskId)
+            payload.task_id = context.metadata.taskId;
+        if (context?.metadata?.chatmode)
+            payload.chatmode = context.metadata.chatmode;
         const isGroup = this.isGroupId(channelId);
-        const params = { payload, encrypt: !isGroup };
         // Multi-instance routing: channelId may be "aid:device_id:slot_id"
         const colonIdx = channelId.indexOf(':');
         const targetAid = colonIdx > 0 ? channelId.substring(0, colonIdx) : channelId;
         if (colonIdx > 0) {
-            params.payload.chat_id = channelId;
+            payload.chat_id = channelId;
         }
+        const encryptTarget = isGroup ? channelId : targetAid;
+        const encrypt = this.shouldEncrypt(encryptTarget);
+        const params = { payload, encrypt };
         try {
             if (isGroup) {
                 params.group_id = channelId;
                 this.trace('OUT', 'group.send', params);
-                await this.client.call('group.send', params);
+                const result = await this.client.call('group.send', params);
+                if (!result || !result.message_id) {
+                    logger.warn(`[AUN] group.send returned no message_id: ${JSON.stringify(result)}`);
+                }
             }
             else {
                 params.to = targetAid;
                 this.trace('OUT', 'message.send', params);
-                await this.client.call('message.send', params);
+                const result = await this.client.call('message.send', params);
+                if (!result || !result.message_id) {
+                    logger.warn(`[AUN] message.send returned no message_id: ${JSON.stringify(result)}`);
+                }
             }
         }
         catch (e) {
-            this.trace('OUT', 'send.error', { channelId, error: String(e) });
-            logger.error(`[AUN] Send failed to ${channelId}: ${e}`);
+            if (encrypt && e instanceof E2EEError) {
+                this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
+                logger.warn(`[AUN] E2EE send failed to ${channelId}, retrying plaintext: ${e}`);
+                params.encrypt = false;
+                try {
+                    if (isGroup) {
+                        this.trace('OUT', 'group.send.fallback', params);
+                        const result = await this.client.call('group.send', params);
+                        if (!result || !result.message_id) {
+                            logger.warn(`[AUN] group.send fallback returned no message_id: ${JSON.stringify(result)}`);
+                        }
+                    }
+                    else {
+                        this.trace('OUT', 'message.send.fallback', params);
+                        const result = await this.client.call('message.send', params);
+                        if (!result || !result.message_id) {
+                            logger.warn(`[AUN] message.send fallback returned no message_id: ${JSON.stringify(result)}`);
+                        }
+                    }
+                }
+                catch (e2) {
+                    this.trace('OUT', 'send.fallback.error', { channelId, error: String(e2) });
+                    logger.error(`[AUN] Plaintext fallback also failed to ${channelId}: ${e2}`);
+                }
+            }
+            else {
+                this.trace('OUT', 'send.error', { channelId, error: String(e) });
+                logger.error(`[AUN] Send failed to ${channelId}: ${e}`);
+            }
         }
     }
     /**
@@ -795,15 +877,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             encrypt: true,
         };
         try {
+            const stage = payload?.stage ?? 'unknown';
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
                 this.trace('OUT', 'group.thought.put', params);
                 await this.client.call('group.thought.put', params);
+                logger.debug(`[AUN] thought.put ok group=${targetId} task=${taskId} stage=${stage}`);
             }
             else {
                 params.to = targetId;
                 this.trace('OUT', 'message.thought.put', params);
                 await this.client.call('message.thought.put', params);
+                logger.debug(`[AUN] thought.put ok p2p=${targetId} task=${taskId} stage=${stage}`);
             }
         }
         catch (e) {
@@ -890,23 +975,61 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             };
             if (context?.threadId)
                 filePayload.thread_id = context.threadId;
+            if (context?.metadata?.taskId)
+                filePayload.task_id = context.metadata.taskId;
+            if (context?.metadata?.chatmode)
+                filePayload.chatmode = context.metadata.chatmode;
             const isGroup = this.isGroupId(channelId);
-            const params = { payload: filePayload, encrypt: !isGroup };
             // Multi-instance routing
             const fileColonIdx = channelId.indexOf(':');
             const fileTargetAid = fileColonIdx > 0 ? channelId.substring(0, fileColonIdx) : channelId;
             if (fileColonIdx > 0) {
-                params.payload.chat_id = channelId;
+                filePayload.chat_id = channelId;
             }
-            if (isGroup) {
-                params.group_id = channelId;
-                this.trace('OUT', 'group.send.file', params);
-                await this.client.call('group.send', params);
+            const encryptTarget = isGroup ? channelId : fileTargetAid;
+            const encrypt = this.shouldEncrypt(encryptTarget);
+            const params = { payload: filePayload, encrypt };
+            try {
+                if (isGroup) {
+                    params.group_id = channelId;
+                    this.trace('OUT', 'group.send.file', params);
+                    const result = await this.client.call('group.send', params);
+                    if (!result || !result.message_id) {
+                        logger.warn(`[AUN] group.send.file returned no message_id: ${JSON.stringify(result)}`);
+                    }
+                }
+                else {
+                    params.to = fileTargetAid;
+                    this.trace('OUT', 'message.send.file', params);
+                    const result = await this.client.call('message.send', params);
+                    if (!result || !result.message_id) {
+                        logger.warn(`[AUN] message.send.file returned no message_id: ${JSON.stringify(result)}`);
+                    }
+                }
             }
-            else {
-                params.to = fileTargetAid;
-                this.trace('OUT', 'message.send.file', params);
-                await this.client.call('message.send', params);
+            catch (sendErr) {
+                if (encrypt && sendErr instanceof E2EEError) {
+                    this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
+                    logger.warn(`[AUN] E2EE sendFile failed to ${channelId}, retrying plaintext: ${sendErr}`);
+                    params.encrypt = false;
+                    if (isGroup) {
+                        this.trace('OUT', 'group.send.file.fallback', params);
+                        const result = await this.client.call('group.send', params);
+                        if (!result || !result.message_id) {
+                            logger.warn(`[AUN] group.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
+                        }
+                    }
+                    else {
+                        this.trace('OUT', 'message.send.file.fallback', params);
+                        const result = await this.client.call('message.send', params);
+                        if (!result || !result.message_id) {
+                            logger.warn(`[AUN] message.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
+                        }
+                    }
+                }
+                else {
+                    throw sendErr;
+                }
             }
             logger.info(`[AUN] File sent: ${filename} (${formatSize(stat.size)}) → ${channelId}`);
         }
@@ -941,27 +1064,41 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (context?.threadId)
             payload.thread_id = context.threadId;
         const isGroup = this.isGroupId(channelId);
-        const params = { payload, encrypt: !isGroup };
         // Multi-instance routing
         const statusColonIdx = channelId.indexOf(':');
         const statusTargetAid = statusColonIdx > 0 ? channelId.substring(0, statusColonIdx) : channelId;
         if (statusColonIdx > 0) {
             payload.chat_id = channelId;
         }
+        const encryptTarget = isGroup ? channelId : statusTargetAid;
+        const encrypt = this.shouldEncrypt(encryptTarget);
+        const params = { payload, encrypt };
+        const sendWithFallback = (method) => {
+            this.client.call(method, params).catch(e => {
+                if (encrypt && e instanceof E2EEError) {
+                    this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
+                    logger.warn(`[AUN] E2EE status send failed to ${channelId}, retrying plaintext`);
+                    params.encrypt = false;
+                    this.client.call(method, params).catch(e2 => {
+                        logger.debug(`[AUN] Processing status fallback failed: ${e2}`);
+                    });
+                }
+                else {
+                    logger.debug(`[AUN] Processing status failed: ${e}`);
+                }
+            });
+        };
         if (isGroup) {
             params.group_id = channelId;
             this.trace('OUT', 'group.send.status', params);
-            this.client.call('group.send', params).catch(e => {
-                logger.debug(`[AUN] Processing status failed: ${e}`);
-            });
+            sendWithFallback('group.send');
         }
         else {
             params.to = statusTargetAid;
             this.trace('OUT', 'message.send.status', params);
-            this.client.call('message.send', params).catch(e => {
-                logger.debug(`[AUN] Processing status failed: ${e}`);
-            });
+            sendWithFallback('message.send');
         }
+        logger.info(`[AUN] task.${status} task=${taskId} session=${sessionId} target=${channelId}`);
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
@@ -1068,6 +1205,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             aid: this._aid,
             reconnectAttempt: this.reconnectAttempt,
             maxAttempts: AUNChannel.RECONNECT_DELAYS.length,
+            plaintextRecv: this.plaintextRecv,
         };
     }
     /** 读取本地 agent.md 中的 name（用于身份上下文展示） */
@@ -1150,6 +1288,7 @@ export class AUNChannelPlugin {
                 encryptionSeed: inst.encryptionSeed,
                 owner: inst.owner,
                 aunTrace: config.debug?.aunTrace,
+                aunSdkLog: config.debug?.aunSdkLog,
             });
             const adapter = {
                 channelName: inst.name,