evolclaw 3.1.1 → 3.1.2

package/dist/channels/aun.js

@@ -6,7 +6,7 @@ import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
-import { resolvePaths, getPackageRoot, agentDir as agentDirPath } from '../paths.js';
+import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
 import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
@@ -408,10 +408,10 @@ export class AUNChannel {
         }
         return out;
     }
-    buildGroupReplyContext(taskId, senderAid, encrypted, messageId, chatmode) {
+    buildGroupReplyContext(threadId, senderAid, encrypted, messageId, chatmode) {
         const replyContext = { metadata: { encrypted, chatmode } };
-        if (taskId)
-            replyContext.threadId = taskId;
+        if (threadId)
+            replyContext.threadId = threadId;
         replyContext.peerId = senderAid;
         if (messageId)
             replyContext.replyToMessageId = messageId;
@@ -731,8 +731,8 @@ export class AUNChannel {
                 logger.info(`${this.logPrefix()} No owner configured, skipping welcome message (will retry after auto-bind)`);
                 return;
             }
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
-            const existingAgentMd = fs.existsSync(agentMdPath) ? fs.readFileSync(agentMdPath, 'utf-8') : '';
+            const agentMdLocalPath = agentMdPathFn(aidName);
+            const existingAgentMd = fs.existsSync(agentMdLocalPath) ? fs.readFileSync(agentMdLocalPath, 'utf-8') : '';
             const existingFrontmatterMatch = existingAgentMd.match(/^---\n([\s\S]*?)\n---/);
             const existingFrontmatter = existingFrontmatterMatch?.[1] ?? '';
             // Fetch owner's agent.md to derive name and validate type
@@ -778,8 +778,8 @@ tags:
 EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 `;
             // Write locally
-            fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
-            fs.writeFileSync(agentMdPath, newAgentMd, 'utf-8');
+            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 auth.uploadAgentMd
             try {
@@ -908,7 +908,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const fromAid = msg.from ?? '';
         const payload = msg.payload ?? '';
         const text = this.extractTextPayload(payload, fromAid);
-        const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
+        const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
         // 回声过滤：自己发出的消息会被 gateway fanout 回来，
@@ -953,7 +953,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // device_id 仅 SDK 内部多实例去重用，evolclaw session 层面跨端共享会话
         const chatId = fromAid;
         // 解析对端身份（30天缓存）
-        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, this.agentDir, this.client, false);
+        const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, selfAgentDir, this.client, false);
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
@@ -986,8 +987,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const isSystemP2P = p2pPayloadType === 'event';
         this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode);
         const replyContext = { metadata: { encrypted: msgEncrypted, chatmode: msgChatmode } };
-        if (taskId)
-            replyContext.threadId = taskId;
+        if (threadId)
+            replyContext.threadId = threadId;
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -995,7 +996,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             chatType: 'private',
             messageId,
             seq,
-            taskId,
+            threadId,
             mentions,
             peerName: displayName || undefined,
             peerType: peerIdentity.type,
@@ -1010,7 +1011,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const senderAid = msg.sender_aid ?? '';
         const payload = msg.payload ?? '';
         const text = this.extractTextPayload(payload, groupId, senderAid);
-        const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
+        const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
         // Extract structured mentions from payload (e.g. payload.mentions: ["evolai.agentid.pub"])
@@ -1168,7 +1169,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 finalText = parts.join('\n\n');
             }
         }
-        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, this.agentDir, this.client, false);
+        const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, selfAgentDir, this.client, false);
         const shortAid = this.getShortAid(senderAid);
         const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
@@ -1200,9 +1202,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             chatType: 'group',
             messageId,
             seq,
-            taskId,
+            threadId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted, messageId, msgChatmode),
+            replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode),
         });
     }
     dispatchMessage(event) {
@@ -1252,8 +1254,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // Use caller-supplied replyContext (group path builds mentionUserIds);
         // fall back to simple threadId-only context for private messages
         let replyContext = event.replyContext;
-        if (!replyContext && event.taskId) {
-            replyContext = { threadId: event.taskId };
+        if (!replyContext && event.threadId) {
+            replyContext = { threadId: event.threadId };
         }
         this.messageHandler({
             channelId: event.channelId || '',
@@ -1266,7 +1268,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             peerName: event.peerName,
             peerType: event.peerType,
             messageId: event.messageId,
-            threadId: event.taskId,
+            threadId: event.threadId,
             mentions: mentionObjects,
             replyContext,
         }).catch(err => {
@@ -1707,6 +1709,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const channelId = entry.channelId;
         const finalText = entry.text;
         const context = entry.context;
+        // 从 context.metadata.source 读取 source，默认为 'daemon'
+        const source = context?.metadata?.source ?? 'daemon';
         const payload = { type: 'text', text: finalText };
         if (this.isGroupId(channelId)) {
             const extracted = this.extractMentionAidsFromText(finalText);
@@ -1720,7 +1724,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (context?.metadata?.chatmode)
             payload.chatmode = context.metadata.chatmode;
         // 诊断日志：记录 payload 构造结果（含 task_id / thread_id / chatmode）
-        logger.info(`${this.logPrefix()} deliverTextEntry: channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} chatmode=${payload.chatmode ?? 'none'} textLen=${finalText.length}`);
+        logger.info(`${this.logPrefix()} deliverTextEntry: channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} chatmode=${payload.chatmode ?? 'none'} source=${source} textLen=${finalText.length}`);
         const isGroup = this.isGroupId(channelId);
         const targetAid = channelId;
         const encryptTarget = isGroup ? channelId : targetAid;
@@ -1746,7 +1750,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${mid} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
                     this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
-                    this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true);
+                    this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true, 'text', source);
                 }
             }
             else {
@@ -1759,7 +1763,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     logger.info(`${this.logPrefix()} message.send ok: to=${this.peerLabel(targetAid)} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: targetAid, msgId: result.message_id, kind: 'text', len: finalText.length });
                     this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
