evolclaw 3.1.1 → 3.1.2

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import path from 'path';
 import os from 'os';
 import { spawn, execFileSync, execFile } from 'child_process';
 import { promisify } from 'util';
-import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from '../paths.js';
+import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, mergeForAgent } from '../config-store.js';
 import { resolveAnthropicConfig } from '../agents/resolve.js';
 import { migrateProject } from '../config-store.js';
@@ -235,7 +235,7 @@ function formatLocalTime(ms) {
     const d = new Date(ms);
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`;
 }
-function printStartupInfo() {
+function printStartupInfo(opts = {}) {
     const pkgRoot = getPackageRoot();
     const isNpmInstall = pkgRoot.includes('node_modules');
     const cliRunsSource = !import.meta.url.includes('/dist/');
@@ -268,7 +268,15 @@ function printStartupInfo() {
         version = JSON.parse(fs.readFileSync(path.join(pkgRoot, 'package.json'), 'utf-8')).version;
     }
     catch { }
-    console.log(`  EvolClaw v${version}`);
+    let aunVer = null;
+    try {
+        aunVer = JSON.parse(fs.readFileSync(path.join(pkgRoot, 'node_modules', '@agentunion', 'fastaun', 'package.json'), 'utf-8')).version;
+    }
+    catch { }
+    const pidPart = opts.pid ? ` (PID: ${opts.pid})` : '';
+    const aunPart = aunVer ? `  fastaun v${aunVer}` : '';
+    const prefix = opts.running ? '✓ EvolClaw is running , v' : '  EvolClaw v';
+    console.log(`${prefix}${version}${pidPart}${aunPart}`);
     console.log(`  包路径:     ${pkgRoot}`);
     console.log(`  安装类型:   ${isNpmInstall ? 'npm全局安装' : '开发仓(link)'}`);
     console.log(`  CLI执行:    ${cliRunsSource ? '源码(tsx)' : '编译产物(dist)'}`);
@@ -829,7 +837,7 @@ async function cmdStatus() {
         console.log('');
     }
     if (pid) {
-        console.log(`✓ EvolClaw is running (PID: ${pid})`);
+        printStartupInfo({ pid, running: true });
         console.log('');
         console.log('📊 Process Info:');
         try {
@@ -875,8 +883,8 @@ async function cmdStatus() {
                     const configChannelNames = new Set();
                     for (const cfg of agents) {
                         for (const inst of cfg.channels) {
-                            // effective key: <aid>#<type>#<name>
-                            configChannelNames.add(`${cfg.aid}#${inst.type}#${inst.name}`);
+                            // effective key: <type>#<urlEncode(selfPeerId)>#<name>
+                            configChannelNames.add(`${inst.type}#${encodeURIComponent(cfg.aid)}#${inst.name}`);
                         }
                     }
                     for (const s of allSessions) {
@@ -1005,7 +1013,7 @@ async function cmdStatus() {
     }
 }
 /**
- * 把 channel fingerprint 列表（`<aid>#<type>#<name>`）折叠成展示用摘要。
+ * 把 channel fingerprint 列表（`<type>#<selfPeerId>#<name>`）折叠成展示用摘要。
  *
  * 聚合规则：
  *   - 按 type 分组
@@ -1027,8 +1035,8 @@ function summarizeChannelFingerprints(fingerprints) {
             }
             continue;
         }
-        const type = parts[1];
-        const name = parts.slice(2).join('#');
+        const type = parts[0];
+        const name = parts[2];
         if (!groups.has(type)) {
             groups.set(type, []);
             order.push(type);
@@ -1734,10 +1742,10 @@ async function cmdWatchAid() {
     const refreshedAids = new Set();
     function readLocalName(aid) {
         try {
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aid, 'agent.md');
-            if (!fs.existsSync(agentMdPath))
+            const mdPath = agentMdPath(aid);
+            if (!fs.existsSync(mdPath))
                 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;
@@ -2463,12 +2471,14 @@ function archiveSelfHealLog(p, log) {
  * Searches across all channel types (feishu, wechat, aun) for a matching instance.
  */
 function resolveInstanceConfig(instanceName) {
-    // 新结构：channel key 是 <aid>#<type>#<name>，解析后从对应 agent 的 channels[] 找
+    // 新结构：channel key 是 <type>#<selfPeerId>#<name>，解析后从对应 agent 的 channels[] 找
     const parts = instanceName.split('#');
     if (parts.length === 3) {
-        const [aid, type, name] = parts;
+        const [type, encodedSelfPeerId, name] = parts;
+        const selfPeerId = decodeURIComponent(encodedSelfPeerId);
         const { agents } = loadAllAgents();
-        const agent = agents.find(a => a.aid === aid);
+        // AUN channel 的 selfPeerId 就是 agent.aid
+        const agent = agents.find(a => a.aid === selfPeerId);
         if (!agent)
             return null;
         const inst = agent.channels.find((c) => c.type === type && c.name === name);
@@ -2921,7 +2931,11 @@ Options:
                 console.log(result.agentmdUploaded
                     ? '  ✓ agent.md 已发布'
                     : '  ⚠ agent.md 上传失败（可用 evolclaw aid agentmd put 重试）');
-                console.log('  Run `evolclaw restart` to activate.');
+                console.log(result.hotLoaded
+                    ? '  ✓ 已热重载，agent 已上线'
+                    : result.hotLoadError
+                        ? `  ✗ 热重载失败：${result.hotLoadError}`
+                        : '  ⚠ 服务未运行，下次 evolclaw start 时生效');
             }
         }
         else {
@@ -2943,7 +2957,11 @@ Options:
                 console.log(result.agentmdUploaded
                     ? '  ✓ agent.md 已发布'
                     : '  ⚠ agent.md 上传失败（可用 evolclaw aid agentmd put 重试）');
-                console.log('  Run `evolclaw restart` to activate.');
+                console.log(result.hotLoaded
+                    ? '  ✓ 已热重载，agent 已上线'
+                    : result.hotLoadError
+                        ? `  ✗ 热重载失败：${result.hotLoadError}`
+                        : '  ⚠ 服务未运行，下次 evolclaw start 时生效');
             }
         }
         return;
