evolclaw 3.1.3 → 3.1.5

package/dist/aun/rpc/connection.js

@@ -1,37 +1,25 @@
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
+import { getAidStore, loadClient, SLOT } from '../aid/store.js';
 export async function createShortConnection(aid, opts) {
-    const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
-    const slotId = opts?.slotId ?? '';
-    const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
-    const { AUNClient } = await import('@agentunion/fastaun');
-    const encryptionSeed = process.env.AUN_ENCRYPTION_SEED || undefined;
-    const clientOpts = { aun_path: aunPath, debug: false };
-    if (fs.existsSync(caCertPath))
-        clientOpts.root_ca_path = caCertPath;
-    if (encryptionSeed)
-        clientOpts.encryption_seed = encryptionSeed;
-    const client = new AUNClient(clientOpts);
-    await client.auth.createAid({ aid });
-    const authResult = await client.auth.authenticate({ aid });
-    const accessToken = authResult?.access_token ?? client._access_token;
-    const gateway = client._gatewayUrl ?? authResult?.gateway;
-    await client.connect({
-        access_token: accessToken,
-        gateway,
-        slot_id: slotId,
-        connection_kind: 'short',
-    }, { auto_reconnect: false });
-    return {
-        async call(method, params) {
-            return client.call(method, params);
-        },
-        async close() {
-            try {
-                await client.close();
-            }
-            catch { /* ignore */ }
-        },
-    };
+    const store = await getAidStore({ slotId: opts?.slotId ?? SLOT.cli, aunPath: opts?.aunPath });
+    try {
+        const client = await loadClient(store, aid);
+        await client.connect({ connection_kind: 'short', short_ttl_ms: 30000, auto_reconnect: false });
+        return {
+            async call(method, params) {
+                return client.call(method, params);
+            },
+            async close() {
+                try {
+                    await client.close();
+                }
+                finally {
+                    store.close();
+                }
+            },
+        };
+    }
+    catch (e) {
+        store.close();
+        throw e;
+    }
 }

package/dist/channels/aun.js

@@ -1,4 +1,4 @@
-import { AUNClient, GatewayDiscovery, E2EEError } from '@agentunion/fastaun';
+import { GatewayDiscovery, E2EEError } from '@agentunion/fastaun';
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
@@ -12,6 +12,7 @@ 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 { 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';
@@ -57,49 +58,12 @@ function getEvolclawVersion() {
     }
     return _cachedVersion;
 }
-function migrateAunData(targetPath) {
-    const legacyPath = path.join(os.homedir(), '.aun');
-    if (legacyPath === targetPath)
-        return;
-    // AIDs 迁移：逐个检查每个 AID，缺少 private 的就从 legacy 复制
-    const srcAIDs = path.join(legacyPath, 'AIDs');
-    const dstAIDs = path.join(targetPath, 'AIDs');
-    if (fs.existsSync(srcAIDs)) {
-        fs.mkdirSync(dstAIDs, { recursive: true });
-        try {
-            for (const entry of fs.readdirSync(srcAIDs, { withFileTypes: true })) {
-                if (!entry.isDirectory())
-                    continue;
-                const aidName = entry.name;
-                const srcAidDir = path.join(srcAIDs, aidName);
-                const dstAidDir = path.join(dstAIDs, aidName);
-                const srcPrivate = path.join(srcAidDir, 'private');
-                const dstPrivate = path.join(dstAidDir, 'private');
-                // 如果目标 AID 目录不存在或缺少 private，从源复制整个 AID 目录
-                if (fs.existsSync(srcPrivate) && !fs.existsSync(dstPrivate)) {
-                    fs.cpSync(srcAidDir, dstAidDir, { recursive: true });
-                }
-            }
-        }
-        catch { }
-    }
-    // CA 迁移
-    const srcCA = path.join(legacyPath, 'CA');
-    const dstCA = path.join(targetPath, 'CA');
-    if (fs.existsSync(srcCA) && !fs.existsSync(dstCA)) {
-        fs.cpSync(srcCA, dstCA, { recursive: true });
-    }
-    for (const file of ['.seed', '.device_id']) {
-        const src = path.join(legacyPath, file);
-        const dst = path.join(targetPath, file);
-        if (fs.existsSync(src) && !fs.existsSync(dst)) {
-            fs.copyFileSync(src, dst);
-        }
-    }
-}
 export class AUNChannel {
     config;
     client = null;
+    store = null;
+    /** 实际连接的网关 URL（来自 authenticate() 返回值 / connection.state 事件），替代旧 (client as any)._gatewayUrl。 */
+    gatewayUrl = '';
     projectPathProvider;
     messageHandler;
     recallHandler;
@@ -154,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) {
@@ -176,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;
         }
