evolclaw 3.1.4 → 3.1.5

package/dist/channels/aun.js

@@ -12,8 +12,8 @@ import { appendAidEvent } from '../utils/instance-registry.js';
 import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
 import { chatDirPath } from '../core/session/session-fs-store.js';
 import { appendAidLifecycle } from '../aun/aid/identity.js';
-import { createAunClient } from '../aun/aid/client.js';
-import { loadAgent, saveAgent, loadProcessConfig } from '../config-store.js';
+import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
+import { loadAgent, saveAgent } from '../config-store.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import * as outbox from '../aun/outbox.js';
 import { guessMime, formatSize } from '../utils/media-cache.js';
@@ -61,6 +61,9 @@ function getEvolclawVersion() {
 export class AUNChannel {
     config;
     client = null;
+    store = null;
+    /** 实际连接的网关 URL（来自 authenticate() 返回值 / connection.state 事件），替代旧 (client as any)._gatewayUrl。 */
+    gatewayUrl = '';
     projectPathProvider;
     messageHandler;
     recallHandler;
@@ -115,11 +118,6 @@ export class AUNChannel {
      */
     async callAndTrace(method, params, opts) {
         this.trace('OUT', method, params);
-        // [DIAG-STALE] 记录调用瞬间 SDK 内部 _state，证明是否在 reconnecting 中误发
-        const sdkStateBefore = this.client?._state ?? 'no-client';
-        if (sdkStateBefore !== 'connected') {
-            logger.warn(`[AUN][DIAG-STALE] callAndTrace ${method} on non-connected SDK: sdk_state=${sdkStateBefore} evolclaw_connected=${this.connected}`);
-        }
         try {
             const result = await this.client.call(method, params);
             if (!opts?.silentOk) {
@@ -137,9 +135,6 @@ export class AUNChannel {
                 code: e?.code,
                 name: e?.name,
             });
-            // [DIAG-STALE] 失败时再记录一次 SDK _state，看错误类型是否为 ConnectionError
-            const sdkStateAfter = this.client?._state ?? 'no-client';
-            logger.warn(`[AUN][DIAG-STALE] callAndTrace ${method} FAILED: err_name=${e?.name ?? '?'} err_code=${e?.code ?? '?'} sdk_state_before=${sdkStateBefore} sdk_state_after=${sdkStateAfter} evolclaw_connected=${this.connected}`);
             logger.warn(`${this.logPrefix()} rpc ${method} failed: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
             throw e;
         }
@@ -545,12 +540,17 @@ export class AUNChannel {
             }
             this.client = null;
         }
+        if (this.store) {
+            try {
+                this.store.close();
+            }
+            catch { /* ignore */ }
+            this.store = null;
+        }
         this.connected = false;
         const aunPath = this.config.keystorePath || resolveRoot();
         const aidName = this.config.aid;
-        const encryptionSeed = loadProcessConfig().aun?.encryptionSeed
-            || process.env.AUN_ENCRYPTION_SEED
-            || 'evol';
+        // encryptionSeed 由 getAidStore 内部解析（config / env / 'evol'）
         // Migration from ~/.aun is handled by ensureDataDirs() at startup with a marker file.
         // Gateway URL 解析：优先用配置的 gatewayUrl，否则通过 well-known 自动发现
         let gateway = this.config.gatewayUrl || '';
@@ -571,16 +571,18 @@ export class AUNChannel {
             throw new Error('Cannot resolve gateway URL from AID');
         }
         logger.info(`${this.logPrefix()} 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 client = await createAunClient({
+        // 构造 AIDStore（slot=evolclaw daemon，与 cli/netcheck 共享 evolclaw 隔离键）
+        // encryptionSeed / rootCaPath 由 getAidStore 内部注入
+        const store = await getAidStore({
+            slotId: SLOT.daemon,
             aunPath,
-            encryptionSeed,
-            aunSdkLog: this.config.aunSdkLog ?? true,
+            debug: this.config.aunSdkLog ?? true,
         });
+        this.store = store;
+        const client = await loadClient(store, aidName);
         this.client = client;
-        // Set gateway URL (internal property, same as Python SDK)
-        client._gatewayUrl = gateway;
+        // 记录应用层发现的 gateway 作为初始值（authenticate 后会用权威值覆盖）
+        this.gatewayUrl = gateway;
         // Register event handlers before connecting
         client.on('message.received', (data) => {
             this.trace('IN', 'message.received', data);
@@ -629,30 +631,16 @@ export class AUNChannel {
             const d = data;
             logger.warn(`${this.logPrefix()} 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.
-        const authFlow = client._auth;
-        if (authFlow && typeof authFlow._loadIdentityOrRaise === 'function') {
-            const origLoad = authFlow._loadIdentityOrRaise.bind(authFlow);
-            authFlow._loadIdentityOrRaise = (aid) => {
-                const identity = origLoad(aid);
-                if (identity && !identity.aid)
-                    identity.aid = aid ?? authFlow._aid;
-                return identity;
-            };
-        }
-        let accessToken;
+        // Authenticate（拿权威 gateway 用于日志/状态；connect 内部也会复用 token）
         try {
             logger.info(`${this.logPrefix()} Authenticating as ${aidName}...`);
             this.trace('OUT', 'auth.authenticate', { aid: aidName });
-            const auth = await client.auth.authenticate(aidName ? { aid: aidName } : undefined);
-            this.trace('OUT', 'auth.authenticate.ok', { aid: auth.aid, gateway: auth.gateway, hasToken: !!auth.access_token });
-            this.trace('IN', 'auth.result', { aid: auth.aid, gateway: auth.gateway, hasToken: !!auth.access_token });
-            accessToken = auth.access_token;
-            const resolvedGateway = auth.gateway || gateway;
-            client._gatewayUrl = resolvedGateway;
-            logger.info(`${this.logPrefix()} Authenticated as ${auth.aid ?? '?'}, gateway=${resolvedGateway}`);
+            const auth = await client.authenticate();
+            this.trace('OUT', 'auth.authenticate.ok', { aid: client.aid, gateway: auth?.gateway, hasToken: !!auth?.access_token });
+            this.trace('IN', 'auth.result', { aid: client.aid, gateway: auth?.gateway, hasToken: !!auth?.access_token });
+            const resolvedGateway = String(auth?.gateway ?? gateway);
+            this.gatewayUrl = resolvedGateway;
+            logger.info(`${this.logPrefix()} Authenticated as ${client.aid ?? '?'}, gateway=${resolvedGateway}`);
         }
         catch (e) {
             const errMsg = e.message || String(e);
@@ -661,15 +649,9 @@ export class AUNChannel {
             logger.error(`${this.logPrefix()} Authentication failed (${errName}): ${errMsg}`);
             if (e.stack)
                 logger.debug(`${this.logPrefix()} Auth stack: ${e.stack}`);
-            // Fallback: try direct token from env/config (legacy)
-            accessToken = this.config.accessToken || process.env.AUN_ACCESS_TOKEN || '';
-            if (!accessToken) {
-                logger.error(`${this.logPrefix()} No accessToken fallback available, scheduling retry`);
-                this.setAidStatus('failed', { lastError: `${errName}: ${errMsg}`.slice(0, 80) });
-                this.scheduleReconnect();
-                throw new Error('Authentication failed and no accessToken fallback available');
-            }
-            logger.warn(`${this.logPrefix()} Using accessToken fallback`);
+            this.setAidStatus('failed', { lastError: `${errName}: ${errMsg}`.slice(0, 80) });
+            this.scheduleReconnect();
+            throw new Error(`Authentication failed: ${errName}: ${errMsg}`);
         }
         // Connect (SDK auto_reconnect handles transient failures)
         try {
@@ -678,11 +660,18 @@ export class AUNChannel {
                 agentName: this.config.agentName,
                 channelName: this.config.channelName,
             });
-            this.trace('OUT', 'client.connect', { gateway: client._gatewayUrl, extra_info: extraInfo });
-            await client.connect({ access_token: accessToken, gateway: client._gatewayUrl, extra_info: extraInfo }, 
-            // max_attempts=0 = 无限重试（与 Go/Python 对齐），交由 SDK 自己跑指数退避
-            // initial_delay=1s，max_delay=300s（5min 封顶）
-            { auto_reconnect: true, retry: { max_attempts: 0, initial_delay: 1.0, max_delay: 300.0 } });
+            this.trace('OUT', 'client.connect', { gateway: this.gatewayUrl, extra_info: extraInfo });
+            await client.connect({
+                // connection_kind 默认 long；slot 已由 AID 携带（evolclaw daemon）
+                // extra_info：互踢诊断名片（0.4.3 公开 connect 已支持透传）
+                extra_info: extraInfo,
+                // max_attempts=0 = 无限重试（与 Go/Python 对齐），交由 SDK 自己跑指数退避
+                // initial_delay=1s，max_delay=300s（5min 封顶）
+                auto_reconnect: true,
+                retry_max_attempts: 0,
+                retry_initial_delay: 1.0,
+                retry_max_delay: 300.0,
+            });
             this.trace('OUT', 'client.connect.ok', { aid: client.aid });
             this._aid = this.client.aid ?? undefined;
             const deviceId = this.client._device_id ?? '';
@@ -692,7 +681,7 @@ export class AUNChannel {
                 this.aidStatsCollector.setSelfName(this.config.aid, this._selfName);
             this.connected = true;
             this.connectedAt = Date.now();
-            this.setAidStatus('connected', { lastConnectedAt: Date.now(), lastError: undefined, gatewayUrl: this.client?._gatewayUrl });
+            this.setAidStatus('connected', { lastConnectedAt: Date.now(), lastError: undefined, gatewayUrl: this.gatewayUrl });
             // Workaround: SDK e2ee uses _identity.cert for sender_cert_fingerprint;
             // if cert is missing, it falls back to public key SPKI fingerprint which
             // causes peer cert lookup failures. Backfill from keystore if needed.
@@ -705,8 +694,8 @@ export class AUNChannel {
                 }
             }
             logger.info(`${this.logPrefix()} Connected as ${this._aid}`);
-            appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.client._gatewayUrl });
-            appendAidLifecycle({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.client._gatewayUrl });
+            appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.gatewayUrl });
+            appendAidLifecycle({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.gatewayUrl });
             // Send welcome message to owner after first connection
             await this.sendWelcomeMessage();
         }
@@ -785,13 +774,10 @@ tags:
 
 EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 `;
-            // Write locally
-            fs.mkdirSync(path.dirname(agentMdLocalPath), { recursive: true });
-            fs.writeFileSync(agentMdLocalPath, newAgentMd, 'utf-8');
-            logger.info(`${this.logPrefix()} Updated agent.md for ${aidName}`);
-            // Publish to AUN network via publishAgentMd (auto-sign)
+            // Write locally and publish to AUN network (auto-sign)
             try {
-                await this.client.publishAgentMd();
+                const { agentmdPut } = await import('../aun/aid/agentmd.js');
+                await agentmdPut(newAgentMd, { aid: aidName, store: this.store });
                 logger.info(`${this.logPrefix()} Published agent.md to AUN network`);
             }
             catch (e) {
@@ -961,7 +947,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const chatId = fromAid;
         // 解析对端身份（30天缓存）
         const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
-        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, selfAgentDir, this.client, false);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, selfAgentDir, this.store, false);
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
@@ -1177,7 +1163,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
         const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
-        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, selfAgentDir, this.client, false);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, selfAgentDir, this.store, false);
         const shortAid = this.getShortAid(senderAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
@@ -1268,7 +1254,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             channelId: event.channelId || '',
             channelType: 'aun',
             content: event.text || '',
-            selfId: this._aid,
+            selfAID: this._aid,
             groupId: event.groupId,
             chatType: event.chatType,
             peerId: event.userId || event.channelId || '',
@@ -1351,17 +1337,16 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!data || typeof data !== 'object')
             return;
         const state = data.state ?? '';
-        // [DIAG-STALE] 记录状态切换瞬间 evolclaw 的 connected 标志和 SDK 的内部 _state，
-        // 用于证明"reconnecting 时 connected 保持 true，导致 sendMessage 误放行"的假设
-        const sdkState = this.client?._state ?? 'no-client';
-        const connectedBefore = this.connected;
-        logger.info(`[AUN][DIAG-STALE] connection.state event: state=${state} attempt=${data.attempt ?? '-'} | connected_before=${connectedBefore} sdk_state=${sdkState}`);
         if (state === 'connected') {
             this.connected = true;
             this.connectedAt = Date.now();
             this.lastReconnectLogTime = 0;
             this.lastReconnectLogAttempt = 0;
-            this.setAidStatus('connected', { lastConnectedAt: Date.now(), lastError: undefined, gatewayUrl: this.client?._gatewayUrl });
+            // connection.state 事件 payload 带实际连接的 gateway，更新本地缓存
+            const evtGateway = data.gateway;
+            if (typeof evtGateway === 'string' && evtGateway)
+                this.gatewayUrl = evtGateway;
+            this.setAidStatus('connected', { lastConnectedAt: Date.now(), lastError: undefined, gatewayUrl: this.gatewayUrl });
             this.trace('IN', 'connection.state', data);
             logger.info(`${this.logPrefix()} Connected`);
             // 不在这里清 flapCount —— 短命连接一上来就会触发本分支，
@@ -1816,11 +1801,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text', source = 'daemon') {
         try {
             const sessionsDir = resolvePaths().sessionsDir;
-            const selfId = this.config.aid;
-            const chatDir = chatDirPath(sessionsDir, 'aun', channelId, selfId);
+            const selfAID = this.config.aid;
+            const chatDir = chatDirPath(sessionsDir, 'aun', channelId, selfAID);
             const chatmode = context?.metadata?.chatmode;
             appendMessageLog(chatDir, buildOutboundEntry({
-                from: selfId,
+                from: selfAID,
                 to: channelId,
                 chatType: isGroup ? 'group' : 'private',
                 groupId: isGroup ? channelId : null,
@@ -1891,8 +1876,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 const tid = putRes?.thought_id;
                 logger.info(`${this.logPrefix()} thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
-                // 文本类 thought 写入 jsonl（只对有 text 的 item，过滤 tool 等结构化项）
                 if (thoughtText) {
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive');
                     this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, true, 'thought', 'daemon');
                 }
             }
@@ -1903,6 +1888,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 logger.info(`${this.logPrefix()} thought.put ok p2p=${this.peerLabel(targetId)} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
                 if (thoughtText) {
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive');
                     this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, false, 'thought', 'daemon');
                 }
             }
@@ -2280,6 +2266,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
             this.client = null;
         }
+        if (this.store) {
+            try {
+                this.store.close();
+            }
+            catch { /* ignore */ }
+            this.store = null;
+        }
         this.connected = false;
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'disconnected', aid: this.config.aid, reason: 'intentional' });
         appendAidLifecycle({ ts: Date.now(), iso: new Date().toISOString(), event: 'disconnected', aid: this.config.aid, reason: 'intentional' });
@@ -2381,7 +2374,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return { type: null };
         try {
             const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
-            const identity = await PeerIdentityCache.resolve('aun', aid, selfAgentDir, this.client, false);
+            const identity = await PeerIdentityCache.resolve('aun', aid, selfAgentDir, this.store, false);
             const type = identity.type === 'human' ? 'human' : 'ai';
             const name = identity.name || undefined;
             const info = { type, name };
@@ -2405,19 +2398,16 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         void this.fetchPeerInfo(aid).catch(() => { });
     }
     async uploadAgentMd(content) {
-        if (!this.client)
+        if (!this.store)
             throw new Error('not connected');
-        const { agentMdPath } = await import('../paths.js');
-        const localPath = agentMdPath(this.config.aid);
-        fs.mkdirSync(path.dirname(localPath), { recursive: true });
-        fs.writeFileSync(localPath, content, 'utf-8');
-        await this.client.publishAgentMd();
+        const { agentmdPut } = await import('../aun/aid/agentmd.js');
+        await agentmdPut(content, { aid: this.config.aid, store: this.store });
     }
     async downloadAgentMd(aid) {
-        if (!this.client)
+        if (!this.store)
             throw new Error('not connected');
         const { agentmdSync } = await import('../aun/aid/agentmd.js');
-        const result = await agentmdSync(aid, { client: this.client });
+        const result = await agentmdSync(aid, { store: this.store ?? undefined });
         return result.content ?? '';
     }
 }
@@ -2445,7 +2435,6 @@ export class AUNChannelPlugin {
                 gatewayUrl: inst.gatewayUrl,
                 accessToken: inst.accessToken,
                 flushDelay: inst.flushDelay,
-                encryptionSeed: inst.encryptionSeed,
                 owner: inst.owner,
                 agentName: inst.agentName,
                 channelName: inst.name,
@@ -2636,7 +2625,7 @@ export class AUNChannelPlugin {
                             channel: adapter.channelName,
                             channelType,
                             channelId: opts.channelId,
-                            selfId: opts.selfId,
+                            selfAID: opts.selfAID,
                             groupId: opts.groupId,
                             content: opts.content,
                             chatType: opts.chatType || 'private',

package/dist/channels/dingtalk.js

@@ -540,6 +540,7 @@ export class DingtalkChannelPlugin {
                             channel: adapter.channelName,
                             channelType,
                             channelId: event.channelId,
+                            selfAID: inst.agentName,
                             content: event.content,
                             images: event.images,
                             chatType: event.chatType || 'private',