@@ -3438,8 +3456,7 @@ Options:
                 console.error(`❌ 无效 AID 格式: ${aid}`);
                 process.exit(1);
             }
-            const aunBase = aunPath ?? path.join(os.homedir(), '.aun');
-            const localPath = path.join(aunBase, 'AIDs', aid, 'agent.md');
+            const localPath = agentMdPath(aid);
             if (!fs.existsSync(localPath)) {
                 console.error(`❌ 本地无 agent.md: ${aid}`);
                 process.exit(1);
@@ -3747,12 +3764,15 @@ Options:
   --app <name>          指定应用 slot（隔离 ack 游标）
   --as-daemon           ack 时显式以 daemon 身份（高危，会污染 daemon 游标）
   --format json         输出 JSON 格式
+  --encrypt             启用端到端加密
+  --thread <id>         指定话题 ID（用于多话题路由）
   --content-type <mime> 显式覆盖 MIME（仅 --file 模式）
   --text <说明>          附件说明文字（仅 --file 模式）
   --transcript <text>   语音转写（仅 --as voice）
 
 示例:
   evolclaw msg send alice.agentid.pub bob.agentid.pub "hello"
+  evolclaw msg send alice.agentid.pub bob.agentid.pub "讨论项目A" --thread "project-A"
   evolclaw msg send alice.agentid.pub bob.agentid.pub --file ./pic.png
   evolclaw msg send alice.agentid.pub bob.agentid.pub --file ./demo.mp4 --as video
   evolclaw msg send alice.agentid.pub bob.agentid.pub --link https://example.com --title "AUN"
@@ -3826,7 +3846,29 @@ Options:
             body = { mode: 'text', text };
         }
         const encrypt = args.includes('--encrypt');