-                    this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false);
+                    this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false, 'text', source);
                 }
             }
             return true;
@@ -1802,7 +1806,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
     }
     /** 出站消息写入 messages.jsonl（message.send/group.send/thought.put 成功后调用） */
-    appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text') {
+    appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text', source = 'daemon') {
         try {
             const sessionsDir = resolvePaths().sessionsDir;
             const selfId = this.config.aid;
@@ -1822,6 +1826,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 encrypt,
                 chatmode,
                 msgType,
+                source,
             }));
         }
         catch (e) {
@@ -1854,12 +1859,24 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         try {
             const itemCount = Array.isArray(payload?.items) ? payload.items.length : 0;
             const stage = payload?.stage ?? `items=${itemCount}`;
-            // 提取 thought 文本（取最后一项的 text 或 content 字段）
+            // 提取 thought 文本（只对 kind=text 的 item 写 jsonl，过滤 tool_use/tool_result 等结构化项）
             const items = payload?.items;
             let thoughtText;
             if (Array.isArray(items) && items.length > 0) {
                 const lastItem = items[items.length - 1];
-                thoughtText = lastItem?.text || lastItem?.content || (typeof lastItem === 'string' ? lastItem : undefined);
+                // 优先 text 字段（kind=text 的 item），否则 content
+                if (lastItem?.kind === 'text' && lastItem.text) {
+                    thoughtText = lastItem.text;
+                }
+                else if (lastItem?.text) {
+                    thoughtText = lastItem.text;
+                }
+                else if (lastItem?.content) {
+                    thoughtText = lastItem.content;
+                }
+                else if (typeof lastItem === 'string') {
+                    thoughtText = lastItem;
+                }
             }
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
@@ -1867,7 +1884,10 @@ 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 写入已改为按 LLM 调用次数统计（在 complete 事件处写入），此处不再写
+                // 文本类 thought 写入 jsonl（只对有 text 的 item，过滤 tool 等结构化项）
+                if (thoughtText) {
+                    this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, true, 'thought', 'daemon');
+                }
             }
             else {
                 params.to = targetId;
@@ -1875,7 +1895,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 const tid = putRes?.thought_id;
                 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 });