@@ -584,12 +540,18 @@ 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 = this.config.encryptionSeed || process.env.AUN_ENCRYPTION_SEED || undefined;
-        // Migrate legacy ~/.aun data to EVOLCLAW_HOME on first run
-        migrateAunData(aunPath);
+        // 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 || '';
         if (!gateway) {
@@ -609,41 +571,43 @@ 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 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;
+        // 构造 AIDStore（slot=evolclaw daemon，与 cli/netcheck 共享 evolclaw 隔离键）
+        // encryptionSeed / rootCaPath 由 getAidStore 内部注入
+        const store = await getAidStore({
+            slotId: SLOT.daemon,
+            aunPath,
+            debug: this.config.aunSdkLog ?? true,
+        });
+        this.store = store;
+        const client = await loadClient(store, aidName);
+        this.client = client;
+        // 记录应用层发现的 gateway 作为初始值（authenticate 后会用权威值覆盖）
+        this.gatewayUrl = gateway;
         // Register event handlers before connecting
-        this.client.on('message.received', (data) => {
+        client.on('message.received', (data) => {
             this.trace('IN', 'message.received', data);
             const kind = (data && typeof data === 'object') ? data.kind ?? '' : '';
             const keys = (data && typeof data === 'object') ? Object.keys(data).join(',') : typeof data;
             logger.debug(`${this.logPrefix()}[DIAG] message.received: kind=${kind} keys=${keys}`);
             this.handleIncomingPrivateMessage(data);
         });
-        this.client.on('group.message_created', (data) => {
+        client.on('group.message_created', (data) => {
             this.trace('IN', 'group.message_created', data);
             const gid = (data && typeof data === 'object') ? data.group_id ?? '' : '';
             const sender = (data && typeof data === 'object') ? data.sender_aid ?? '' : '';
             logger.debug(`${this.logPrefix()}[DIAG] group.message_created: group_id=${gid} sender=${sender}`);
             this.handleIncomingGroupMessage(data);
         });
-        this.client.on('connection.state', (data) => {
+        client.on('connection.state', (data) => {
             // trace is handled inside handleConnectionState with throttling
             this.handleConnectionState(data);
         });
         // gateway 被踢/服务端主动断开（含同槽位互踢的 self/new extra_info）
-        this.client.on('gateway.disconnect', (data) => {
+        client.on('gateway.disconnect', (data) => {
             this.trace('IN', 'gateway.disconnect', data);
             this.handleGatewayDisconnect(data);
         });
-        this.client.on('message.recalled', (data) => {
+        client.on('message.recalled', (data) => {
             this.trace('IN', 'message.recalled', data);
             if (data && typeof data === 'object') {
                 const ids = data.message_ids;
@@ -657,40 +621,26 @@ export class AUNChannel {
                 }
             }
         });
-        this.client.on('message.undecryptable', (data) => {
+        client.on('message.undecryptable', (data) => {
             this.trace('IN', 'message.undecryptable', data);
             const d = data;
             logger.warn(`${this.logPrefix()} Message undecryptable: from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
         });
-        this.client.on('group.message_undecryptable', (data) => {
+        client.on('group.message_undecryptable', (data) => {
             this.trace('IN', 'group.message_undecryptable', data);
             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 = this.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 this.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;
-            this.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);
@@ -699,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 {
@@ -716,12 +660,19 @@ export class AUNChannel {
                 agentName: this.config.agentName,
                 channelName: this.config.channelName,
             });
-            this.trace('OUT', 'client.connect', { gateway: this.client._gatewayUrl, extra_info: extraInfo });
-            await this.client.connect({ access_token: accessToken, gateway: this.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.ok', { aid: this.client.aid });
+            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 ?? '';
             this._chatId = this._aid ? `${this._aid}:${deviceId}:` : '';
@@ -730,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.
@@ -743,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();
         }
@@ -823,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) {
@@ -999,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
@@ -1215,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
@@ -1306,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 || '',
@@ -1389,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 —— 短命连接一上来就会触发本分支，
@@ -1854,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,
@@ -1929,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');
                 }
             }
@@ -1941,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');
                 }
             }
@@ -2318,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' });
@@ -2418,13 +2373,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!this.client)
             return { type: null };
         try {
-            const { agentmdSync } = await import('../aun/aid/agentmd.js');
-            const result = await agentmdSync(aid, { client: this.client });
-            const md = result.content ?? '';
-            const typeMatch = md.match(/^type:\s*["']?(\w+)["']?/m);
-            const nameMatch = md.match(/^name:\s*["']?(.+?)["']?\s*$/m);
-            const type = typeMatch?.[1] === 'human' ? 'human' : 'ai';
-            const name = nameMatch?.[1]?.trim() || undefined;
+            const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+            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 };
             this.peerInfoCache.set(aid, info);
             setTimeout(() => this.peerInfoCache.delete(aid), 30 * 60 * 1000);
@@ -2446,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 ?? '';
     }
 }
@@ -2486,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,
@@ -2677,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',