-        const result = await msgSend({ from, to, body, encrypt, ...commonOpts });
+        const thread = getArgValue(args, '--thread');
+        // 文件上传进度展示（非 JSON 输出时）。仅在大文件降级到 HTTP PUT 阶段会逐块更新。
+        let lastPctShown = -1;
+        const onUploadProgress = formatJson ? undefined : (info) => {
+            if (info.phase === 'inline')
+                return; // 内联阶段不分块，跳过
+            if (info.phase === 'http-put') {
+                const pct = info.total > 0 ? Math.floor((info.bytes / info.total) * 100) : 0;
+                if (pct === lastPctShown && info.bytes < info.total)
+                    return;
+                lastPctShown = pct;
+                const mb = (n) => (n / 1024 / 1024).toFixed(2);
+                const eol = info.bytes >= info.total ? '\n' : '\r';
+                process.stderr.write(`  ⏫ uploading: ${pct}% (${mb(info.bytes)}/${mb(info.total)} MB)${eol}`);
+            }
+            else if (info.phase === 'session-create') {
+                process.stderr.write('  ⏫ requesting upload session...\n');
+            }
+            else if (info.phase === 'session-complete') {
+                process.stderr.write('  ⏫ finalizing upload...\n');
+            }
+        };
+        const result = await msgSend({ from, to, body, encrypt, thread, onUploadProgress, ...commonOpts });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -4408,15 +4450,23 @@ export async function main(args) {
   evolclaw init wecom         企业微信 AI Bot 配置（手动输入）`);
             }
             else if (args[1] === 'wechat') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitWechat();
             }
             else if (args[1] === 'feishu') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitFeishu();
             }
             else if (args[1] === 'dingtalk') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitDingtalk();
             }
             else if (args[1] === 'qqbot') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitQQBot();
             }
             else if (args[1] === 'wecom') {
@@ -4429,6 +4479,8 @@ export async function main(args) {
                 process.exit(1);
             }
             else {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 const nonInteractive = args.includes('--non-interactive');
                 await cmdInit({
                     nonInteractive,
@@ -4509,9 +4561,12 @@ export async function main(args) {
         case 'ctl':
             await cmdCtl(args.slice(1));
             break;
-        case 'agent':
+        case 'agent': {
+            const { suppressSdkLogs } = await import('../aun/aid/index.js');
+            suppressSdkLogs();
             await cmdAgent(args.slice(1));
             break;
+        }
         case 'aid': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();

package/dist/cli/init-channel.js

@@ -10,6 +10,7 @@ import readline from 'readline';
 import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
+import { aidLocalDir } from '../paths.js';
 import { selectInstance } from './init.js';
 import { npmInstallGlobal } from '../utils/npm-ops.js';
 import { loadAllAgents, loadAgent } from '../config-store.js';
@@ -470,8 +471,9 @@ export async function setupAunAid(rl, _config) {
                 console.log(`  ⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
                 // Still write local copy as fallback
                 try {
-                    fs.mkdirSync(aidDir, { recursive: true });
-                    fs.writeFileSync(path.join(aidDir, 'agent.md'), content, 'utf-8');
+                    const localDir = aidLocalDir(aid);
+                    fs.mkdirSync(localDir, { recursive: true });
+                    fs.writeFileSync(path.join(localDir, 'agent.md'), content, 'utf-8');
                     console.log('  ✓ agent.md 已写入本地');
                 }
                 catch (we) {

package/dist/cli/init.js

@@ -3,7 +3,7 @@ import readline from 'readline';
 import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
-import { saveDefaultsSafe } from '../config-store.js';
+import { saveDefaultsSafe, loadAllAgents } from '../config-store.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -81,19 +81,21 @@ export async function cmdInit(options) {
         writeDefaults(defaultsPath, chosen);
         console.log(`✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
         console.log(`  active_baseagent: ${chosen}`);
+        const { agents } = loadAllAgents();
+        if (agents.length === 0) {
+            console.log('\n提示：尚无 agent，运行以下命令创建：');
+            console.log('  evolclaw agent new <aid>.agentid.pub');
+        }
         return;
     }
     // ── 4. 交互式分支 ──
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        if (exists) {
-            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
-            if (ans !== 'y' && ans !== 'yes') {
-                console.log('  已取消');
-                return;
-            }
-        }
+    async function askBaseagent() {
         const defaultBa = pickDefault(available);
+        if (available.length === 1) {
+            console.log(`  baseagent: ${defaultBa}`);
+            return defaultBa;
+        }
         let chosen = null;
         while (chosen === null) {
             const input = (await ask(rl, `默认 baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
@@ -107,17 +109,37 @@ export async function cmdInit(options) {
             }
             chosen = input;
         }
-        writeDefaults(defaultsPath, chosen);
-        console.log(`\n✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
-        console.log(`  active_baseagent: ${chosen}\n`);
-        rl.close();
-        // ── 5. 嵌套 agent new ──
-        console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-        console.log('下一步：创建 agent\n');
-        const { agentCreateInteractive } = await import('./agent.js');
-        const result = await agentCreateInteractive();
-        if (!result.ok) {
-            console.error(`❌ ${result.error}`);
+        return chosen;
+    }
+    try {
+        if (exists) {
+            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
+            if (ans === 'y' || ans === 'yes') {
+                const chosen = await askBaseagent();
+                writeDefaults(defaultsPath, chosen);
+                console.log(`\n✓ 已覆盖: ${defaultsPath}`);
+                console.log(`  active_baseagent: ${chosen}\n`);
+            }
+            else {
+                console.log('  已跳过（保留现有配置）\n');
+            }
+        }
+        else {
+            const chosen = await askBaseagent();
+            writeDefaults(defaultsPath, chosen);
+            console.log(`\n✓ 已创建: ${defaultsPath}`);
+            console.log(`  active_baseagent: ${chosen}\n`);
+        }
+        // ── 5. 无 agent 时自动进入 agent new ──
+        const { agents } = loadAllAgents();
+        if (agents.length === 0) {
+            console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+            console.log('下一步：创建 agent\n');
+            const { agentCreateInteractive } = await import('./agent.js');
+            const result = await agentCreateInteractive({ rl });
+            if (!result.ok) {
+                console.error(`❌ ${result.error}`);
+            }
         }
     }
     finally {

package/dist/cli/watch-msg.js

@@ -316,7 +316,9 @@ function renderMessagesPanel(state, width, height) {
         const metaTags = (m.encrypt != null || m.chatmode) ? `${MAGENTA}[${encLabel}|${modeLabel}]${RST}` : '';
         let typeTag = '';
         if (m.dir === 'out') {
-            const source = m.source === 'cli' ? 'cli' : 'daemon';
+            const rawSource = m.source;
+            // 4 种来源: daemon | ctl | msg | cli
+            const source = (rawSource === 'ctl' || rawSource === 'msg' || rawSource === 'cli') ? rawSource : 'daemon';
             const method = m.msgType === 'thought' ? 'thought' : 'send';
             typeTag = `${DIM}[${source}|${method}]${RST}`;
         }

package/dist/config-store.js

@@ -348,9 +348,30 @@ export function loadAgent(aid) {
     if (raw.aid !== aid) {
         throw new Error(`[config] ${p}: aid field "${raw.aid}" != directory name "${aid}"`);
     }
-    return expandEnvRefs(raw);
+    const cfg = expandEnvRefs(raw);
+    if (cfg.projects?.defaultPath) {
+        cfg.projects.defaultPath = cfg.projects.defaultPath.replace(/[/\\]+$/, '');
+    }
+    return cfg;
 }
 export function saveAgent(value) {
+    if (!isValidAid(value.aid)) {
+        throw new Error(`[config] saveAgent: invalid aid "${value.aid}" (must be a valid multi-level domain like mybot.agentid.pub)`);
+    }
+    if (value.owners) {
+        for (const o of value.owners) {
+            if (!isValidAid(o)) {
+                throw new Error(`[config] saveAgent: invalid owner AID "${o}" in ${value.aid} (must be a valid multi-level domain like alice.agentid.pub)`);
+            }
+        }
+    }
+    if (value.admins) {
+        for (const a of value.admins) {
+            if (!isValidAid(a)) {
+                throw new Error(`[config] saveAgent: invalid admin AID "${a}" in ${value.aid} (must be a valid multi-level domain like alice.agentid.pub)`);
+            }
+        }
+    }
     atomicWriteJson(agentConfigPath(value.aid), value);
 }
 /**

package/dist/core/channel-loader.js

@@ -128,18 +128,18 @@ export class ChannelLoader {
 }
 const SEP = '#';
 export function formatChannelKey(k) {
-    return `${k.aid}${SEP}${k.type}${SEP}${k.name}`;
+    return `${k.type}${SEP}${encodeURIComponent(k.selfPeerId)}${SEP}${k.name}`;
 }
 export function parseChannelKey(key) {
     const parts = key.split(SEP);
     if (parts.length !== 3) {
         throw new Error(`Invalid channel key (expected 3 segments separated by '#'): ${key}`);
     }
-    const [aid, type, name] = parts;
-    if (!aid || !type || !name) {
+    const [type, encodedSelfPeerId, name] = parts;
+    if (!type || !encodedSelfPeerId || !name) {
         throw new Error(`Invalid channel key (empty segment): ${key}`);
     }
-    return { aid, type, name };
+    return { type, selfPeerId: decodeURIComponent(encodedSelfPeerId), name };
 }
 export function tryParseChannelKey(key) {
     try {

package/dist/core/command-handler.js

@@ -707,6 +707,10 @@ export class CommandHandler {
         return result;
     }
     async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source) {
+        // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
+        // 不应覆盖 session 中已有的正确值
+        if (source === 'card-trigger')
+            chatType = undefined;
         // 解析身份（按实例名）
         const identity = this.sessionManager.resolveIdentity(channel, userId);
         const policy = this.getPolicy(channel);
@@ -3000,8 +3004,10 @@ export class CommandHandler {
         return null;
     }
     handleTrigger(content, channel, channelId, peerId, isAdmin) {
-        const scheduler = this.triggerScheduler;
-        const manager = this.triggerManager;
+        // Resolve trigger manager/scheduler from the owning agent of this channel
+        const owningAgent = this.getOwningAgent(channel);
+        const scheduler = (owningAgent?.triggerScheduler ?? this.triggerScheduler);
+        const manager = (owningAgent?.triggerManager ?? this.triggerManager);
         // Bare /trigger → list active
         if (content === '/trigger') {
             if (!manager)
@@ -3386,9 +3392,10 @@ export class CommandHandler {
                 const taskId = replyContext?.metadata?.taskId;
                 const chatmode = replyContext?.metadata?.chatmode ?? 'interactive';
                 // --encrypt 覆盖 session 加密状态
+                // 添加 source: 'ctl' 标记（用于区分 ec ctl send）
                 const enrichedReplyContext = forceEncrypt
-                    ? { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), encrypted: true } }
-                    : replyContext;
+                    ? { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), encrypted: true, source: 'ctl' } }
+                    : { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), source: 'ctl' } };
                 await adapter.send(buildEnvelope({ taskId, channel: adapter.channelName, channelId: session.channelId, chatmode, replyContext: enrichedReplyContext }), { kind: 'result.text', text, isFinal: true });
                 // 出方向 jsonl 写入已下沉到 aun.ts:deliverTextEntry，message.send 成功后统一写入。
                 return { ok: true, result: 'ok' };

package/dist/core/evolagent-registry.js

@@ -51,7 +51,7 @@ export function detectDuplicates(agents) {
 export class EvolAgentRegistry {
     _agentsDir;
     agents = new Map();
-    /** channel key (`<aid>#<type>#<name>`) → agent aid */
+    /** channel key (`<type>#<selfPeerId>#<name>`) → agent aid */
     channelIndex = new Map();
     /** 启动期被 ConfigStore 跳过的目录（命名非法 / 缺 config.json / 校验失败等） */
     skipped = [];
@@ -199,6 +199,12 @@ export class EvolAgentRegistry {
             logger.warn(`[EvolAgentRegistry] loadNewAgent ${aid}: ${errs.join('; ')}`);
             return null;
         }
+        // Channel fingerprint 冲突检测（防止新 agent 复用已有 agent 的凭证）
+        const conflict = this.checkConflictForReload(raw, aid);
+        if (conflict) {
+            logger.warn(`[EvolAgentRegistry] loadNewAgent ${aid}: ${conflict}`);
+            return null;
+        }
         const defaults = loadDefaults();
         const merged = mergeForAgent(raw, defaults);
         const agent = new EvolAgent(raw, merged);
@@ -224,12 +230,47 @@ export class EvolAgentRegistry {
             throw new Error(`Invalid config after edit: ${errs.join('; ')}`);
         const defaults = loadDefaults();
         const merged = mergeForAgent(raw, defaults);
+        // ── disabled → enabled 转换：需要完整启动流程 ──
+        if (oldAgent.status === 'disabled' && raw.enabled !== false) {
+            oldAgent.swapConfig(raw, merged);
+            const hotLoad = globalThis.__evolclaw_hotLoadAgent;
+            if (!hotLoad)
+                throw new Error(`Cannot enable agent "${aidOrName}": hot-load handler not initialized`);
+            // 从 registry 中移除旧的 disabled 实例，hotLoad 会重新创建
+            this.agents.delete(oldAgent.aid);
+            this.channelIndex.clear();
+            this.buildChannelIndex();
+            await hotLoad(oldAgent.aid);
+            logger.info(`[Reload] Agent "${aidOrName}" transitioned from disabled → enabled (full startup)`);
+            return;
+        }
+        // ── enabled → disabled 转换：断开所有 channel ──
+        if (oldAgent.status !== 'disabled' && raw.enabled === false) {
+            for (const ch of oldAgent.channelInstanceNames()) {
+                try {
+                    await hooks.drainChannel(ch);
+                }
+                catch { }
+                try {
+                    await hooks.disconnectChannel(ch);
+                }
+                catch { }
+            }
+            oldAgent.swapConfig(raw, merged);
+            oldAgent.status = 'disabled';
+            this.channelIndex.clear();
+            this.buildChannelIndex();
+            logger.info(`[Reload] Agent "${aidOrName}" disabled`);
+            return;
+        }
         const conflict = this.checkConflictForReload(raw, oldAgent.aid);
         if (conflict)
             throw new Error(`Channel conflict: ${conflict}`);
         const oldChannels = new Set(oldAgent.channelInstanceNames());
-        // 计算新 channel keys（用 EvolAgent 的格式化）
-        const newChannels = new Set(raw.channels.map(c => oldAgent.effectiveChannelName(c.type, c.name)));
+        // 计算新 channel keys：隐式 AUN + 显式非 AUN channels（与 channelInstanceNames 逻辑一致）
+        const aunKey = oldAgent.effectiveChannelName('aun', 'main');
+        const otherKeys = raw.channels.filter(c => c.type !== 'aun').map(c => oldAgent.effectiveChannelName(c.type, c.name));
+        const newChannels = new Set([aunKey, ...otherKeys]);
         const toRemove = [...oldChannels].filter(c => !newChannels.has(c));
         const toAdd = [...newChannels].filter(c => !oldChannels.has(c));
         const kept = [...oldChannels].filter(c => newChannels.has(c));
@@ -264,12 +305,7 @@ export class EvolAgentRegistry {
                 addedSuccessfully.push(ch);
             }
             // truly kept 的 adapter 实例已经在 oldAgent.channels 里，无需迁移
-            if (oldAgent.status === 'error' || oldAgent.status === 'disabled') {
-                // 保持原态——swap 不改 status
-            }
-            else {
-                oldAgent.status = 'running';
-            }
+            oldAgent.status = 'running';
             // 重启触发器调度器（如果已初始化）
             if (oldAgent.triggerScheduler) {
                 oldAgent.triggerScheduler.stop();

package/dist/core/evolagent.js

@@ -62,11 +62,11 @@ export class EvolAgent {
     }
     // ── Channels ──────────────────────────────────────────────────────────
     /**
-     * effective channel key：`<aid>#<type>#<name>`。AUN 实例一个 agent 只有一条；
-     * 其它类型靠 name 区分。
+     * effective channel key：`<type>#<urlEncode(selfPeerId)>#<name>`。
+     * AUN channel 的 selfPeerId 是 agent.aid，name 固定为 'main'。
      */
     effectiveChannelName(type, rawName) {
-        return formatChannelKey({ aid: this.aid, type, name: rawName });
+        return formatChannelKey({ type, selfPeerId: this.aid, name: rawName });
     }
     channelInstanceNames() {
         // AUN channel 隐式存在（从 agent.aid 派生），不需要在 channels[] 里声明
@@ -97,7 +97,7 @@ export class EvolAgent {
      */
     isAunChannelKey(channelKey) {
         const parsed = tryParseChannelKey(channelKey);
-        return parsed?.type === 'aun' && parsed.aid === this.aid;
+        return parsed?.type === 'aun' && parsed.selfPeerId === this.aid;
     }
     getOwner(channelKey) {
         if (this.isAunChannelKey(channelKey)) {

package/dist/core/message/im-renderer.js

@@ -201,10 +201,10 @@ export class IMRenderer {
             call_id: callId || this.synthCallId(),
             name,
             ok,
-            result,
-            error,
-            duration_ms: durationMs,
-            text: descText,
+            ...(result !== undefined && { result }),
+            ...(error !== undefined && { error }),
+            ...(durationMs !== undefined && { duration_ms: durationMs }),
+            ...(descText !== undefined && { text: descText }),
         });
         this.messageTimestamps.push(Date.now());
         if (this.diagEnabled)

package/dist/core/message/message-bridge.js

@@ -3,6 +3,8 @@ import { logger } from '../../utils/logger.js';
 import { StreamDebouncer } from './stream-debouncer.js';
 import { appendMessageLog, buildInboundEntry } from './message-log.js';
 import { buildEnvelope } from './message-processor.js';
+import { chatDirPath } from '../session/session-fs-store.js';
+import { resolvePaths } from '../../paths.js';
 /**
  * MessageBridge — Channel 与 Core 之间的消息桥梁
  *
@@ -74,8 +76,31 @@ export class MessageBridge {
                 // 2. 命令快速路径（去除引用前缀后检查，兼容话题中引用上文的情况）
                 const contentForCmd = content.replace(/^(>[^\n]*\n)+\n?/, '').trim();
                 const cmdContent = contentForCmd || content;
-                if (this.cmdHandler.isCommand(cmdContent)) {
+                const isCmd = this.cmdHandler.isCommand(cmdContent);
+                if (isCmd) {
                     logger.debug(`[MessageBridge] Command detected: "${cmdContent}", routing to handler`);
+                    // 命令也要记录入方向 jsonl（不创建 session，直接用 chatDirPath 计算路径）
+                    try {
+                        const chatDir = chatDirPath(resolvePaths().sessionsDir, msg.channelType || effectiveChannelType, msg.channelId, msg.selfId);
+                        const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
+                        const inboundChatmode = msg.replyContext?.metadata?.chatmode;
+                        appendMessageLog(chatDir, buildInboundEntry({
+                            from: msg.peerId || 'unknown',
+                            to: msg.selfId || 'self',
+                            chatType: msg.chatType || 'private',
+                            groupId: msg.groupId ?? null,
+                            msgId: msg.messageId ?? null,
+                            content,
+                            replyTo: msg.replyContext?.replyToMessageId ?? null,
+                            permMode: null,
+                            timestamp: Date.now(),
+                            encrypt: inboundEncrypt,
+                            chatmode: inboundChatmode,
+                        }));
+                    }
+                    catch (e) {
+                        logger.debug(`[MessageBridge] Failed to log inbound command: ${e}`);
+                    }
                 }
                 if (await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
                     logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId: `cmd-${msg.messageId || Date.now()}`, payload: { kind: 'command.result', text } });