-                // thought jsonl 写入已改为按 LLM 调用次数统计（在 complete 事件处写入），此处不再写
+                if (thoughtText) {
+                    this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, false, 'thought', 'daemon');
+                }
             }
         }
         catch (e) {
@@ -2303,13 +2325,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     loadSelfName(aid) {
         try {
             const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
-            if (!fs.existsSync(agentMdPath)) {
+            const mdPath = agentMdPathFn(aidName);
+            if (!fs.existsSync(mdPath)) {
                 // 异步拉取，不阻塞连接流程
                 this.fetchAndCacheSelfName(aidName);
                 return undefined;
             }
-            const content = fs.readFileSync(agentMdPath, 'utf-8');
+            const content = fs.readFileSync(mdPath, 'utf-8');
             const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
             if (!fmMatch)
                 return undefined;
@@ -2420,6 +2442,7 @@ export class AUNChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name, // channelName 实际上就是 channelKey
                 capabilities: { file: true, image: true, interaction: true, markdown: true, thought: true, status: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -2464,10 +2487,8 @@ export class AUNChannelPlugin {
                                 await channel.sendThought(channelId, envelope.taskId, aunPayload, ctx);
                             }
                             else {
-                                await Promise.all([
-                                    channel.sendThought(channelId, envelope.taskId, aunPayload, ctx),
-                                    channel.sendStructured(channelId, aunPayload, ctx),
-                                ]);
+                                // interactive 模式不发 thought.put，只写入消息历史
+                                await channel.sendStructured(channelId, aunPayload, ctx);
                             }
                             return;
                         }

package/dist/channels/dingtalk.js

@@ -447,6 +447,7 @@ export class DingtalkChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;

package/dist/channels/feishu.js

@@ -329,12 +329,11 @@ export class FeishuChannel {
                             }
                             logger.info(`[Feishu] CommandCard trigger: command=${value._command}, operator=${operatorId}`);
                             if (this.messageHandler) {
-                                // Feishu chatId 前缀：oc_ = group chat，ou_ = private user open_id
-                                const chatType = typeof chatId === 'string' && chatId.startsWith('oc_') ? 'group' : 'private';
+                                // 卡片回调不传 chatType——oc_ 前缀不区分群聊/单聊，
+                                // 由 ensureSession 从已有 session 中继承正确的 chatType
                                 await this.messageHandler({
                                     channelId: chatId,
                                     content: value._command,
-                                    chatType,
                                     peerId: operatorId,
                                     messageId: `card-trigger-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                                     source: 'card-trigger',
@@ -1327,6 +1326,7 @@ export class FeishuChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -1424,7 +1424,8 @@ export class FeishuChannelPlugin {
                 registerBridge(bridge, channelType) {
                     bridge.register(adapter.channelName, (handler) => channel.onMessage(async ({ channelId: chatId, content, images, peerId, peerName, messageId, mentions, threadId, rootId, chatType, source }) => {
                         await handler({
-                            channel: adapter.channelName, channelType, channelId: chatId, content, images, chatType,
+                            channel: adapter.channelName, channelType, channelId: chatId, content, images,
+                            chatType: chatType || 'private',
                             peerId: peerId || '', peerName, messageId, mentions, threadId,
                             replyContext: threadId ? { replyToMessageId: rootId ?? threadId, replyInThread: true } : undefined,
                             source,

package/dist/channels/qqbot.js

@@ -334,6 +334,7 @@ export class QQBotChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;

package/dist/channels/wechat.js

@@ -730,6 +730,7 @@ export class WechatChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true },
                 send: async (envelope, payload) => {
                     const channelId = envelope.channelId;

package/dist/channels/wecom.js

@@ -490,6 +490,7 @@ export class WecomChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;

package/dist/cli/agent.js

@@ -239,22 +239,30 @@ export async function agentShow(aid) {
 }
 export async function agentCreateInteractive(opts = {}) {
     const p = resolvePaths();
-    const rl = readline.createInterface({
+    const ownRl = !opts.rl;
+    const rl = opts.rl ?? readline.createInterface({
         input: opts.stdin || process.stdin,
         output: opts.stdout || process.stdout,
     });
     const ask = (q) => new Promise(r => rl.question(q, r));
     try {
+        const { isValidAid, aidCreate } = await import('../aun/aid/index.js');
         const aidPrompt = opts.suggestedName
             ? `AID [${opts.suggestedName}]: `
             : 'AID (e.g. mybot.agentid.pub): ';
-        const aidInput = (await ask(aidPrompt)).trim();
-        const aid = aidInput || opts.suggestedName;
-        if (!aid)
-            return { ok: false, error: 'AID is required.' };
-        const { isValidAid, aidCreate } = await import('../aun/aid/index.js');
-        if (!isValidAid(aid)) {
-            return { ok: false, error: `Invalid AID "${aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)` };
+        let aid = '';
+        while (!aid) {
+            const aidInput = (await ask(aidPrompt)).trim();
+            const candidate = aidInput || opts.suggestedName;
+            if (!candidate) {
+                console.log('  ⚠ AID is required.');
+                continue;
+            }
+            if (!isValidAid(candidate)) {
+                console.log(`  ⚠ Invalid AID "${candidate}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`);
+                continue;
+            }
+            aid = candidate;
         }
         const agentDirPath = path.join(p.agentsDir, aid);
         const configExists = fs.existsSync(path.join(agentDirPath, 'config.json'));
@@ -311,26 +319,48 @@ export async function agentCreateInteractive(opts = {}) {
             return { ok: false, error: `No baseagent CLI detected on PATH. Install one of: ${BASEAGENT_CANDIDATES.join('/')}` };
         }
         const defaultBa = pickDefaultBaseagent(available);
-        let baseagent = null;
-        while (baseagent === null) {
-            const input = (await ask(`Baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
-            if (!BASEAGENT_CANDIDATES.includes(input)) {
-                console.log(`  Invalid choice. Options: ${BASEAGENT_CANDIDATES.join('/')}`);
-                continue;
+        let baseagent;
+        if (available.length === 1) {
+            console.log(`  Baseagent: ${defaultBa}`);
+            baseagent = defaultBa;
+        }
+        else {
+            let chosen = null;
+            while (chosen === null) {
+                const input = (await ask(`Baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
+                if (!BASEAGENT_CANDIDATES.includes(input)) {
+                    console.log(`  Invalid choice. Options: ${BASEAGENT_CANDIDATES.join('/')}`);
+                    continue;
+                }
+                if (!available.includes(input)) {
+                    console.log(`  ${input} not detected on PATH. Available: ${available.join('/')}`);
+                    continue;
+                }
+                chosen = input;
+            }
+            baseagent = chosen;
+        }
+        // Owner
+        let owner;
+        while (true) {
+            const ownerInput = (await ask('Owner AID (leave empty for auto-bind on first message): ')).trim();
+            if (!ownerInput) {
+                owner = undefined;
+                break;
             }
-            if (!available.includes(input)) {
-                console.log(`  ${input} not detected on PATH. Available: ${available.join('/')}`);
+            if (!isValidAid(ownerInput)) {
+                console.log(`  ⚠ Invalid Owner AID "${ownerInput}": must be a valid multi-level domain (e.g. alice.agentid.pub)`);
                 continue;
             }
-            baseagent = input;
+            owner = ownerInput;
+            break;
         }
-        // Owner
-        const owner = (await ask('Owner AID (leave empty for auto-bind on first message): ')).trim() || undefined;
         // Name + description for agent.md
         const defaultName = aid.split('.')[0];
         const agentName = (await ask(`Display name [${defaultName}]: `)).trim() || defaultName;
         const agentDescription = (await ask('Description (optional): ')).trim() || '';
-        rl.close();
+        if (ownRl)
+            rl.close();
         const agentConfig = {
             $schema_version: CONFIG_SCHEMA_VERSION,
             aid,
@@ -359,31 +389,64 @@ export async function agentCreateInteractive(opts = {}) {
             const agentMdPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
             fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
             fs.writeFileSync(agentMdPath, content, 'utf-8');
-            try {
-                await agentmdPut(content, { aid, aunPath });
-                agentmdUploaded = true;
+            // Upload with retry (3 attempts, 2s delay between retries)
+            const MAX_ATTEMPTS = 3;
+            const RETRY_DELAY_MS = 2000;
+            let lastError;
+            for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+                try {
+                    if (attempt > 1) {
+                        process.stdout.write(`  ↻ agent.md 上传重试 (${attempt}/${MAX_ATTEMPTS})...\n`);
+                        await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
+                    }
+                    await agentmdPut(content, { aid, aunPath });
+                    agentmdUploaded = true;
+                    break;
+                }
+                catch (e) {
+                    lastError = e;
+                }
             }
-            catch (e) {
-                console.warn(`  ⚠ agent.md upload failed: ${e?.message || e}`);
+            if (!agentmdUploaded) {
+                console.warn(`  ⚠ agent.md upload failed: ${lastError?.message || lastError}`);
                 console.warn(`  → Retry later with: evolclaw aid agentmd put ${aid}`);
             }
+            // Yield to allow the SDK WebSocket to fully close before IPC
+            await new Promise(r => setTimeout(r, 0));
         }
         catch (e) {
             console.warn(`  ⚠ agent.md generation failed: ${e?.message || e}`);
         }
+        // Attempt hot-load via IPC (if daemon is running)
+        let hotLoaded = false;
+        let hotLoadError;
+        try {
+            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid });
+            if (ipcResult?.ok) {
+                hotLoaded = true;
+            }
+            else if (ipcResult) {
+                hotLoadError = ipcResult.error;
+            }
+        }
+        catch { /* daemon not running */ }
         return {
             ok: true,
             aid,
             configPath: toPosix(path.join(agentDirPath, 'config.json')),
             aidCreated,
             agentmdUploaded,
+            hotLoaded,
+            hotLoadError,
         };
     }
     finally {
-        try {
-            rl.close();
+        if (ownRl) {
+            try {
+                rl.close();
+            }
+            catch { /* ignore */ }
         }
-        catch { /* ignore */ }
     }
 }
 export async function agentCreateNonInteractive(opts) {
@@ -482,24 +545,51 @@ export async function agentCreateNonInteractive(opts) {
         const agentMdPath = path.join(aunPath, 'AIDs', opts.aid, 'agent.md');
         fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
         fs.writeFileSync(agentMdPath, content, 'utf-8');
-        try {
-            await agentmdPut(content, { aid: opts.aid, aunPath });
-            agentmdUploaded = true;
+        const MAX_ATTEMPTS = 3;
+        const RETRY_DELAY_MS = 2000;
+        let lastError;
+        for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+            try {
+                if (attempt > 1)
+                    await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
+                await agentmdPut(content, { aid: opts.aid, aunPath });
+                agentmdUploaded = true;
+                break;
+            }
+            catch (e) {
+                lastError = e;
+            }
         }
-        catch (e) {
-            console.warn(`⚠ agent.md upload failed: ${e?.message || e}`);
+        if (!agentmdUploaded) {
+            console.warn(`⚠ agent.md upload failed: ${lastError?.message || lastError}`);
             console.warn(`  Retry later with: evolclaw aid agentmd put ${opts.aid}`);
         }
+        await new Promise(r => setTimeout(r, 0));
     }
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
     }
+    // Attempt hot-load via IPC (if daemon is running)
+    let hotLoaded = false;
+    let hotLoadError;
+    try {
+        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid });
+        if (ipcResult?.ok) {
+            hotLoaded = true;
+        }
+        else if (ipcResult) {
+            hotLoadError = ipcResult.error;
+        }
+    }
+    catch { /* daemon not running */ }
     return {
         ok: true,
         aid: opts.aid,
         configPath: toPosix(path.join(agentDirPath, 'config.json')),
         aidCreated,
         agentmdUploaded,
+        hotLoaded,
+        hotLoadError,
     };
 }
 // ==================== agentSyncAids ====================
@@ -665,7 +755,12 @@ export async function agentSet(aid, key, rawValue) {
     }
     const value = parseJsonValue(rawValue);
     setNestedValue(config, key, value);
-    saveAgent(config);
+    try {
+        saveAgent(config);
+    }
+    catch (e) {
+        return { ok: false, error: e?.message || String(e) };
+    }
     // Try hot-reload
     let reloaded = false;
     try {
@@ -733,7 +828,7 @@ export async function agentChannelUpsert(opts) {
     return {
         ok: true,
         aid: opts.aid,
-        channelKey: `${opts.aid}#${opts.channel.type}#${opts.channel.name}`,
+        channelKey: `${opts.channel.type}#${encodeURIComponent(opts.aid)}#${opts.channel.name}`,
         reloaded,
     };
 }